[tracker/configure-for-binaries: 23/60] build: Remove WARN_CFLAGS and GCOV_{CFLAGS|LIBS}, use BUILD_{CFLAGS|LIBS} instead

From: Martyn James Russell <mr src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker/configure-for-binaries: 23/60] build: Remove WARN_CFLAGS and GCOV_{CFLAGS|LIBS}, use BUILD_{CFLAGS|LIBS} instead
Date: Mon, 25 Oct 2010 18:35:19 +0000 (UTC)
commit 92c479d582734cf6bd2bdbecbec1cbcfa68c6ee3
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 22 18:03:50 2010 +0100

    build: Remove WARN_CFLAGS and GCOV_{CFLAGS|LIBS}, use BUILD_{CFLAGS|LIBS} instead

 configure.ac                           |    7 ++
 docs/tools/Makefile.am                 |    4 +-
 examples/libtracker-miner/Makefile.am  |    7 +--
 src/libtracker-bus/Makefile.am         |    7 +--
 src/libtracker-client/Makefile.am      |    5 +-
 src/libtracker-common/Makefile.am      |    7 +--
 src/libtracker-data/Makefile.am        |    5 +-
 src/libtracker-direct/Makefile.am      |    7 +--
 src/libtracker-extract/Makefile.am     |    7 +--
 src/libtracker-fts/Makefile.am         |    6 +-
 src/libtracker-miner/Makefile.am       |    7 +--
 src/libtracker-sparql/Makefile.am      |    7 +--
 src/miners/flickr/Makefile.am          |    8 +--
 src/miners/fs/Makefile.am              |    8 +--
 src/miners/rss/Makefile.am             |    8 +--
 src/plugins/evolution/Makefile.am      |   12 +--
 src/tracker-control/Makefile.am        |    7 +--
 src/tracker-extract/Makefile.am        |  110 ++++++++++++++++----------------
 src/tracker-store/Makefile.am          |    8 +--
 src/tracker-utils/Makefile.am          |    7 +--
 src/tracker-writeback/Makefile.am      |   13 ++--
 tests/libtracker-client/Makefile.am    |    9 +--
 tests/libtracker-client/tracker-test.c |    4 +-
 tests/libtracker-common/Makefile.am    |   21 +++----
 tests/libtracker-data/Makefile.am      |    9 +--
 tests/libtracker-extract/Makefile.am   |   13 ++--
 tests/libtracker-fts/Makefile.am       |    7 +--
 tests/libtracker-miner/Makefile.am     |    7 +--
 tests/libtracker-sparql/Makefile.am    |    9 +--
 tests/tracker-extract/Makefile.am      |    5 +-
 tests/tracker-miner-fs/Makefile.am     |    7 +--
 tests/tracker-steroids/Makefile.am     |    9 +--
 tests/tracker-store/Makefile.am        |    5 +-
 utils/mtp/Makefile.am                  |    9 +--
 utils/services/Makefile.am             |    6 +-
 35 files changed, 144 insertions(+), 233 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d995b6..e833a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,6 +445,13 @@ PKG_CHECK_MODULES(TRACKER_SEARCH_BAR, [$TRACKER_SEARCH_BAR_REQUIRED],
                   [have_tracker_search_bar=yes],
                   [have_tracker_search_bar=no])
 
+# General CFLAGS/LIBS
+BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION"
+BUILD_LIBS="${GCOV_LIBS}"
+
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_LIBS)
+
 # Check for enca, detects defect Russian or Cyrillic language specifics in mp3s
 AC_ARG_WITH(enca,
             AS_HELP_STRING([--with-enca],
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index f4f4473..c450fed 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -3,8 +3,7 @@ include $(top_srcdir)/Makefile.decl
 noinst_PROGRAMS = ontology-graph ttl2sgml
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
@@ -12,7 +11,6 @@ INCLUDES = 								\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-data				\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
 	$(DBUS_CFLAGS)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 3cf4671..541654c 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -1,15 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =							\
+	$(BUILD_CFLAGS)						\
 	-DSHAREDIR=\""$(datadir)"\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"				\
-	-DTRACKER_COMPILATION					\
 	-I$(top_srcdir)/src					\
 	-I$(top_builddir)/src					\
 	-I$(top_builddir)/src/libtracker-client			\
-	$(WARN_CFLAGS)						\
 	$(GLIB2_CFLAGS)						\
-	$(GCOV_CFLAGS)						\
 	$(GIO_CFLAGS)						\
 	$(DBUS_CFLAGS)
 
@@ -25,11 +22,11 @@ tracker_miner_test_LDADD =                             		\
        $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-common/libtracker-common.la \
+       $(BUILD_LIBS)                                   		\
        $(DBUS_LIBS)                                    		\
        $(GMODULE_LIBS)                                 		\
        $(GTHREAD_LIBS)                                 		\
        $(GIO_LIBS)                                     		\
-       $(GCOV_LIBS)                                    		\
        $(GLIB2_LIBS)                                   		\
        -lz                                             		\
        -lm
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index 2ede78d..d3627e5 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -3,14 +3,11 @@ include $(top_srcdir)/Makefile.decl
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
 INCLUDES =								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(LIBTRACKER_BUS_CFLAGS)
 
 modules_LTLIBRARIES = libtracker-bus.la
@@ -51,7 +48,7 @@ BUILT_SOURCES = libtracker-bus.vala.stamp
 libtracker_bus_la_LIBADD = 				\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(GCOV_LIBS) 					\
+	$(BUILD_LIBS) 					\
 	$(LIBTRACKER_BUS_LIBS)
 
 MAINTAINERCLEANFILES =					\
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index 4f37c5e..f114ddb 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -1,13 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES = 						\
+	$(BUILD_CFLAGS)					\
 	-DLOCALEDIR=\""$(localedir)"\" 			\
-	-DG_LOG_DOMAIN=\"Tracker\"			\
-	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src/libtracker-client		\
-	$(WARN_CFLAGS)					\
-	$(GCOV_CFLAGS)					\
 	$(LIBTRACKER_CLIENT_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 8e5027f..102cdd2 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -1,12 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =						\
+	$(BUILD_CFLAGS)					\
 	-DSHAREDIR=\""$(datadir)"\"			\
-	-DG_LOG_DOMAIN=\"Tracker\"			\
-	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
-	$(WARN_CFLAGS)					\
-	$(GCOV_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(UPOWER_CFLAGS)				\
 	$(LIBTRACKER_COMMON_CFLAGS)
@@ -77,7 +74,7 @@ libtracker_common_la_LDFLAGS = 				\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libtracker_common_la_LIBADD = 				\
-	$(GCOV_LIBS)					\
+	$(BUILD_LIBS)					\
 	$(LIBTRACKER_COMMON_LIBS)			\
 	$(HAL_LIBS)					\
 	$(UPOWER_LIBS)
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 67cc0e2..316426e 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -1,15 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-DSHAREDIR=\""$(datadir)"\"					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(LIBTRACKER_DATA_CFLAGS)					\
 	$(UNICODE_SUPPORT_CFLAGS)
 
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index d32d4f0..ed22dc7 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -3,14 +3,11 @@ include $(top_srcdir)/Makefile.decl
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
 INCLUDES =								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_srcdir)/src/libtracker-data				\
 	-I$(top_builddir)/src						\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(LIBTRACKER_DIRECT_CFLAGS)
 
 modules_LTLIBRARIES = libtracker-direct.la
@@ -43,7 +40,7 @@ BUILT_SOURCES = libtracker-direct.vala.stamp
 
 libtracker_direct_la_LIBADD = 				\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	\
-	$(GCOV_LIBS)					\
+	$(BUILD_LIBS)					\
 	$(LIBTRACKER_DIRECT_LIBS)
 
 MAINTAINERCLEANFILES =					\
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index e056ef0..882fea5 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -1,14 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =						\
+	$(BUILD_CFLAGS)					\
 	-DSHAREDIR=\""$(datadir)"\"			\
-	-DG_LOG_DOMAIN=\"Tracker\"			\
-	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src				\
 	-I$(top_builddir)/src/libtracker-sparql		\
-	$(WARN_CFLAGS)					\
-	$(GCOV_CFLAGS)					\
 	$(LIBTRACKER_EXTRACT_CFLAGS)			\
 	$(LIBIPTCDATA_CFLAGS)				\
 	$(LIBEXIF_CFLAGS) 				\
@@ -45,7 +42,7 @@ libtracker_extract_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(GCOV_LIBS)					\
+	$(BUILD_LIBS)					\
 	$(LIBTRACKER_EXTRACT_LIBS)			\
 	$(LIBIPTCDATA_LIBS)				\
 	$(LIBEXIF_LIBS)					\
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index 4b5fe43..a87d93f 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -1,11 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
-	-DTRACKER_COMPILATION						\
 	-DNDEBUG							\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(LIBTRACKER_FTS_CFLAGS)					\
 	$(UNICODE_SUPPORT_CFLAGS)
 
@@ -34,6 +32,6 @@ endif
 
 libtracker_fts_la_LIBADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(LIBTRACKER_FTS_LIBS)						\
 	$(UNICODE_SUPPORT_LIBS)
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index ccecd2c..7dc662c 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -6,15 +6,12 @@ include $(top_srcdir)/Makefile.decl
 include Makefile-shared-sources.decl
 
 INCLUDES =						\
+	$(BUILD_CFLAGS)					\
 	-DSHAREDIR=\""$(datadir)"\"			\
 	-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\"	\
-	-DG_LOG_DOMAIN=\"Tracker\"			\
-	-DTRACKER_COMPILATION				\
 	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" 	\
 	-I$(top_srcdir)/src				\
 	-I$(top_builddir)/src				\
-	$(WARN_CFLAGS)					\
-	$(GCOV_CFLAGS)					\
 	$(LIBTRACKER_MINER_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
@@ -62,7 +59,7 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(GCOV_LIBS)					\
+	$(BUILD_LIBS)					\
 	$(LIBTRACKER_MINER_LIBS)
 
 if HAVE_GNOME_KEYRING
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 0d13f74..894fad5 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -3,13 +3,10 @@ include $(top_srcdir)/Makefile.decl
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
 INCLUDES =								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-DSPARQL_MODULES_DIR=\""$(modulesdir)"\" 			\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
@@ -58,7 +55,7 @@ vapi_DATA =						\
 	tracker-sparql-$(TRACKER_API_VERSION).deps
 
 libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD = 	\
-	$(GCOV_LIBS)					\
+	$(BUILD_LIBS)					\
 	$(LIBTRACKER_SPARQL_LIBS)
 
 MAINTAINERCLEANFILES =					\
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index d6ee5ed..dee086c 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -1,18 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
-	-Wall								\
+	$(BUILD_CFLAGS)							\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_MINER_FLICKR_CFLAGS)
 
 VALAFLAGS =								\
@@ -36,7 +32,7 @@ tracker_miner_flickr_SOURCES =						\
 tracker_miner_flickr_LDADD =						\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_MINER_FLICKR_LIBS)
 
 vapi_sources =								\
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index db78c89..63af529 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -1,12 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
-	-Wall								\
+	$(BUILD_CFLAGS)							\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
@@ -16,8 +14,6 @@ INCLUDES =								\
 	-I$(top_builddir)/src/libtracker-data				\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_MINER_FS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-fs
@@ -40,7 +36,7 @@ tracker_miner_fs_LDADD =						\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_MINER_FS_LIBS)
 
 if HAVE_MEEGOTOUCH
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 1a68cfb..4eb5d70 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -1,18 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
-	-Wall								\
+	$(BUILD_CFLAGS)							\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_MINER_RSS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-rss
@@ -26,5 +22,5 @@ tracker_miner_rss_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	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_MINER_RSS_LIBS)
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 02e8b3e..9eeed2e 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -1,17 +1,13 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""			\
 	-DLOCALEDIR="\"$(localedir)\""					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(DBUS_CFLAGS)							\
-	$(EVOLUTION_PLUGIN_CFLAGS)					\
-	$(GCOV_CFLAGS)
+	$(EVOLUTION_PLUGIN_CFLAGS)
 
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
@@ -39,9 +35,9 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = 		\
 	$(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	\
+	$(BUILD_LIBS)							\
 	$(EVOLUTION_PLUGIN_LIBS)					\
-	$(DBUS_LIBS)							\
-	$(GCOV_LIBS)
+	$(DBUS_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index c790365..2a66656 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -1,9 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
@@ -12,8 +11,6 @@ INCLUDES =								\
 	-I$(top_builddir)/src/libtracker-data				\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_CONTROL_CFLAGS)
 
 bin_PROGRAMS = tracker-control
@@ -27,7 +24,7 @@ tracker_control_LDADD =							\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_CONTROL_LIBS)
 
 dbus_sources = 								\
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 6432a83..322cecd 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -4,16 +4,13 @@ module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
 INCLUDES = 								\
+	$(BUILD_CFLAGS)							\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\"			\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src 						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(GCOV_CFLAGS)							\
-	$(WARN_CFLAGS)							\
 	$(TRACKER_EXTRACT_CFLAGS)					\
 	$(GDKPIXBUF_CFLAGS)						\
 	$(LIBGIF_CFLAGS)						\
@@ -115,8 +112,8 @@ libextract_abw_la_LDFLAGS = $(module_flags)
 libextract_abw_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c
@@ -124,8 +121,8 @@ libextract_mp3_la_LDFLAGS = $(module_flags)
 libextract_mp3_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 if HAVE_ENCA
 libextract_mp3_la_LIBADD += $(ENCA_LIBS)
@@ -138,9 +135,9 @@ libextract_vorbis_la_LDFLAGS = $(module_flags)
 libextract_vorbis_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBVORBIS_LIBS)						\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(LIBVORBIS_LIBS)
 
 # Flac
 libextract_flac_la_SOURCES = tracker-extract-flac.c $(escape_sources)
@@ -148,9 +145,9 @@ libextract_flac_la_LDFLAGS = $(module_flags)
 libextract_flac_la_LIBADD =						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBFLAC_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(LIBFLAC_LIBS)
 
 # MPlayer
 libextract_mplayer_la_SOURCES = tracker-extract-mplayer.c
@@ -158,6 +155,7 @@ libextract_mplayer_la_LDFLAGS = $(module_flags)
 libextract_mplayer_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)
 
 # Oasis
@@ -166,8 +164,8 @@ libextract_oasis_la_LDFLAGS = $(module_flags)
 libextract_oasis_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 # PNG
 libextract_png_la_SOURCES = tracker-extract-png.c
@@ -175,9 +173,9 @@ libextract_png_la_LDFLAGS = $(module_flags)
 libextract_png_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS) 							\
-	$(LIBPNG_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(LIBPNG_LIBS)
 
 # PS
 libextract_ps_la_SOURCES = tracker-extract-ps.c
@@ -185,8 +183,8 @@ libextract_ps_la_LDFLAGS = $(module_flags)
 libextract_ps_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS)                                                   \
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 # Totem
 libextract_totem_la_SOURCES = tracker-extract-totem.c
@@ -194,25 +192,25 @@ libextract_totem_la_LDFLAGS = $(module_flags)
 libextract_totem_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 # XMP
 libextract_xmp_la_SOURCES = tracker-extract-xmp.c
 libextract_xmp_la_LDFLAGS = $(module_flags)
 libextract_xmp_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)
 
 # HTML
 libextract_html_la_SOURCES = tracker-extract-html.c
 libextract_html_la_LDFLAGS = $(module_flags)
 libextract_html_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(GLIB2_LIBS) 							\
-	$(LIBXML2_LIBS) 						\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(LIBXML2_LIBS)
 
 # MS Office
 libextract_msoffice_la_SOURCES = tracker-extract-msoffice.c
@@ -220,9 +218,9 @@ libextract_msoffice_la_LDFLAGS = $(module_flags)
 libextract_msoffice_la_LIBADD = 					\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBGSF_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(LIBGSF_LIBS)
 
 # PDF
 libextract_pdf_la_SOURCES = tracker-extract-pdf.cpp
@@ -230,36 +228,36 @@ libextract_pdf_la_LDFLAGS = $(module_flags)
 libextract_pdf_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(POPPLER_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(POPPLER_LIBS)
 
 # GStreamer
 libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c
 libextract_gstreamer_la_LDFLAGS = $(module_flags)
 libextract_gstreamer_la_LIBADD = 					\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(GSTREAMER_LIBS)						\
+	$(BUILD_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GSTREAMER_LIBS)
 
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gstreamer_helix_la_LIBADD = 					\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(GSTREAMER_LIBS) 						\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(GSTREAMER_LIBS)
 
 # GUPnP DLNA
 libextract_gupnp_dlna_la_SOURCES = tracker-extract-gupnp-dlna.c
 libextract_gupnp_dlna_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gupnp_dlna_la_LIBADD = 					\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(GUPNP_DLNA_LIBS) 						\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(GUPNP_DLNA_LIBS)
 
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c
@@ -267,9 +265,9 @@ libextract_xine_la_LDFLAGS = $(module_flags)
 libextract_xine_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(XINE_LIBS)							\
-	$(GLIB2_LIBS)  							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(XINE_LIBS)
 
 # GIF
 libextract_gif_la_SOURCES = tracker-extract-gif.c
@@ -277,9 +275,9 @@ libextract_gif_la_LDFLAGS = $(module_flags)
 libextract_gif_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBGIF_LIBS)	 						\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(LIBGIF_LIBS)
 
 # JPEG
 libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c
@@ -287,36 +285,36 @@ libextract_jpeg_la_LDFLAGS = $(module_flags)
 libextract_jpeg_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(LIBJPEG_LIBS) 						\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(LIBJPEG_LIBS)
 
 # TIFF
 libextract_tiff_la_SOURCES = tracker-extract-tiff.c $(xmp_sources) $(iptc_sources)
 libextract_tiff_la_LDFLAGS = $(module_flags)
 libextract_tiff_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(LIBTIFF_LIBS) 						\
-	$(GLIB2_LIBS) 							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(LIBTIFF_LIBS)
 
 # Playlists using totem-pl-parser
 libextract_playlist_la_SOURCES = tracker-extract-playlist.c
 libextract_playlist_la_LDFLAGS = $(module_flags)
 libextract_playlist_la_LIBADD = 					\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(TOTEM_PL_PARSER_LIBS) 					\
-	$(GLIB2_LIBS)  							\
-	$(GCOV_LIBS)
+	$(BUILD_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(TOTEM_PL_PARSER_LIBS)
 
 # TIFF
 libextract_text_la_SOURCES = tracker-extract-text.c
 libextract_text_la_LDFLAGS = $(module_flags)
 libextract_text_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)  							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 #
 # Binaries
@@ -345,7 +343,7 @@ 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	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_EXTRACT_LIBS)
 
 if HAVE_LIBGSF
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 13c0895..535056d 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -1,20 +1,17 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\"         \
 	-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\"	\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_srcdir)/src/libtracker-data				\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-data				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_STORE_CFLAGS)
 
 #
@@ -48,11 +45,10 @@ tracker_store_SOURCES =							\
 	tracker-steroids.h
 
 tracker_store_LDADD =							\
-	$(plugin_libs)							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_STORE_LIBS)
 
 marshal_sources =                                         		\
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 341ccb5..a172623 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -1,21 +1,18 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_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	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_UTILS_LIBS)
 
 bin_PROGRAMS = 								\
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index ddadb28..6c3d30e 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -4,16 +4,13 @@ module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules
 
 INCLUDES = 								\
+	$(BUILD_CFLAGS)							\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DMODULESDIR=\"$(modulesdir)\"					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" 			\
 	-I$(top_srcdir)/src 						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(TRACKER_WRITEBACK_CFLAGS)					\
 	$(TAGLIB_CFLAGS)						\
 	$(EXEMPI_CFLAGS)						\
@@ -27,7 +24,7 @@ if HAVE_TAGLIB
 modules_LTLIBRARIES += libwriteback-taglib.la
 libwriteback_taglib_la_SOURCES = tracker-writeback-taglib.c
 libwriteback_taglib_la_LDFLAGS = $(module_flags)
-libwriteback_taglib_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) $(TAGLIB_LIBS)
+libwriteback_taglib_la_LIBADD = $(BUILD_LIBS) $(GLIB2_LIBS) $(TAGLIB_LIBS)
 endif
 
 # XMP
@@ -35,7 +32,7 @@ if HAVE_EXEMPI
 modules_LTLIBRARIES += libwriteback-xmp.la
 libwriteback_xmp_la_SOURCES = tracker-writeback-xmp.c
 libwriteback_xmp_la_LDFLAGS = $(module_flags)
-libwriteback_xmp_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) $(EXEMPI_LIBS)
+libwriteback_xmp_la_LIBADD = $(BUILD_LIBS) $(GLIB2_LIBS) $(EXEMPI_LIBS)
 endif
 
 # Playlists
@@ -43,7 +40,7 @@ endif
 #modules_LTLIBRARIES += libwriteback-playlist.la
 #libwriteback_playlist_la_SOURCES = tracker-writeback-playlist.c
 #libwriteback_playlist_la_LDFLAGS = $(module_flags)
-#libwriteback_playlist_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) $(TOTEM_PL_PARSER_LIBS)
+#libwriteback_playlist_la_LIBADD = $(BUILD_LIBS) $(GLIB2_LIBS) $(TOTEM_PL_PARSER_LIBS)
 #endif
 
 #
@@ -73,7 +70,7 @@ 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	\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(TRACKER_WRITEBACK_LIBS)
 
 dbus_sources = 								\
diff --git a/tests/libtracker-client/Makefile.am b/tests/libtracker-client/Makefile.am
index d437a69..f442891 100644
--- a/tests/libtracker-client/Makefile.am
+++ b/tests/libtracker-client/Makefile.am
@@ -6,13 +6,10 @@ TEST_PROGS += 								\
 	tracker-test
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
 	$(DBUS_CFLAGS)
@@ -22,9 +19,9 @@ tracker_test_SOURCES = 							\
 
 tracker_test_LDADD = 							\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
\ No newline at end of file
+	$(GLIB2_LIBS)
diff --git a/tests/libtracker-client/tracker-test.c b/tests/libtracker-client/tracker-test.c
index da6cef1..84d858b 100644
--- a/tests/libtracker-client/tracker-test.c
+++ b/tests/libtracker-client/tracker-test.c
@@ -16,8 +16,10 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  */
+
 #include <glib.h>
-#include <libtracker-client/tracker.h>
+
+#include <libtracker-client/tracker-client.h>
 
 static void
 test_tracker_client ()
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index 76fc1fe..aa81944 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -9,13 +9,10 @@ TEST_PROGS += 								\
 	tracker-utils
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
 	$(DBUS_CFLAGS)
@@ -29,12 +26,12 @@ tracker_dbus_SOURCES = 							\
 tracker_dbus_LDADD =							\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 tracker_type_utils_SOURCES = \
 	tracker-type-utils-test.c
@@ -42,11 +39,11 @@ tracker_type_utils_SOURCES = \
 tracker_type_utils_LDADD =						\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GOBJECT_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 tracker_file_utils_SOURCES = 						\
 	tracker-file-utils-test.c
@@ -54,21 +51,21 @@ tracker_file_utils_SOURCES = 						\
 tracker_file_utils_LDADD =						\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 tracker_utils_SOURCES = 						\
 	tracker-utils-test.c
 
 tracker_utils_LDADD =							\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 EXTRA_DIST = non-utf8.txt
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index 5e4e8be..a974b4a 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -52,10 +52,9 @@ TEST_PROGS += 								\
 # 	tracker-db-manager-custom
 
 INCLUDES = 								\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"				\
 	-DTOP_BUILDDIR=\"$(abs_top_builddir)\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
@@ -65,8 +64,6 @@ INCLUDES = 								\
 	-I$(top_builddir)/src/libtracker-data				\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(SQLITE3_CFLAGS)						\
 	$(GMODULE_CFLAGS)						\
@@ -77,7 +74,7 @@ common_ldadd =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							\
@@ -133,12 +130,12 @@ tracker_db_dbus_LDADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(BUILD_LIBS)							\
 	$(SQLITE3_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							\
 	$(GOBJECT_LIBS)							\
-	$(GCOV_LIBS)							\
 	-lz
 
 #
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index e6291e4..60fde39 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -7,15 +7,12 @@ TEST_PROGS += 								\
 	tracker-xmp
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
 	$(DBUS_CFLAGS)
@@ -28,11 +25,11 @@ tracker_utils_LDADD =							\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la   \
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GOBJECT_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 tracker_xmp_SOURCES = \
 	tracker-xmp-test.c
@@ -42,8 +39,8 @@ tracker_xmp_LDADD =							\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la   \
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GOBJECT_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index 06928be..6aa77e4 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -14,10 +14,9 @@ TEST_PROGS += 								\
 	tracker-parser-test
 
 INCLUDES = 								\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-DTOP_BUILDDIR=\"$(top_builddir)\"				\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
@@ -27,8 +26,6 @@ INCLUDES = 								\
 	-I$(top_builddir)/src/libtracker-data				\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(SQLITE3_CFLAGS)						\
 	$(GMODULE_CFLAGS)						\
@@ -39,7 +36,7 @@ common_ldadd =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(GCOV_LIBS)							\
+	$(BUILD_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index fce4b35..a4bb01f 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -15,10 +15,9 @@ TEST_PROGS +=									\
 	tracker-monitor-test
 
 INCLUDES =									\
+	$(BUILD_CFLAGS)								\
 	-DTEST									\
-	-DG_LOG_DOMAIN=\"Tracker\"						\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
-	-DTRACKER_COMPILATION							\
 	-DTEST_DATA_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/data"\"	\
 	-DTEST_MINERS_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/mock-miners"\"	\
 	-I$(top_srcdir)/src							\
@@ -30,8 +29,6 @@ INCLUDES =									\
 	-I$(top_builddir)/src/libtracker-miner					\
 	-I$(top_srcdir)/src/libtracker-sparql					\
 	-I$(top_builddir)/src/libtracker-sparql					\
-	$(WARN_CFLAGS)								\
-	$(GCOV_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
 	$(GIO_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
@@ -42,8 +39,8 @@ 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		\
+	$(BUILD_LIBS)                                                           \
 	$(DBUS_LIBS)                                                            \
-	$(GCOV_LIBS)                                                            \
 	$(GMODULE_LIBS)                                                         \
 	$(GTHREAD_LIBS)                                                         \
 	$(GIO_LIBS)                                                             \
diff --git a/tests/libtracker-sparql/Makefile.am b/tests/libtracker-sparql/Makefile.am
index 972a364..7451d46 100644
--- a/tests/libtracker-sparql/Makefile.am
+++ b/tests/libtracker-sparql/Makefile.am
@@ -6,14 +6,11 @@ TEST_PROGS += 								\
 	tracker-test
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_srcdir)/tests/common					\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)
 
@@ -22,8 +19,8 @@ tracker_test_SOURCES = 							\
 
 tracker_test_LDADD = 							\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
diff --git a/tests/tracker-extract/Makefile.am b/tests/tracker-extract/Makefile.am
index 0eb3a28..e2c92f8 100644
--- a/tests/tracker-extract/Makefile.am
+++ b/tests/tracker-extract/Makefile.am
@@ -24,15 +24,12 @@ noinst_PROGRAMS = $(TEST_PROGS)
 # endif
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
+	$(BUILD_CFLAGS)							\
 	-DMODULESDIR=\"$(modulesdir)\"					\
 	-DTEST_DATA_DIR=\""$(abs_top_builddir)/tests/tracker-extract/data"\"\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
 	$(DBUS_CFLAGS)
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index 491d020..853495e 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -5,18 +5,15 @@ noinst_PROGRAMS = $(TEST_PROGS)
 TEST_PROGS += tracker-metadata-utils
 
 INCLUDES = 									\
+	$(BUILD_CFLAGS)								\
 	-DTEST									\
-	-DG_LOG_DOMAIN=\"Tracker\"						\
 	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/indexer-modules"\"	\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
-	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
 	-I$(top_builddir)/src/tracker-store					\
 	-I$(top_builddir)/src/miners/fs						\
-	$(WARN_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
-	$(GCOV_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
 	$(GTHREAD_CFLAGS)							\
 	$(DBUS_CFLAGS)
@@ -31,9 +28,9 @@ tracker_metadata_utils_LDADD =	                                        	\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la           	\
+	$(BUILD_LIBS)								\
 	$(DBUS_LIBS)								\
 	$(GMODULE_LIBS)								\
 	$(GTHREAD_LIBS)								\
 	$(GIO_LIBS)								\
-	$(GCOV_LIBS)								\
 	$(GLIB2_LIBS)
diff --git a/tests/tracker-steroids/Makefile.am b/tests/tracker-steroids/Makefile.am
index 43abbd0..fd9291b 100644
--- a/tests/tracker-steroids/Makefile.am
+++ b/tests/tracker-steroids/Makefile.am
@@ -6,13 +6,10 @@ TEST_PROGS += 								\
 	tracker-test
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GTHREAD_CFLAGS)						\
 	$(DBUS_CFLAGS)
@@ -23,9 +20,9 @@ tracker_test_SOURCES = 							\
 tracker_test_LDADD = 							\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
diff --git a/tests/tracker-store/Makefile.am b/tests/tracker-store/Makefile.am
index 40d3a09..09fe348 100644
--- a/tests/tracker-store/Makefile.am
+++ b/tests/tracker-store/Makefile.am
@@ -5,17 +5,14 @@ noinst_PROGRAMS = $(TEST_PROGS)
 # TEST_PROGS += tracker-events
 
 INCLUDES = 									\
+	$(BUILD_CFLAGS)								\
 	-DTEST									\
-	-DG_LOG_DOMAIN=\"Tracker\"						\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
-	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
 	-I$(top_builddir)/src/tracker-store					\
 	-I$(top_builddir)/src/tracker-miner-fs					\
-	$(WARN_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
-	$(GCOV_CFLAGS)								\
 	$(GMODULE_CFLAGS)							\
 	$(GTHREAD_CFLAGS)							\
 	$(DBUS_CFLAGS)
diff --git a/utils/mtp/Makefile.am b/utils/mtp/Makefile.am
index 516ad30..c840c29 100644
--- a/utils/mtp/Makefile.am
+++ b/utils/mtp/Makefile.am
@@ -1,15 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
 INCLUDES =								\
+	$(BUILD_CFLAGS)							\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-sparql				\
 	-I$(top_srcdir)/src/libtracker-sparql				\
-	$(WARN_CFLAGS)							\
-	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(GIO_CFLAGS)							\
 	$(GTHREAD_CFLAGS)						\
@@ -18,11 +15,11 @@ INCLUDES =								\
 libs = 									\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(GCOV_LIBS)
+	$(GLIB2_LIBS)
 
 noinst_PROGRAMS = mtp-dummy
 
diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am
index d016ab4..396bdb9 100644
--- a/utils/services/Makefile.am
+++ b/utils/services/Makefile.am
@@ -5,13 +5,11 @@ noinst_PROGRAMS = ontology-validator data-validator $(TEST_PROGS)
 #TEST_PROGS += qname-test
 
 INCLUDES = 								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DTRACKER_COMPILATION						\
+	$(BUILD_CFLAGS)							\
 	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/src/libtracker-sparql				\
 	-I$(top_builddir)/src						\
-	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
 	$(DBUS_CFLAGS)
@@ -23,6 +21,7 @@ ontology_validator_LDADD =						\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GLIB2_LIBS)
@@ -34,6 +33,7 @@ data_validator_LDADD =							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GLIB2_LIBS)							\
 	$(GIO_LIBS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]