[tracker/configure-for-binaries: 56/80] libtracker-sparql: Cleaned up CFLAGS/LIBS for tests

[Martyn James Russell <mr src gnome org>]

commit adc14cf6066ddc805fac76bb96b9ef7cff5d5951
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 25 18:37:06 2010 +0100

    libtracker-sparql: Cleaned up CFLAGS/LIBS for tests

 tests/libtracker-sparql/Makefile.am    |   30 ++++++++++++------------------
 tests/libtracker-sparql/tracker-test.c |    2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/tests/libtracker-sparql/Makefile.am b/tests/libtracker-sparql/Makefile.am
index 7451d46..6f4ace6 100644
--- a/tests/libtracker-sparql/Makefile.am
+++ b/tests/libtracker-sparql/Makefile.am
@@ -2,25 +2,19 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 								\
+TEST_PROGS +=					\
 	tracker-test
 
-INCLUDES = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_srcdir)/src/libtracker-sparql				\
-	-I$(top_srcdir)/tests/common					\
-	$(GLIB2_CFLAGS)							\
-	$(GMODULE_CFLAGS)						\
-	$(GTHREAD_CFLAGS)
+INCLUDES = 					\
+	$(BUILD_CFLAGS)				\
+	-I$(top_srcdir)/src			\
+	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/tests/common		\
+	$(LIBTRACKER_SPARQL_CFLAGS)
 
-tracker_test_SOURCES = 							\
-	tracker-test.c
-
-tracker_test_LDADD = 							\
+LDADD =						\
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GIO_LIBS)							\
-	$(GLIB2_LIBS)
+	$(BUILD_LIBS)				\
+	$(LIBTRACKER_SPARQL_LIBS)
+
+tracker_test_SOURCES = tracker-test.c
diff --git a/tests/libtracker-sparql/tracker-test.c b/tests/libtracker-sparql/tracker-test.c
index cf62581..d778d52 100644
--- a/tests/libtracker-sparql/tracker-test.c
+++ b/tests/libtracker-sparql/tracker-test.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <tracker-sparql.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
 typedef struct {
 	const gchar *input ;