tracker r2380 - in trunk: . tests tests/tracker-fts utils utils/tracker-fts

[mr svn gnome org]

Author: mr
Date: Fri Oct 17 12:06:56 2008
New Revision: 2380
URL: http://svn.gnome.org/viewvc/tracker?rev=2380&view=rev

Log:
	* configure.ac:
	* tests/Makefile.am:
	* tests/tracker-fts/Makefile.am:
	* tests/tracker-fts/tracker-fts-test.c:
	* utils/Makefile.am:
	* utils/tracker-fts/Makefile.am: Moved the tracker-fts-test
	application to utils/tracker-fts/ since it is not a GLib test.


Added:
   trunk/utils/tracker-fts/
   trunk/utils/tracker-fts/Makefile.am
      - copied, changed from r2379, /trunk/tests/tracker-fts/Makefile.am
   trunk/utils/tracker-fts/tracker-fts-test.c
      - copied unchanged from r2379, /trunk/tests/tracker-fts/tracker-fts-test.c
Removed:
   trunk/tests/tracker-fts/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/tests/Makefile.am
   trunk/utils/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Oct 17 12:06:56 2008
@@ -1165,13 +1165,13 @@
 	tests/scripts/Makefile
 	tests/trackerd/Makefile
 	tests/trackerd/xesam/Makefile
-	tests/tracker-fts/Makefile
 	tests/tracker-indexer/Makefile
 	thumbnailers/application/Makefile
 	thumbnailers/image/Makefile
 	thumbnailers/Makefile
 	utils/Makefile
 	utils/qdbm/Makefile
+	utils/tracker-fts/Makefile
 ])
 
 AC_OUTPUT

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Oct 17 12:06:56 2008
@@ -1,14 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-if ENABLE_SQLITE_FTS
-build_sqlite_fts = tracker-fts
-endif
-
 SUBDIRS = common 			\
 	libtracker-common		\
 	libtracker-db 			\
 	trackerd 			\
 	scripts 			\
-	$(build_sqlite_fts)		\
 	tracker-indexer
-

Modified: trunk/utils/Makefile.am
==============================================================================
--- trunk/utils/Makefile.am	(original)
+++ trunk/utils/Makefile.am	Fri Oct 17 12:06:56 2008
@@ -1,3 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = qdbm
\ No newline at end of file
+if ENABLE_SQLITE_FTS
+build_sqlite_fts = tracker-fts
+endif
+
+SUBDIRS = 			\
+	$(build_sqlite_fts)	\
+	qdbm

Copied: trunk/utils/tracker-fts/Makefile.am (from r2379, /trunk/tests/tracker-fts/Makefile.am)
==============================================================================
--- /trunk/tests/tracker-fts/Makefile.am	(original)
+++ trunk/utils/tracker-fts/Makefile.am	Fri Oct 17 12:06:56 2008
@@ -1,8 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
-TEST_PROGS += tracker-fts-test
+noinst_PROGRAMS = tracker-fts-test
 
 INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\