[tracker] build: Fix VPATH builds

[Aleksander Morgado <aleksm src gnome org>]

commit 6d01e1098003fccdf644052e2d19ef34ebe023b8
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Aug 16 13:42:52 2010 +0200

    build: Fix VPATH builds

 src/libtracker-bus/.gitignore      |    2 +-
 src/libtracker-bus/Makefile.am     |   21 +++++++++++++++------
 src/libtracker-sparql/.gitignore   |    2 +-
 src/libtracker-sparql/Makefile.am  |   20 ++++++++++++--------
 tests/functional-tests/Makefile.am |   10 +++-------
 5 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/src/libtracker-bus/.gitignore b/src/libtracker-bus/.gitignore
index f0b768e..c326b36 100644
--- a/src/libtracker-bus/.gitignore
+++ b/src/libtracker-bus/.gitignore
@@ -1,3 +1,3 @@
 tracker-bus.[ch]
-tracker-bus-*.vapi
+tracker-bus*.vapi
 tracker-array-cursor.c
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index 31578c8..bfb8bb1 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -47,17 +47,25 @@ noinst_HEADERS = 			\
 
 # Vala sources
 vapi_sources =						\
-	config.vapi \
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi	\
-	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
-	tracker-bus-fd-cursor.vapi \
-	tracker-bus-fd-update.vapi \
+	config.vapi					\
+	$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi 	\
+	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi 				\
+	tracker-bus-fd-cursor.vapi 			\
+	tracker-bus-fd-update.vapi 			\
 	tracker-bus-array-update.vapi
 
 libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus-$(TRACKER_API_VERSION).vapi $^
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^
 	$(AM_V_GEN)touch $@
 
+# Vala bindings
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = tracker-bus-$(TRACKER_API_VERSION).vapi
+
+tracker-bus.vapi: libtracker-bus.vala.stamp
+tracker-bus-$(TRACKER_API_VERSION).vapi: tracker-bus.vapi
+	cp $< $@
+
 libtracker_bus_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(GLIB2_LIBS) \
@@ -80,6 +88,7 @@ EXTRA_DIST = 						\
 	config.vapi \
 	$(libtracker_bus_la_VALASOURCES) \
 	libtracker-bus.vala.stamp \
+	tracker-bus.vapi \
 	tracker-bus-fd-cursor.vapi \
 	tracker-bus-fd-update.vapi \
 	tracker-bus-array-update.vapi
diff --git a/src/libtracker-sparql/.gitignore b/src/libtracker-sparql/.gitignore
index 7457f22..1890d82 100644
--- a/src/libtracker-sparql/.gitignore
+++ b/src/libtracker-sparql/.gitignore
@@ -3,6 +3,6 @@ tracker-connection.c
 tracker-cursor.c
 tracker-plugin-loader.c
 tracker-query.c
-tracker-sparql-*.vapi
+tracker-sparql*.vapi
 tracker-sparql.h
 tracker-utils.c
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 70b6676..b701cc9 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -36,11 +36,6 @@ libtracker_sparql_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 libtracker_sparqlinclude_HEADERS = 			\
 	tracker-sparql.h
 
-# Vala bindings
-vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA =                     			\
-	tracker-sparql-$(TRACKER_API_VERSION).vapi
-
 # Vala sources
 vapi_sources =						\
 	config.vapi					\
@@ -48,9 +43,17 @@ vapi_sources =						\
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
 
 libtracker-sparql.vala.stamp: $(libtracker_sparql_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg gmodule-2.0 -H tracker-sparql.h --vapi tracker-sparql-$(TRACKER_API_VERSION).vapi $^
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg gmodule-2.0 -H tracker-sparql.h --vapi tracker-sparql.vapi $^
 	$(AM_V_GEN)touch $@
 
+# Vala bindings
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = tracker-sparql-$(TRACKER_API_VERSION).vapi
+
+tracker-sparql.vapi: libtracker-sparql.vala.stamp
+tracker-sparql-$(TRACKER_API_VERSION).vapi: tracker-sparql.vapi
+	cp $< $@
+
 libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD = 	\
 	$(GLIB2_LIBS)					\
 	$(GCOV_LIBS)					\
@@ -63,11 +66,12 @@ CLEANFILES = 						\
 	$(BUILT_SOURCES)
 
 MAINTAINERCLEANFILES =					\
-	$(libtracker_sparql_la_VALASOURCES:.vala=.c) \
+	$(libtracker_sparql_la_VALASOURCES:.vala=.c) 	\
 	libtracker-sparql.vala.stamp			\
 	tracker-sparql.h
 
 EXTRA_DIST = 						\
+	tracker-sparql.vapi				\
 	config.vapi \
-	$(libtracker_sparql_la_VALASOURCES) \
+	$(libtracker_sparql_la_VALASOURCES) 		\
 	libtracker-sparql.vala.stamp
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index 9fd6280..8b3324c 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -68,9 +68,6 @@ busy_handling_test_LDADD = \
 	$(GLIB2_LIBS) \
 	$(DBUS_LIBS)
 
-BUILT_SOURCES = 				\
-	busy-handling-test.vala.stamp
-
 bus_query_test_VALASOURCES = shared-query-test.vala bus-query-test.vala
 
 bus_query_test_SOURCES = \
@@ -84,8 +81,8 @@ bus_update_test_SOURCES = \
 	$(bus_update_test_VALASOURCES:.vala=.c)
 
 bus_vapi_sources = \
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
-	$(top_srcdir)/src/libtracker-bus/tracker-bus-$(TRACKER_API_VERSION).vapi
+	$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	$(top_builddir)/src/libtracker-bus/tracker-bus-$(TRACKER_API_VERSION).vapi
 
 bus-query-test.vala.stamp: $(bus_query_test_VALASOURCES) $(bus_vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
@@ -106,8 +103,7 @@ bus_query_test_LDADD = \
 bus_update_test_LDADD = $(bus_query_test_LDADD)
 
 BUILT_SOURCES = 				\
-	busy-handling-test.vala.stamp \
-	bus-query-test.vala.stamp \
+	busy-handling-test.vala.stamp 		\
 	bus-query-test.vala.stamp 		\
 	bus-update-test.vala.stamp