Move cam_state to main include file

3 files changed, 11 insertions, 10 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a3e9329..1a22c1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,7 +131,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_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION lib/pkgconfig)
 
 
 set(CPACK_PACKAGE_DESCRIPTION "Unified Camera Access library")
diff --git a/src/uca-cam.h b/src/uca-cam.h
index a194054..8b6fc0d 100644
--- a/src/uca-cam.h
+++ b/src/uca-cam.h
@@ -19,15 +19,6 @@ extern "C" {
 
 enum uca_property_ids;
 
-/**
- * Describes the current state of the camera.
- */
-enum uca_cam_state {
-    UCA_CAM_CONFIGURABLE,   /**< Camera can be configured and is not recording */
-    UCA_CAM_ARMED,          /**< Camera is ready for recording */
-    UCA_CAM_RECORDING,      /**< Camera is currently recording */
-};
-
 /*
  * --- non-virtual methods ----------------------------------------------------
  */
diff --git a/src/uca.h b/src/uca.h
index 4cd5991..bcab72f 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -187,6 +187,16 @@ enum uca_access_rights {
 };
 
 /**
+ * Describes the current state of the camera.
+ */
+enum uca_cam_state {
+    UCA_CAM_CONFIGURABLE,   /**< Camera can be configured and is not recording */
+    UCA_CAM_ARMED,          /**< Camera is ready for recording */
+    UCA_CAM_RECORDING,      /**< Camera is currently recording */
+};
+
+
+/**
  * A uca_property_t describes a vendor-independent property used by cameras and
  * frame grabbers. It basically consists of a human-readable name, a physical
  * unit, a type and some access rights.