[tracker/configure-for-binaries: 19/80] tracker-extract: Cleaned up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 37b1e0eb4878c4d386fe6910452429b3c37a2c3f
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 16:10:15 2010 +0100

    tracker-extract: Cleaned up CFLAGS/LIBS

 configure.ac                    |   10 ++++++++++
 src/tracker-extract/Makefile.am |   15 +++------------
 2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 241601f..2425030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,16 @@ PKG_CHECK_MODULES(TRACKER_STORE, [$TRACKER_STORE_REQUIRED])
 
 TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS -lz -lm"
 
+# Check requirements for tracker-extract
+TRACKER_EXTRACT_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                          gio-unix-2.0 >= $GLIB_REQUIRED
+                          gthread-2.0  >= $GLIB_REQUIRED
+                          gmodule-2.0  >= $GLIB_REQUIRED
+                          dbus-1       >= $DBUS_REQUIRED
+                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED])
+
 # Check requirements for tracker-utils
 TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                         gio-unix-2.0 >= $GLIB_REQUIRED
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index d6f4a9d..6432a83 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -3,9 +3,6 @@ include $(top_srcdir)/Makefile.decl
 module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_CXXFLAGS = $(WARN_CXXFLAGS)
-
 INCLUDES = 								\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\"			\
@@ -15,12 +12,10 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(GLIB2_CFLAGS)							\
-	$(GIO_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
+	$(WARN_CFLAGS)							\
+	$(TRACKER_EXTRACT_CFLAGS)					\
 	$(GDKPIXBUF_CFLAGS)						\
-	$(GMODULE_CFLAGS) 						\
-	$(DBUS_CFLAGS)							\
 	$(LIBGIF_CFLAGS)						\
 	$(LIBJPEG_CFLAGS) 						\
 	$(LIBTIFF_CFLAGS) 						\
@@ -350,12 +345,8 @@ tracker_extract_LDADD = 						\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(DBUS_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GIO_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(GLIB2_LIBS)
+	$(TRACKER_EXTRACT_LIBS)
 
 if HAVE_LIBGSF
 tracker_extract_SOURCES += tracker-gsf.c tracker-gsf.h