[tracker/tracker-0.8] VPATH build issues fixed

[Martyn James Russell <mr src gnome org>]

commit ba79527974eb9e95e2dfa95f6dde67f556227470
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Aug 2 17:59:08 2010 +0200

    VPATH build issues fixed

 src/miners/fs/Makefile.am          |    3 +++
 src/tracker-control/Makefile.am    |    2 ++
 tests/libtracker-data/Makefile.am  |    3 +++
 tests/libtracker-fts/Makefile.am   |    3 +++
 tests/libtracker-miner/Makefile.am |    6 ++++--
 5 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index b1108fb..78097bf 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -9,7 +9,10 @@ INCLUDES =								\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
+	-I$(top_srcdir)/src/libtracker-client				\
 	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_srcdir)/src/libtracker-data				\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(DBUS_CFLAGS)							\
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index b3445d5..594b15d 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
 	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_srcdir)/src/libtracker-data				\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index 6f0d44c..29376d6 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -38,7 +38,10 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
+	-I$(top_srcdir)/src/libtracker-client				\
 	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_srcdir)/src/libtracker-data				\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index 1d39f2a..a00f884 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -17,7 +17,10 @@ INCLUDES = 								\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
 	-I$(top_builddir)/src						\
+	-I$(top_srcdir)/src/libtracker-client				\
 	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_srcdir)/src/libtracker-data				\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index 54770b0..5e13e55 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -16,10 +16,12 @@ INCLUDES =									\
 	-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							\
-	-I$(top_srcdir)/tests/common						\
-	-I$(top_builddir)/src/tracker-store					\
 	-I$(top_builddir)/src							\
+	-I$(top_srcdir)/tests/common						\
+	-I$(top_srcdir)/src/libtracker-client					\
 	-I$(top_builddir)/src/libtracker-client					\
+	-I$(top_srcdir)/src/libtracker-miner					\
+	-I$(top_builddir)/src/libtracker-miner					\
 	$(WARN_CFLAGS)								\
 	$(GCOV_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\