[tracker/configure-for-binaries: 9/27] libtracker-client: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit dadd6368f83c5873ea86972e600ceab838f8bc2a
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 22:06:32 2010 +0100

    libtracker-client: Cleaned up CFLAGS/LIBS

 configure.ac                      |    8 ++++++++
 src/libtracker-client/Makefile.am |   11 ++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6b6f814..1a2757a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,6 +215,14 @@ LIBTRACKER_BUS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
 PKG_CHECK_MODULES(LIBTRACKER_BUS, [$LIBTRACKER_BUS_REQUIRED])
 
+# Check requirements for libtracker-client
+LIBTRACKER_CLIENT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                            gobject-2.0  >= $GLIB_REQUIRED
+                            gio-unix-2.0 >= $GLIB_REQUIRED
+                            dbus-1       >= $DBUS_REQUIRED
+                            dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
+PKG_CHECK_MODULES(LIBTRACKER_CLIENT, [$LIBTRACKER_CLIENT_REQUIRED])
+
 # Check requirements for libtracker-common
 LIBTRACKER_COMMON_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                             gio-unix-2.0 >= $GLIB_REQUIRED
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index 2a84e02..27f7054 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -7,9 +7,8 @@ INCLUDES = 						\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src/libtracker-client		\
 	$(WARN_CFLAGS)					\
-	$(GLIB2_CFLAGS)					\
-	$(GIO_CFLAGS)					\
-	$(DBUS_CFLAGS)
+	$(GCOV_CFLAGS)					\
+	$(LIBTRACKER_CLIENT_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
 
@@ -32,10 +31,8 @@ libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 
 libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(GLIB2_LIBS) 					\
-	$(GIO_LIBS)					\
-	$(DBUS_LIBS)					\
-	$(GOBJECT_LIBS)
+	$(GCOV_LIBS)					\
+	$(LIBTRACKER_CLIENT_LIBS)
 
 libtracker_clientinclude_HEADERS = 			\
 	tracker.h					\