[tracker/wip/carlosg/shuffle-dirs: 4/15] libtracker-data: Merge libtracker-fts into libtracker-data

[Carlos Garnacho <carlosg src gnome org>]

commit f9669d323fa6ba762d5a1ad37228178336ab5c0f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Apr 2 21:59:32 2022 +0200

    libtracker-data: Merge libtracker-fts into libtracker-data
    
    Very far in the day, this used to be an optional module. But it no
    longer is, and we expect that sqlite has FTS5 builtin, so can just
    drop the static library separation and merge it together.

 src/libtracker-data/meson.build                          |  4 ++--
 src/libtracker-data/tracker-data-manager.c               |  3 +--
 src/libtracker-data/tracker-db-interface-sqlite.c        |  2 +-
 .../tracker-fts-tokenizer.c                              |  0
 .../tracker-fts-tokenizer.h                              |  0
 src/{libtracker-fts => libtracker-data}/tracker-fts.c    |  0
 src/{libtracker-fts => libtracker-data}/tracker-fts.h    |  0
 src/libtracker-fts/.gitignore                            |  2 --
 src/libtracker-fts/meson.build                           | 16 ----------------
 src/meson.build                                          |  1 -
 10 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index 562c6f735..fd703dfe1 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -8,8 +8,6 @@ tracker_data_dependencies = [
     tracker_common_dep, gvdb_dep, sqlite,
 ]
 
-tracker_data_dependencies += tracker_fts_dep
-
 libtracker_data = static_library('tracker-data',
     'tracker-class.c',
     'tracker-collation.c',
@@ -20,6 +18,8 @@ libtracker_data = static_library('tracker-data',
     'tracker-db-interface.c',
     'tracker-db-interface-sqlite.c',
     'tracker-db-manager.c',
+    'tracker-fts.c',
+    'tracker-fts-tokenizer.c',
     'tracker-namespace.c',
     'tracker-ontology.c',
     'tracker-ontologies.c',
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 78e7fcde8..c9aca121e 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -24,8 +24,6 @@
 
 #include <glib/gstdio.h>
 
-#include <libtracker-fts/tracker-fts.h>
-
 #include <libtracker-common/tracker-debug.h>
 #include <libtracker-common/tracker-locale.h>
 
@@ -34,6 +32,7 @@
 #include "tracker-data-update.h"
 #include "tracker-db-interface-sqlite.h"
 #include "tracker-db-manager.h"
+#include "tracker-fts.h"
 #include "tracker-namespace.h"
 #include "tracker-ontologies.h"
 #include "tracker-ontology.h"
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index ac23beb70..49f6764f4 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -34,7 +34,7 @@
 #include <libtracker-sparql/tracker-cursor.h>
 #include <libtracker-sparql/tracker-private.h>
 
-#include <libtracker-fts/tracker-fts.h>
+#include "tracker-fts.h"
 
 
 #ifdef HAVE_LIBUNISTRING
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.c b/src/libtracker-data/tracker-fts-tokenizer.c
similarity index 100%
rename from src/libtracker-fts/tracker-fts-tokenizer.c
rename to src/libtracker-data/tracker-fts-tokenizer.c
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.h b/src/libtracker-data/tracker-fts-tokenizer.h
similarity index 100%
rename from src/libtracker-fts/tracker-fts-tokenizer.h
rename to src/libtracker-data/tracker-fts-tokenizer.h
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-data/tracker-fts.c
similarity index 100%
rename from src/libtracker-fts/tracker-fts.c
rename to src/libtracker-data/tracker-fts.c
diff --git a/src/libtracker-fts/tracker-fts.h b/src/libtracker-data/tracker-fts.h
similarity index 100%
rename from src/libtracker-fts/tracker-fts.h
rename to src/libtracker-data/tracker-fts.h
diff --git a/src/meson.build b/src/meson.build
index 78f21b9b9..11a0ca8ed 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,7 +6,6 @@ subdir('ontologies')
 
 # Internal database library
 subdir('gvdb')
-subdir('libtracker-fts')
 subdir('libtracker-data')
 
 # Intermediate library of RDF & SPARQL helper functions.