[tracker/configure-for-binaries: 11/27] tracker-control: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit a8d29c94a292d1fd1ba21decc7d24776f0175165
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 22:27:00 2010 +0100

    tracker-control: Cleaned up CFLAGS/LIBS

 configure.ac                    |   10 ++++++++++
 src/tracker-control/Makefile.am |   24 ++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7091855..64954f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,6 +283,16 @@ LIBTRACKER_SPARQL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$LIBTRACKER_SPARQL_REQUIRED])
 
+# Check requirements for tracker-control
+TRACKER_CONTROL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                          gio-unix-2.0 >= $GLIB_REQUIRED
+                          gthread-2.0  >= $GLIB_REQUIRED
+                          dbus-1       >= $DBUS_REQUIRED
+                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                          uuid"
+
+PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED])
+
 # Check requirements for tracker-explorer
 TRACKER_EXPLORER_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                            gio-unix-2.0 >= $GLIB_REQUIRED
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index 637e4cf..c790365 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -14,21 +14,7 @@ INCLUDES =								\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(GIO_CFLAGS)							\
-	$(GTHREAD_CFLAGS)						\
-	$(GLIB2_CFLAGS)
-
-libs = 									\
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(DBUS_LIBS)							\
-	$(GIO_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(TRACKER_CONTROL_CFLAGS)
 
 bin_PROGRAMS = tracker-control
 
@@ -36,7 +22,13 @@ tracker_control_SOURCES = 						\
 	$(dbus_sources)							\
 	tracker-control.c
 
-tracker_control_LDADD = $(libs)
+tracker_control_LDADD =							\
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GCOV_LIBS)							\
+	$(TRACKER_CONTROL_LIBS)
 
 dbus_sources = 								\
 	tracker-miner-files-index-client.h