functional-tests: Cleaned up IPC CFLAGS/LIBS

1 files changed, 15 insertions, 66 deletions

diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am
index c2fed718b..e1f9ec2af 100644
--- a/tests/functional-tests/ipc/Makefile.am
+++ b/tests/functional-tests/ipc/Makefile.am
@@ -1,14 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
-	$(DBUS_CFLAGS)					\
-	$(GLIB2_CFLAGS)					\
-	$(GIO_CFLAGS)					\
-	$(GTHREAD_CFLAGS)
-
 noinst_PROGRAMS =					\
 	test-busy-handling				\
 	test-direct-query				\
@@ -19,6 +10,20 @@ noinst_PROGRAMS =					\
 	test-class-signal-performance			\
 	test-update-array-performance
 
+INCLUDES =						\
+	$(BUILD_CFLAGS)					\
+	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
+	$(LIBTRACKER_SPARQL_CFLAGS)
+
+LDADD =							\
+	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
+	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)					\
+	$(LIBTRACKER_SPARQL_LIBS)
+
 test_busy_handling_VALASOURCES = test-busy-handling.vala
 
 test_busy_handling_SOURCES =				\
@@ -29,12 +34,6 @@ test-busy-handling.vala.stamp: $(test_busy_handling_VALASOURCES)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
 	$(AM_V_GEN)touch $@
 
-test_busy_handling_LDADD =				\
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(DBUS_LIBS)
-
 test_direct_query_VALASOURCES = test-shared-query.vala test-direct-query.vala
 
 test_direct_query_SOURCES =				\
@@ -69,19 +68,10 @@ test-direct-query.vala.stamp: $(test_direct_query_VALASOURCES) $(direct_vapi_sou
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
 	$(AM_V_GEN)touch $@
 
-test_direct_query_LDADD =				\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)
-
 test-default-update.vala.stamp: $(test_default_update_VALASOURCES) $(direct_vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
 	$(AM_V_GEN)touch $@
 
-test_default_update_LDADD = $(test_direct_query_LDADD)
-
 bus_vapi_sources = \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	$(top_srcdir)/src/libtracker-bus/tracker-bus.vapi
@@ -94,17 +84,6 @@ test-bus-update.vala.stamp: $(test_bus_update_VALASOURCES) $(bus_vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
 	$(AM_V_GEN)touch $@
 
-test_bus_query_LDADD =					\
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(DBUS_LIBS)
-
-test_bus_update_LDADD = $(test_bus_query_LDADD)
-
 test_class_signal_VALASOURCES = test-class-signal.vala
 
 test_class_signal_SOURCES =				\
@@ -115,16 +94,6 @@ test-class-signal.vala.stamp: $(test_class_signal_VALASOURCES) $(direct_vapi_sou
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
 	$(AM_V_GEN)touch $@
 
-test_class_signal_LDADD =				\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(DBUS_LIBS)
-
 test_class_signal_performance_VALASOURCES = test-class-signal-performance.vala
 
 test_class_signal_performance_SOURCES =		\
@@ -135,27 +104,7 @@ test-class-signal-performance.vala.stamp: $(test_class_signal_performance_VALASO
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
 	$(AM_V_GEN)touch $@
 
-test_class_signal_performance_LDADD =			\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(DBUS_LIBS)
-
-test_update_array_performance_LDADD =			\
-	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
-	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
-	$(GIO_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(DBUS_LIBS)
-
-BUILT_SOURCES =					\
+BUILT_SOURCES =						\
 	test-busy-handling.vala.stamp			\
 	test-class-signal.vala.stamp			\
 	test-class-signal-performance.vala.stamp	\