[tracker/configure-for-binaries: 55/60] libtracker-fts: Cleaned up CFLAGS/LIBS for tests



commit 8327b2850aa2dd8f44ead716d556325e6f9f9da9
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 25 18:34:17 2010 +0100

    libtracker-fts: Cleaned up CFLAGS/LIBS for tests

 tests/libtracker-fts/Makefile.am |   79 ++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 49 deletions(-)
---
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index 6aa77e4..cd69987 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -1,66 +1,47 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 			\
-	limits			\
+SUBDIRS =					\
+	limits					\
 	prefix
 
-noinst_PROGRAMS = 							\
-	$(TEST_PROGS) 							\
+noinst_PROGRAMS = 				\
+	$(TEST_PROGS) 				\
 	tracker-parser
 
-
-TEST_PROGS += 								\
-	tracker-fts-test 						\
+TEST_PROGS += 					\
+	tracker-fts-test 			\
 	tracker-parser-test
 
-INCLUDES = 								\
-	$(BUILD_CFLAGS)							\
-	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
-	-DTOP_BUILDDIR=\"$(top_builddir)\"				\
-	-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				\
-	-I$(top_srcdir)/src/libtracker-sparql				\
-	-I$(top_builddir)/src/libtracker-sparql				\
-	$(DBUS_CFLAGS)							\
-	$(SQLITE3_CFLAGS)						\
-	$(GMODULE_CFLAGS)						\
-	$(GTHREAD_CFLAGS)						\
-	$(GLIB2_CFLAGS)
-
-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 		\
-	$(BUILD_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)
+INCLUDES = 					\
+	$(BUILD_CFLAGS)				\
+	-I$(top_srcdir)/src			\
+	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/tests/common		\
+	-DTOP_SRCDIR=\"$(top_srcdir)\"		\
+	-DTOP_BUILDDIR=\"$(top_builddir)\" 	\
+	$(LIBTRACKER_FTS_CFLAGS)
+
+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)				\
+	$(LIBTRACKER_FTS_LIBS)
 
 tracker_fts_test_SOURCES = tracker-fts-test.c
 
-tracker_fts_test_LDADD = $(common_ldadd)
-
 tracker_parser_test_SOURCES = tracker-parser-test.c
 
-tracker_parser_test_LDADD = $(common_ldadd)
-
 tracker_parser_SOURCES = tracker-parser.c
 
-tracker_parser_LDADD = $(common_ldadd)
-
-EXTRA_DIST = 				\
-	data.ontology			\
-	fts3aa-data.rq			\
-	fts3aa-1.rq			\
-	fts3aa-1.out			\
-	fts3aa-2.rq			\
-	fts3aa-2.out			\
-	fts3ae-data.rq			\
-	fts3ae-1.rq			\
+EXTRA_DIST = 					\
+	data.ontology				\
+	fts3aa-data.rq				\
+	fts3aa-1.rq				\
+	fts3aa-1.out				\
+	fts3aa-2.rq				\
+	fts3aa-2.out				\
+	fts3ae-data.rq				\
+	fts3ae-1.rq				\
 	fts3ae-1.out
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]