[tracker/configure-for-binaries: 14/80] tracker-writeback: Cleaned up CFLAGS/LIBS



commit 23f53a3b01baf478d3765623eff6279e10d1898b
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Oct 21 14:53:30 2010 +0100

    tracker-writeback: Cleaned up CFLAGS/LIBS

 configure.ac                      |   10 ++++++++++
 src/tracker-writeback/Makefile.am |   11 ++---------
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e05d8a0..f42baf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,16 @@ TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED])
 
+# Check requirements for tracker-writeback
+TRACKER_WRITEBACK_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                            gio-unix-2.0 >= $GLIB_REQUIRED
+                            gmodule-2.0  >= $GLIB_REQUIRED
+                            gthread-2.0  >= $GLIB_REQUIRED
+                            dbus-1       >= $DBUS_REQUIRED
+                            dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_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-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 4e6bbfa..ddadb28 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -12,12 +12,9 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src 						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(TRACKER_APPS_CFLAGS)						\
 	$(WARN_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(GMODULE_CFLAGS) 						\
-	$(DBUS_CFLAGS)							\
+	$(TRACKER_WRITEBACK_CFLAGS)					\
 	$(TAGLIB_CFLAGS)						\
 	$(EXEMPI_CFLAGS)						\
 	$(TOTEM_PL_PARSER_CFLAGS)
@@ -76,12 +73,8 @@ tracker_writeback_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	\
-	$(TRACKER_APPS_LIBS)						\
-	$(DBUS_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
 	$(GCOV_LIBS)							\
-	$(GLIB2_LIBS)
+	$(TRACKER_WRITEBACK_LIBS)
 
 dbus_sources = 								\
 	tracker-writeback-glue.h



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