[tracker/configure-for-binaries: 3/60] libtracker-data: Clean up CFLAGS/LIBS

[Martyn James Russell <mr src gnome org>]

commit 65d633464921ec263724b6a780c4a755b4ec4b39
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 20 21:27:13 2010 +0100

    libtracker-data: Clean up CFLAGS/LIBS

 configure.ac                      |   11 +++++++++++
 src/libtracker-data/Makefile.am   |   16 ++++------------
 tests/libtracker-data/Makefile.am |    4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1977d02..3b71204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,17 @@ LIBTRACKER_COMMON_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                             dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
 PKG_CHECK_MODULES(LIBTRACKER_COMMON, [$LIBTRACKER_COMMON_REQUIRED])
 
+# Check requirements for libtracker-data
+LIBTRACKER_DATA_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                          gio-unix-2.0 >= $GLIB_REQUIRED
+                          dbus-1       >= $DBUS_REQUIRED
+                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED
+                          sqlite3      >= $SQLITE_REQUIRED
+                          uuid"
+PKG_CHECK_MODULES(LIBTRACKER_DATA, [$LIBTRACKER_DATA_REQUIRED])
+
+LIBTRACKER_DATA_LIBS="$LIBTRACKER_DATA_LIBS -lz -lm"
+
 # 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/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 71e1eee..67cc0e2 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -9,11 +9,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	$(WARN_CFLAGS)							\
-	$(GLIB2_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(UUID_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(SQLITE3_CFLAGS)						\
+	$(LIBTRACKER_DATA_CFLAGS)					\
 	$(UNICODE_SUPPORT_CFLAGS)
 
 BUILT_SOURCES = libtracker-data.vala.stamp
@@ -85,14 +82,9 @@ libtracker_data_la_LDFLAGS =						\
 libtracker_data_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(SQLITE3_LIBS)							\
-	$(DBUS_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(UUID_LIBS)							\
-	$(GCOV_LIBS)							\
-	$(UNICODE_SUPPORT_LIBS)						\
-	-lz								\
-	-lm
+	$(BUILD_LIBS)							\
+	$(LIBTRACKER_DATA_LIBS)						\
+	$(UNICODE_SUPPORT_LIBS)
 
 if HAVE_TRACKER_FTS
 libtracker_data_la_LIBADD += 						\
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index e37e8ec..5e4e8be 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -118,12 +118,12 @@ tracker_db_journal_LDADD =						\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(BUILD_LIBS)							\
 	$(SQLITE3_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							\
 	$(GOBJECT_LIBS)							\
-	$(GCOV_LIBS)							\
 	-lz
 
 tracker_db_dbus_SOURCES = 						\
@@ -189,7 +189,7 @@ tracker_db_dbus_LDADD =						\
 
 
 
-EXTRA_DIST = \
+EXTRA_DIST = 					\
 	dawg-testcases				\
 	change/source/99-example.ontology.v1	\
 	change/source/99-example.ontology.v2	\