From b2470635500817bd045810bb387e69bd4588cee6 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
Date: Wed, 21 Mar 2012 16:57:55 +0100
Subject: Merge patch from Volker Kaiser

---
 src/CMakeLists.txt | 2 +-
 src/uca-camera.h   | 4 ++++
 src/uca.pc.in      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b825b1a..cfa5f9c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,7 +128,7 @@ set(VERSION     ${UCA_VERSION_STRING})
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uca.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/uca.pc" @ONLY IMMEDIATE)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION lib/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 
 set(CPACK_PACKAGE_DESCRIPTION "Unified Camera Access library")
diff --git a/src/uca-camera.h b/src/uca-camera.h
index c10173b..23a0c41 100644
--- a/src/uca-camera.h
+++ b/src/uca-camera.h
@@ -20,6 +20,8 @@
 
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 #define UCA_TYPE_CAMERA             (uca_camera_get_type())
 #define UCA_CAMERA(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_CAMERA, UcaCamera))
 #define UCA_IS_CAMERA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_CAMERA))
@@ -87,4 +89,6 @@ void uca_camera_set_grab_func(UcaCamera *camera, UcaCameraGrabFunc func, gpointe
 
 GType uca_camera_get_type(void);
 
+G_END_DECLS
+
 #endif
diff --git a/src/uca.pc.in b/src/uca.pc.in
index 6401368..26434f6 100644
--- a/src/uca.pc.in
+++ b/src/uca.pc.in
@@ -9,5 +9,5 @@ includedir_new=@includedir@
 Name: libuca
 Description: @UCA_DESCRIPTION@
 Version: @VERSION@
-Libs: -L${libdir} -luca
+Libs: -L${libdir} -luca-gobject
 Cflags: -I${includedir_old} -I${includedir_new}
-- 
cgit v1.2.3