Move the sensor drivers out to thier own folders

19 files changed, 197 insertions, 84 deletions

diff --git a/configure.ac b/configure.ac
index 03f46d6..3bdcfcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,6 +445,13 @@ po/Makefile.in
 src/Makefile
 src/plugins/Makefile
 src/sensors/Makefile
+src/sensors/argyll/Makefile
+src/sensors/colorhug/Makefile
+src/sensors/dtp94/Makefile
+src/sensors/dummy/Makefile
+src/sensors/huey/Makefile
+src/sensors/munki/Makefile
+src/sensors/spark/Makefile
 client/Makefile
 lib/Makefile
 lib/colord/cd-version.h
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 6f52577..7b65d4e 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =						\
 	$(GUDEV_CFLAGS)					\
 	-DG_LOG_DOMAIN=\"Cd\"				\
 	-DCD_COMPILATION				\
-	-DCD_DISABLE_DEPRECATED				\
 	-DCOLORD_SANE_BINARY=\""$(libexecdir)/colord-sane"\"	\
 	-I$(top_srcdir)/lib				\
 	-I$(top_builddir)/lib				\
diff --git a/src/sensors/Makefile.am b/src/sensors/Makefile.am
index ae7e30e..d369259 100644
--- a/src/sensors/Makefile.am
+++ b/src/sensors/Makefile.am
@@ -1,24 +1,24 @@
+SUBDIRS = 						\
+	argyll						\
+	colorhug					\
+	dtp94						\
+	dummy						\
+	huey						\
+	munki						\
+	spark
+
 AM_CPPFLAGS =						\
 	$(GLIB_CFLAGS)					\
 	$(GUSB_CFLAGS)					\
-	$(POLKIT_CFLAGS)				\
-	$(LCMS_CFLAGS)					\
 	$(GUDEV_CFLAGS)					\
-	$(SANE_CFLAGS)					\
-	$(SQLITE_CFLAGS)				\
 	-I$(top_srcdir)/src				\
 	-I$(top_srcdir)/lib				\
 	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib/colord			\
-	-DG_LOG_DOMAIN=\"Cd\"				\
-	-DLIBEXECDIR=\"$(libexecdir)\"			\
 	-DLIBDIR=\"$(libdir)\"				\
 	-DDATADIR=\"$(datadir)\"			\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DLOCALSTATEDIR=\""$(localstatedir)"\"		\
-	-DVERSION="\"$(VERSION)\""			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
 	-DCD_COMPILATION				\
-	-DCD_DISABLE_DEPRECATED				\
 	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
 	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
 	-DLOCALEDIR=\""$(localedir)"\"
@@ -69,77 +69,4 @@ CLEANFILES = $(noinst_PROGRAMS)
 
 endif
 
-# sensor plugins
-plugindir = $(libdir)/colord-sensors
-plugin_LTLIBRARIES =					\
-	libcolord_sensor_dummy.la
-
-libcolord_sensor_dummy_la_SOURCES = cd-sensor-dummy.c
-libcolord_sensor_dummy_la_LIBADD = $(GLIB_LIBS)
-libcolord_sensor_dummy_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_dummy_la_CFLAGS = $(WARN_CFLAGS)
-
-if HAVE_GUSB
-plugin_LTLIBRARIES +=					\
-	libcolord_sensor_spark.la			\
-	libcolord_sensor_colorhug.la			\
-	libcolord_sensor_dtp94.la			\
-	libcolord_sensor_huey.la
-
-libcolord_sensor_spark_la_SOURCES =			\
-	cd-sensor-spark.c
-libcolord_sensor_spark_la_LIBADD =			\
-	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/ospark/libospark-private.la
-libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_spark_la_CFLAGS = $(WARN_CFLAGS)
-
-libcolord_sensor_huey_la_SOURCES =			\
-	cd-sensor-huey.c
-libcolord_sensor_huey_la_LIBADD =			\
-	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/huey/libhuey-private.la
-libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_huey_la_CFLAGS = $(WARN_CFLAGS)
-
-libcolord_sensor_dtp94_la_SOURCES =			\
-	cd-sensor-dtp94.c
-libcolord_sensor_dtp94_la_LIBADD =			\
-	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/dtp94/libdtp94-private.la
-libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_dtp94_la_CFLAGS = $(WARN_CFLAGS)
-
-libcolord_sensor_colorhug_la_SOURCES =			\
-	cd-sensor-colorhug.c
-libcolord_sensor_colorhug_la_LIBADD =			\
-	$(GLIB_LIBS)					\
-	$(GUSB_LIBS)					\
-	$(top_builddir)/lib/colorhug/libcolorhug.la
-libcolord_sensor_colorhug_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_colorhug_la_CFLAGS = $(WARN_CFLAGS)
-endif
-
-if HAVE_ARGYLLCMS_SENSOR
-plugin_LTLIBRARIES +=					\
-	libcolord_sensor_argyll.la
-libcolord_sensor_argyll_la_SOURCES =			\
-	cd-spawn.c					\
-	cd-spawn.h					\
-	cd-sensor-argyll.c
-libcolord_sensor_argyll_la_LIBADD = $(GLIB_LIBS) $(GUSB_LIBS)
-libcolord_sensor_argyll_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_argyll_la_CFLAGS = $(WARN_CFLAGS)
-endif
-
-if FALSE
-libcolord_sensor_munki_la_SOURCES = cd-sensor-munki.c
-libcolord_sensor_munki_la_LIBADD = $(GLIB_LIBS)
-libcolord_sensor_munki_la_LDFLAGS = -module -avoid-version
-libcolord_sensor_munki_la_CFLAGS = $(WARN_CFLAGS)
-endif
-
 -include $(top_srcdir)/git.mk
diff --git a/src/sensors/argyll/Makefile.am b/src/sensors/argyll/Makefile.am
new file mode 100644
index 0000000..728f661
--- /dev/null
+++ b/src/sensors/argyll/Makefile.am
@@ -0,0 +1,28 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+if HAVE_ARGYLLCMS_SENSOR
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_argyll.la
+libcolord_sensor_argyll_la_SOURCES =			\
+	cd-spawn.c					\
+	cd-spawn.h					\
+	cd-sensor-argyll.c
+libcolord_sensor_argyll_la_LIBADD = $(GLIB_LIBS) $(GUSB_LIBS)
+libcolord_sensor_argyll_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_argyll_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-argyll.c b/src/sensors/argyll/cd-sensor-argyll.c
index e63e833..e63e833 100644
--- a/src/sensors/cd-sensor-argyll.c
+++ b/src/sensors/argyll/cd-sensor-argyll.c
diff --git a/src/sensors/cd-spawn.c b/src/sensors/argyll/cd-spawn.c
index 7989eb4..7989eb4 100644
--- a/src/sensors/cd-spawn.c
+++ b/src/sensors/argyll/cd-spawn.c
diff --git a/src/sensors/cd-spawn.h b/src/sensors/argyll/cd-spawn.h
index 3cae716..3cae716 100644
--- a/src/sensors/cd-spawn.h
+++ b/src/sensors/argyll/cd-spawn.h
diff --git a/src/sensors/colorhug/Makefile.am b/src/sensors/colorhug/Makefile.am
new file mode 100644
index 0000000..95ae47d
--- /dev/null
+++ b/src/sensors/colorhug/Makefile.am
@@ -0,0 +1,30 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+if HAVE_GUSB
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_colorhug.la
+
+libcolord_sensor_colorhug_la_SOURCES =			\
+	cd-sensor-colorhug.c
+libcolord_sensor_colorhug_la_LIBADD =			\
+	$(GLIB_LIBS)					\
+	$(GUSB_LIBS)					\
+	$(top_builddir)/lib/colorhug/libcolorhug.la
+libcolord_sensor_colorhug_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_colorhug_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-colorhug.c b/src/sensors/colorhug/cd-sensor-colorhug.c
index c3c2171..c3c2171 100644
--- a/src/sensors/cd-sensor-colorhug.c
+++ b/src/sensors/colorhug/cd-sensor-colorhug.c
diff --git a/src/sensors/dtp94/Makefile.am b/src/sensors/dtp94/Makefile.am
new file mode 100644
index 0000000..6df053b
--- /dev/null
+++ b/src/sensors/dtp94/Makefile.am
@@ -0,0 +1,30 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+if HAVE_GUSB
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_dtp94.la
+
+libcolord_sensor_dtp94_la_SOURCES =			\
+	cd-sensor-dtp94.c
+libcolord_sensor_dtp94_la_LIBADD =			\
+	$(GLIB_LIBS)					\
+	$(GUSB_LIBS)					\
+	$(top_builddir)/lib/dtp94/libdtp94-private.la
+libcolord_sensor_dtp94_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_dtp94_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-dtp94.c b/src/sensors/dtp94/cd-sensor-dtp94.c
index cbd744b..cbd744b 100644
--- a/src/sensors/cd-sensor-dtp94.c
+++ b/src/sensors/dtp94/cd-sensor-dtp94.c
diff --git a/src/sensors/dummy/Makefile.am b/src/sensors/dummy/Makefile.am
new file mode 100644
index 0000000..49bc28c
--- /dev/null
+++ b/src/sensors/dummy/Makefile.am
@@ -0,0 +1,24 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(LCMS_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+# sensor plugins
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_dummy.la
+
+libcolord_sensor_dummy_la_SOURCES = cd-sensor-dummy.c
+libcolord_sensor_dummy_la_LIBADD = $(GLIB_LIBS)
+libcolord_sensor_dummy_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_dummy_la_CFLAGS = $(WARN_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-dummy.c b/src/sensors/dummy/cd-sensor-dummy.c
index cd031ce..cd031ce 100644
--- a/src/sensors/cd-sensor-dummy.c
+++ b/src/sensors/dummy/cd-sensor-dummy.c
diff --git a/src/sensors/huey/Makefile.am b/src/sensors/huey/Makefile.am
new file mode 100644
index 0000000..a927f53
--- /dev/null
+++ b/src/sensors/huey/Makefile.am
@@ -0,0 +1,30 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+if HAVE_GUSB
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_huey.la
+
+libcolord_sensor_huey_la_SOURCES =			\
+	cd-sensor-huey.c
+libcolord_sensor_huey_la_LIBADD =			\
+	$(GLIB_LIBS)					\
+	$(GUSB_LIBS)					\
+	$(top_builddir)/lib/huey/libhuey-private.la
+libcolord_sensor_huey_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_huey_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-huey.c b/src/sensors/huey/cd-sensor-huey.c
index 967c17e..967c17e 100644
--- a/src/sensors/cd-sensor-huey.c
+++ b/src/sensors/huey/cd-sensor-huey.c
diff --git a/src/sensors/munki/Makefile.am b/src/sensors/munki/Makefile.am
new file mode 100644
index 0000000..c820af7
--- /dev/null
+++ b/src/sensors/munki/Makefile.am
@@ -0,0 +1,8 @@
+if FALSE
+libcolord_sensor_munki_la_SOURCES = cd-sensor-munki.c
+libcolord_sensor_munki_la_LIBADD = $(GLIB_LIBS)
+libcolord_sensor_munki_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_munki_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-munki.c b/src/sensors/munki/cd-sensor-munki.c
index b5f7ef0..b5f7ef0 100644
--- a/src/sensors/cd-sensor-munki.c
+++ b/src/sensors/munki/cd-sensor-munki.c
diff --git a/src/sensors/spark/Makefile.am b/src/sensors/spark/Makefile.am
new file mode 100644
index 0000000..8962815
--- /dev/null
+++ b/src/sensors/spark/Makefile.am
@@ -0,0 +1,30 @@
+AM_CPPFLAGS =						\
+	$(GLIB_CFLAGS)					\
+	$(GUSB_CFLAGS)					\
+	$(GUDEV_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/lib				\
+	-I$(top_builddir)/lib				\
+	-I$(top_srcdir)/lib/colord			\
+	-DG_LOG_DOMAIN=\"Cd\"				\
+	-DCD_COMPILATION				\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE		\
+	-DG_USB_API_IS_SUBJECT_TO_CHANGE		\
+	-DLOCALEDIR=\""$(localedir)"\"
+
+if HAVE_GUSB
+plugindir = $(libdir)/colord-sensors
+plugin_LTLIBRARIES =					\
+	libcolord_sensor_spark.la
+
+libcolord_sensor_spark_la_SOURCES =			\
+	cd-sensor-spark.c
+libcolord_sensor_spark_la_LIBADD =			\
+	$(GLIB_LIBS)					\
+	$(GUSB_LIBS)					\
+	$(top_builddir)/lib/ospark/libospark-private.la
+libcolord_sensor_spark_la_LDFLAGS = -module -avoid-version
+libcolord_sensor_spark_la_CFLAGS = $(WARN_CFLAGS)
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/src/sensors/cd-sensor-spark.c b/src/sensors/spark/cd-sensor-spark.c
index 62ecf07..62ecf07 100644
--- a/src/sensors/cd-sensor-spark.c
+++ b/src/sensors/spark/cd-sensor-spark.c