[tracker/configure-for-binaries: 13/14] tracker-utils: Cleaned up CFLAGS/LIBS



commit 500adfbf59dd603e8ce8279916b36d9aea4dc4c2
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 22:40:22 2010 +0100

    tracker-utils: Cleaned up CFLAGS/LIBS

 configure.ac                  |    9 +++++++++
 src/tracker-utils/Makefile.am |   12 +++---------
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3123d99..5104f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,15 @@ PKG_CHECK_MODULES(TRACKER_STORE, [$TRACKER_STORE_REQUIRED])
 
 TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS -lz -lm"
 
+# Check requirements for tracker-utils
+TRACKER_UTILS_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"
+
+PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED])
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 8c07a99..341ccb5 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -9,20 +9,14 @@ INCLUDES =								\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(GIO_CFLAGS)							\
-	$(GTHREAD_CFLAGS)						\
-	$(GLIB2_CFLAGS)
+	$(TRACKER_UTILS_CFLAGS)
 
 libs = 									\
 	$(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)							\
-	$(GIO_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GCOV_LIBS)							\
+	$(TRACKER_UTILS_LIBS)
 
 bin_PROGRAMS = 								\
 	tracker-import							\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]