[gnome-color-manager: 54/80] Move the GcmSensor files into the main library

[Richard Hughes <rhughes src gnome org>]

commit 55934e3549b1c676e5b42ff2e10a2657bd4df3f6
Author: Richard Hughes <richard hughsie com>
Date:   Sat Jul 17 23:34:23 2010 +0100

    Move the GcmSensor files into the main library

 libcolor-glib/Makefile.am                |   12 +++++++++---
 {src => libcolor-glib}/gcm-sensor-huey.c |    0
 {src => libcolor-glib}/gcm-sensor-huey.h |    1 -
 {src => libcolor-glib}/gcm-sensor.c      |    0
 {src => libcolor-glib}/gcm-sensor.h      |    3 ++-
 libcolor-glib/libcolor-glib.h            |    2 ++
 src/Makefile.am                          |    4 ----
 src/gcm-huey-example.c                   |    2 --
 8 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/libcolor-glib/Makefile.am b/libcolor-glib/Makefile.am
index b639dd0..eebd019 100644
--- a/libcolor-glib/Makefile.am
+++ b/libcolor-glib/Makefile.am
@@ -34,6 +34,8 @@ libcolor_glib_include_HEADERS =					\
 	gcm-ddc-device.h					\
 	gcm-ddc-control.h					\
 	gcm-ddc-common.h					\
+	gcm-sensor-huey.h					\
+	gcm-sensor.h						\
 	gcm-version.h						\
 	$(NULL)
 
@@ -41,6 +43,10 @@ libcolor_glib_la_SOURCES =					\
 	libcolor-glib.h						\
 	gcm-common.c						\
 	gcm-common.h						\
+	gcm-sensor.c						\
+	gcm-sensor.h						\
+	gcm-sensor-huey.c					\
+	gcm-sensor-huey.h					\
 	gcm-ddc-client.c					\
 	gcm-ddc-client.h					\
 	gcm-ddc-device.c					\
@@ -63,9 +69,9 @@ libcolor_glib_la_LDFLAGS =					\
 	-export-symbols-regex '^gcm_.*'				\
 	$(NULL)
 
-libcolor_glib_la_CFLAGS =					\
-	$(WARNINGFLAGS_C)					\
-	$(NULL)
+#libcolor_glib_la_CFLAGS =					\
+#	$(WARNINGFLAGS_C)					\
+#	$(NULL)
 
 if HAVE_TESTS
 check_PROGRAMS =						\
diff --git a/src/gcm-sensor-huey.c b/libcolor-glib/gcm-sensor-huey.c
similarity index 100%
rename from src/gcm-sensor-huey.c
rename to libcolor-glib/gcm-sensor-huey.c
diff --git a/src/gcm-sensor-huey.h b/libcolor-glib/gcm-sensor-huey.h
similarity index 98%
rename from src/gcm-sensor-huey.h
rename to libcolor-glib/gcm-sensor-huey.h
index 627bdb7..4e4d535 100644
--- a/src/gcm-sensor-huey.h
+++ b/libcolor-glib/gcm-sensor-huey.h
@@ -23,7 +23,6 @@
 #define __GCM_SENSOR_HUEY_H
 
 #include <glib-object.h>
-#include <libcolor-glib.h>
 
 #include "gcm-sensor.h"
 
diff --git a/src/gcm-sensor.c b/libcolor-glib/gcm-sensor.c
similarity index 100%
rename from src/gcm-sensor.c
rename to libcolor-glib/gcm-sensor.c
diff --git a/src/gcm-sensor.h b/libcolor-glib/gcm-sensor.h
similarity index 99%
rename from src/gcm-sensor.h
rename to libcolor-glib/gcm-sensor.h
index 302d11e..156710d 100644
--- a/src/gcm-sensor.h
+++ b/libcolor-glib/gcm-sensor.h
@@ -23,7 +23,8 @@
 #define __GCM_SENSOR_H
 
 #include <glib-object.h>
-#include <libcolor-glib.h>
+
+#include <gcm-common.h>
 
 G_BEGIN_DECLS
 
diff --git a/libcolor-glib/libcolor-glib.h b/libcolor-glib/libcolor-glib.h
index 3a2d42d..fad37ff 100644
--- a/libcolor-glib/libcolor-glib.h
+++ b/libcolor-glib/libcolor-glib.h
@@ -33,6 +33,8 @@
 #include <gcm-ddc-device.h>
 #include <gcm-ddc-client.h>
 #include <gcm-ddc-control.h>
+#include <gcm-sensor.h>
+#include <gcm-sensor-huey.h>
 
 #undef __GCM_H_INSIDE__
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 53d8ddd..0900d3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -393,10 +393,6 @@ install-data-hook:
 	fi
 
 gcm_huey_example_SOURCES =				\
-	gcm-sensor.c					\
-	gcm-sensor.h					\
-	gcm-sensor-huey.c				\
-	gcm-sensor-huey.h				\
 	gcm-huey-example.c
 
 gcm_huey_example_LDADD =				\
diff --git a/src/gcm-huey-example.c b/src/gcm-huey-example.c
index d361b7a..82a68bc 100644
--- a/src/gcm-huey-example.c
+++ b/src/gcm-huey-example.c
@@ -28,8 +28,6 @@
 #include <glib.h>
 #include <libcolor-glib.h>
 
-#include "gcm-sensor-huey.h"
-
 /**
  * main:
  **/