[gnome-color-manager: 64/80] trivial: move GcmXserver to libcolor-glib

[Richard Hughes <rhughes src gnome org>]

commit 7a00f1a7454a84a55cdb76dc3612262b30de0da9
Author: Richard Hughes <richard hughsie com>
Date:   Sun Jul 18 12:49:52 2010 +0100

    trivial: move GcmXserver to libcolor-glib

 libcolor-glib/Makefile.am            |    5 +++++
 {src => libcolor-glib}/gcm-xserver.c |    1 -
 {src => libcolor-glib}/gcm-xserver.h |    4 ++++
 libcolor-glib/libcolor-glib.h        |    1 +
 src/Makefile.am                      |    2 --
 5 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/libcolor-glib/Makefile.am b/libcolor-glib/Makefile.am
index 95b10df..9f81946 100644
--- a/libcolor-glib/Makefile.am
+++ b/libcolor-glib/Makefile.am
@@ -7,6 +7,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 INCLUDES = \
 	$(GLIB_CFLAGS)						\
+	$(GTK_CFLAGS)						\
 	$(LCMS_CFLAGS)						\
 	$(USB_CFLAGS)						\
 	-I$(top_srcdir)/libcolor-glib				\
@@ -41,6 +42,7 @@ libcolor_glib_include_HEADERS =					\
 	gcm-enum.h						\
 	gcm-profile.h						\
 	gcm-dmi.h						\
+	gcm-xserver.h						\
 	gcm-version.h						\
 	$(NULL)
 
@@ -78,6 +80,8 @@ libcolor_glib_la_SOURCES =					\
 	gcm-enum.h						\
 	gcm-xyz.c						\
 	gcm-xyz.h						\
+	gcm-xserver.c						\
+	gcm-xserver.h						\
 	gcm-version.h						\
 	$(NULL)
 
@@ -85,6 +89,7 @@ libcolor_glib_la_LIBADD =					\
 	$(USB_LIBS)						\
 	$(LCMS_LIBS)						\
 	$(GLIB_LIBS)						\
+	$(GTK_LIBS)						\
 	-lm
 
 libcolor_glib_la_LDFLAGS =					\
diff --git a/src/gcm-xserver.c b/libcolor-glib/gcm-xserver.c
similarity index 99%
rename from src/gcm-xserver.c
rename to libcolor-glib/gcm-xserver.c
index 5f2fc29..c8511ff 100644
--- a/src/gcm-xserver.c
+++ b/libcolor-glib/gcm-xserver.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <gio/gio.h>
 #include <stdlib.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrandr.h>
diff --git a/src/gcm-xserver.h b/libcolor-glib/gcm-xserver.h
similarity index 96%
rename from src/gcm-xserver.h
rename to libcolor-glib/gcm-xserver.h
index 2cf7fcd..5279b48 100644
--- a/src/gcm-xserver.h
+++ b/libcolor-glib/gcm-xserver.h
@@ -19,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#if !defined (__LIBCOLOR_GLIB_H_INSIDE__) && !defined (LIBCOLOR_GLIB_COMPILATION)
+#error "Only <libcolor-glib.h> can be included directly."
+#endif
+
 #ifndef __GCM_XSERVER_H
 #define __GCM_XSERVER_H
 
diff --git a/libcolor-glib/libcolor-glib.h b/libcolor-glib/libcolor-glib.h
index 72805aa..84926b2 100644
--- a/libcolor-glib/libcolor-glib.h
+++ b/libcolor-glib/libcolor-glib.h
@@ -41,6 +41,7 @@
 #include <gcm-enum.h>
 #include <gcm-clut.h>
 #include <gcm-dmi.h>
+#include <gcm-xserver.h>
 
 #undef __LIBCOLOR_GLIB_H_INSIDE__
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d14c56..c8bc7a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,8 +50,6 @@ libgcmshared_a_SOURCES =				\
 	gcm-print.h					\
 	gcm-utils.c					\
 	gcm-utils.h					\
-	gcm-xserver.c					\
-	gcm-xserver.h					\
 	gcm-client.c					\
 	gcm-client.h					\
 	gcm-colorimeter.c				\