[tracker] Moved src/tracker-fts to libtracker-fts, it is a library afterall



commit 206ecf66934eb40c5531ee98d5aa2b2db4f8681a
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 2 12:42:42 2009 +0100

    Moved src/tracker-fts to libtracker-fts, it is a library afterall

 configure.ac                                       |    4 ++--
 src/Makefile.am                                    |    2 +-
 src/libtracker-data/tracker-data-manager.c         |    2 +-
 src/libtracker-data/tracker-data-update.c          |    2 +-
 src/libtracker-db/Makefile.am                      |    2 +-
 src/libtracker-db/tracker-db-backup.c              |    2 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |    4 ++--
 src/{tracker-fts => libtracker-fts}/Makefile.am    |    0
 .../tracker-fts-config.c                           |    0
 .../tracker-fts-config.h                           |    0
 .../tracker-fts-hash.c                             |    0
 .../tracker-fts-hash.h                             |    0
 src/{tracker-fts => libtracker-fts}/tracker-fts.c  |    0
 src/{tracker-fts => libtracker-fts}/tracker-fts.h  |    0
 .../tracker-parser.c                               |    0
 .../tracker-parser.h                               |    0
 tests/Makefile.am                                  |    2 +-
 tests/{tracker-fts => libtracker-fts}/.gitignore   |    0
 tests/{tracker-fts => libtracker-fts}/Makefile.am  |    0
 .../{tracker-fts => libtracker-fts}/data.ontology  |    0
 tests/{tracker-fts => libtracker-fts}/fts3aa-1.out |    0
 tests/{tracker-fts => libtracker-fts}/fts3aa-1.rq  |    0
 tests/{tracker-fts => libtracker-fts}/fts3aa-2.out |    0
 tests/{tracker-fts => libtracker-fts}/fts3aa-2.rq  |    0
 .../{tracker-fts => libtracker-fts}/fts3aa-data.rq |    0
 tests/{tracker-fts => libtracker-fts}/fts3ae-1.out |    0
 tests/{tracker-fts => libtracker-fts}/fts3ae-1.rq  |    0
 .../{tracker-fts => libtracker-fts}/fts3ae-data.rq |    0
 .../tracker-fts-test.c                             |    0
 utils/tracker-fts/Makefile.am                      |    6 +++---
 utils/tracker-fts/tracker-fts-test.c               |    3 ++-
 31 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 67ff202..0594625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1404,6 +1404,7 @@ AC_CONFIG_FILES([
 	src/libtracker-common/Makefile
 	src/libtracker-data/Makefile
 	src/libtracker-db/Makefile
+	src/libtracker-fts/Makefile
 	src/libtracker-gtk/Makefile
 	src/libtracker-client/Makefile
         src/libtracker-miner/Makefile
@@ -1413,7 +1414,6 @@ AC_CONFIG_FILES([
         src/tracker-status-icon/tracker-status-icon.desktop.in
 	src/tracker-store/Makefile
 	src/tracker-extract/Makefile
-	src/tracker-fts/Makefile
 	src/tracker-miner-fs/Makefile
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in
@@ -1440,8 +1440,8 @@ AC_CONFIG_FILES([
 	tests/libtracker-data/error/Makefile
 	tests/libtracker-data/turtle/Makefile
 	tests/libtracker-db/Makefile
+	tests/libtracker-fts/Makefile
 	tests/Makefile
-	tests/tracker-fts/Makefile
 	tests/tracker-miner-fs/Makefile
 	tests/tracker-extract/Makefile
 	tests/tracker-store/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index d96d431..9024fd8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = 					\
 	libstemmer				\
 	libinotify				\
 	libtracker-common 			\
-	tracker-fts				\
+	libtracker-fts				\
 	libtracker-db				\
 	libtracker-data				\
 	libtracker-client			\
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 7a67d7b..a022f0e 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -33,7 +33,7 @@
 
 #include <libtracker-common/tracker-common.h>
 
-#include <tracker-fts/tracker-fts.h>
+#include <libtracker-fts/tracker-fts.h>
 
 #include <libtracker-db/tracker-db-interface-sqlite.h>
 #include <libtracker-db/tracker-db-manager.h>
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index ac15f59..09c6b84 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -30,7 +30,7 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-ontology.h>
 
-#include <tracker-fts/tracker-fts.h>
+#include <libtracker-fts/tracker-fts.h>
 
 #include <libtracker-db/tracker-db-manager.h>
 #include <libtracker-db/tracker-db-dbus.h>
diff --git a/src/libtracker-db/Makefile.am b/src/libtracker-db/Makefile.am
index 5b98bde..c8399ad 100644
--- a/src/libtracker-db/Makefile.am
+++ b/src/libtracker-db/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS =							\
 
 libtracker_db_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/tracker-fts/libtracker-fts.la		\
+	$(top_builddir)/src/libtracker-fts/libtracker-fts.la		\
 	$(SQLITE3_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GCOV_LIBS)							\
diff --git a/src/libtracker-db/tracker-db-backup.c b/src/libtracker-db/tracker-db-backup.c
index 613e417..80aab50 100644
--- a/src/libtracker-db/tracker-db-backup.c
+++ b/src/libtracker-db/tracker-db-backup.c
@@ -31,7 +31,7 @@
 
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-db/tracker-db.h>
-#include <tracker-fts/tracker-fts.h>
+#include <libtracker-fts/tracker-fts.h>
 
 #include "tracker-db-backup.h"
 
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index b21f28e..3735f63 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -24,9 +24,9 @@
 
 #include <sqlite3.h>
 #include <stdlib.h>
-#include <libtracker-common/tracker-common.h>
 
-#include <tracker-fts/tracker-fts.h>
+#include <libtracker-common/tracker-common.h>
+#include <libtracker-fts/tracker-fts.h>
 
 #include "tracker-db-interface-sqlite.h"
 
diff --git a/src/tracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
similarity index 100%
rename from src/tracker-fts/Makefile.am
rename to src/libtracker-fts/Makefile.am
diff --git a/src/tracker-fts/tracker-fts-config.c b/src/libtracker-fts/tracker-fts-config.c
similarity index 100%
rename from src/tracker-fts/tracker-fts-config.c
rename to src/libtracker-fts/tracker-fts-config.c
diff --git a/src/tracker-fts/tracker-fts-config.h b/src/libtracker-fts/tracker-fts-config.h
similarity index 100%
rename from src/tracker-fts/tracker-fts-config.h
rename to src/libtracker-fts/tracker-fts-config.h
diff --git a/src/tracker-fts/tracker-fts-hash.c b/src/libtracker-fts/tracker-fts-hash.c
similarity index 100%
rename from src/tracker-fts/tracker-fts-hash.c
rename to src/libtracker-fts/tracker-fts-hash.c
diff --git a/src/tracker-fts/tracker-fts-hash.h b/src/libtracker-fts/tracker-fts-hash.h
similarity index 100%
rename from src/tracker-fts/tracker-fts-hash.h
rename to src/libtracker-fts/tracker-fts-hash.h
diff --git a/src/tracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
similarity index 100%
rename from src/tracker-fts/tracker-fts.c
rename to src/libtracker-fts/tracker-fts.c
diff --git a/src/tracker-fts/tracker-fts.h b/src/libtracker-fts/tracker-fts.h
similarity index 100%
rename from src/tracker-fts/tracker-fts.h
rename to src/libtracker-fts/tracker-fts.h
diff --git a/src/tracker-fts/tracker-parser.c b/src/libtracker-fts/tracker-parser.c
similarity index 100%
rename from src/tracker-fts/tracker-parser.c
rename to src/libtracker-fts/tracker-parser.c
diff --git a/src/tracker-fts/tracker-parser.h b/src/libtracker-fts/tracker-parser.h
similarity index 100%
rename from src/tracker-fts/tracker-parser.h
rename to src/libtracker-fts/tracker-parser.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d588c55..9345966 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = 			\
 	libtracker-common	\
 	libtracker-data		\
 	libtracker-db 		\
-	tracker-fts 		\
+	libtracker-fts 		\
 	tracker-miner-fs	\
 	tracker-extract		\
 	tracker-store
diff --git a/tests/tracker-fts/.gitignore b/tests/libtracker-fts/.gitignore
similarity index 100%
rename from tests/tracker-fts/.gitignore
rename to tests/libtracker-fts/.gitignore
diff --git a/tests/tracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
similarity index 100%
rename from tests/tracker-fts/Makefile.am
rename to tests/libtracker-fts/Makefile.am
diff --git a/tests/tracker-fts/data.ontology b/tests/libtracker-fts/data.ontology
similarity index 100%
rename from tests/tracker-fts/data.ontology
rename to tests/libtracker-fts/data.ontology
diff --git a/tests/tracker-fts/fts3aa-1.out b/tests/libtracker-fts/fts3aa-1.out
similarity index 100%
rename from tests/tracker-fts/fts3aa-1.out
rename to tests/libtracker-fts/fts3aa-1.out
diff --git a/tests/tracker-fts/fts3aa-1.rq b/tests/libtracker-fts/fts3aa-1.rq
similarity index 100%
rename from tests/tracker-fts/fts3aa-1.rq
rename to tests/libtracker-fts/fts3aa-1.rq
diff --git a/tests/tracker-fts/fts3aa-2.out b/tests/libtracker-fts/fts3aa-2.out
similarity index 100%
rename from tests/tracker-fts/fts3aa-2.out
rename to tests/libtracker-fts/fts3aa-2.out
diff --git a/tests/tracker-fts/fts3aa-2.rq b/tests/libtracker-fts/fts3aa-2.rq
similarity index 100%
rename from tests/tracker-fts/fts3aa-2.rq
rename to tests/libtracker-fts/fts3aa-2.rq
diff --git a/tests/tracker-fts/fts3aa-data.rq b/tests/libtracker-fts/fts3aa-data.rq
similarity index 100%
rename from tests/tracker-fts/fts3aa-data.rq
rename to tests/libtracker-fts/fts3aa-data.rq
diff --git a/tests/tracker-fts/fts3ae-1.out b/tests/libtracker-fts/fts3ae-1.out
similarity index 100%
rename from tests/tracker-fts/fts3ae-1.out
rename to tests/libtracker-fts/fts3ae-1.out
diff --git a/tests/tracker-fts/fts3ae-1.rq b/tests/libtracker-fts/fts3ae-1.rq
similarity index 100%
rename from tests/tracker-fts/fts3ae-1.rq
rename to tests/libtracker-fts/fts3ae-1.rq
diff --git a/tests/tracker-fts/fts3ae-data.rq b/tests/libtracker-fts/fts3ae-data.rq
similarity index 100%
rename from tests/tracker-fts/fts3ae-data.rq
rename to tests/libtracker-fts/fts3ae-data.rq
diff --git a/tests/tracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
similarity index 100%
rename from tests/tracker-fts/tracker-fts-test.c
rename to tests/libtracker-fts/tracker-fts-test.c
diff --git a/utils/tracker-fts/Makefile.am b/utils/tracker-fts/Makefile.am
index 86f6261..538433e 100644
--- a/utils/tracker-fts/Makefile.am
+++ b/utils/tracker-fts/Makefile.am
@@ -17,9 +17,9 @@ tracker_fts_test_SOURCES =						\
 
 tracker_fts_test_LDADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/tracker-fts/libtracker-fts.la	 	\
+	$(top_builddir)/src/libtracker-fts/libtracker-fts.la	 	\
+	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
 	$(SQLITE3_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(PANGO_LIBS)							\
-	$(GLIB2_LIBS)							\
-	$(top_builddir)/src/libstemmer/libstemmer.la	 		
+	$(GLIB2_LIBS)
diff --git a/utils/tracker-fts/tracker-fts-test.c b/utils/tracker-fts/tracker-fts-test.c
index 949337f..d17cc29 100644
--- a/utils/tracker-fts/tracker-fts-test.c
+++ b/utils/tracker-fts/tracker-fts-test.c
@@ -23,7 +23,8 @@
 #include <stdlib.h>
 
 #include <sqlite3.h>
-#include <tracker-fts/tracker-fts.h>
+
+#include <libtracker-fts/tracker-fts.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>



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