[tracker/sam/merge-libraries: 16/19] Move tracker backend libraries into libtracker-sparql-backend

[Carlos Garnacho <carlosg src gnome org>]

commit 0948e4ac3371fdf6e27b037d92134664a110c84a
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Jun 21 13:43:54 2020 +0200

    Move tracker backend libraries into libtracker-sparql-backend
    
    This makes the src/ dir a bit less cluttered.
    
    Closes https://gitlab.gnome.org/GNOME/tracker/-/issues/195

 src/{libtracker-bus => libtracker-sparql-backend/bus}/.gitignore    | 0
 src/{libtracker-bus => libtracker-sparql-backend/bus}/meson.build   | 2 +-
 .../bus}/tracker-bus-fd-cursor.vala                                 | 0
 .../bus}/tracker-bus-statement.vala                                 | 0
 .../bus}/tracker-bus.vala                                           | 0
 .../bus}/tracker-namespace.vala                                     | 0
 .../direct}/meson.build                                             | 0
 .../direct}/tracker-direct-statement.c                              | 0
 .../direct}/tracker-direct-statement.h                              | 0
 .../direct}/tracker-direct.c                                        | 0
 .../direct}/tracker-direct.h                                        | 0
 .../direct}/tracker-direct.vapi                                     | 2 +-
 src/libtracker-sparql-backend/meson.build                           | 6 +++++-
 .../remote}/meson.build                                             | 2 +-
 .../remote}/tracker-json-cursor.vala                                | 0
 .../remote}/tracker-remote.vala                                     | 0
 .../remote}/tracker-xml-cursor.vala                                 | 0
 src/meson.build                                                     | 3 ---
 18 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-bus/.gitignore b/src/libtracker-sparql-backend/bus/.gitignore
similarity index 100%
rename from src/libtracker-bus/.gitignore
rename to src/libtracker-sparql-backend/bus/.gitignore
diff --git a/src/libtracker-bus/meson.build b/src/libtracker-sparql-backend/bus/meson.build
similarity index 93%
rename from src/libtracker-bus/meson.build
rename to src/libtracker-sparql-backend/bus/meson.build
index 91fd74c34..6d4edf2b1 100644
--- a/src/libtracker-bus/meson.build
+++ b/src/libtracker-sparql-backend/bus/meson.build
@@ -3,7 +3,7 @@ libtracker_bus = static_library('tracker-bus',
     'tracker-namespace.vala',
     'tracker-bus-fd-cursor.vala',
     'tracker-bus-statement.vala',
-    '../libtracker-common/libtracker-common.vapi',
+    '../../libtracker-common/libtracker-common.vapi',
     tracker_common_enum_header,
     c_args: tracker_c_args + [
         '-include', 'libtracker-sparql/tracker-private.h',
diff --git a/src/libtracker-bus/tracker-bus-fd-cursor.vala 
b/src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala
similarity index 100%
rename from src/libtracker-bus/tracker-bus-fd-cursor.vala
rename to src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala
diff --git a/src/libtracker-bus/tracker-bus-statement.vala 
b/src/libtracker-sparql-backend/bus/tracker-bus-statement.vala
similarity index 100%
rename from src/libtracker-bus/tracker-bus-statement.vala
rename to src/libtracker-sparql-backend/bus/tracker-bus-statement.vala
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-sparql-backend/bus/tracker-bus.vala
similarity index 100%
rename from src/libtracker-bus/tracker-bus.vala
rename to src/libtracker-sparql-backend/bus/tracker-bus.vala
diff --git a/src/libtracker-bus/tracker-namespace.vala 
b/src/libtracker-sparql-backend/bus/tracker-namespace.vala
similarity index 100%
rename from src/libtracker-bus/tracker-namespace.vala
rename to src/libtracker-sparql-backend/bus/tracker-namespace.vala
diff --git a/src/libtracker-direct/meson.build b/src/libtracker-sparql-backend/direct/meson.build
similarity index 100%
rename from src/libtracker-direct/meson.build
rename to src/libtracker-sparql-backend/direct/meson.build
diff --git a/src/libtracker-direct/tracker-direct-statement.c 
b/src/libtracker-sparql-backend/direct/tracker-direct-statement.c
similarity index 100%
rename from src/libtracker-direct/tracker-direct-statement.c
rename to src/libtracker-sparql-backend/direct/tracker-direct-statement.c
diff --git a/src/libtracker-direct/tracker-direct-statement.h 
b/src/libtracker-sparql-backend/direct/tracker-direct-statement.h
similarity index 100%
rename from src/libtracker-direct/tracker-direct-statement.h
rename to src/libtracker-sparql-backend/direct/tracker-direct-statement.h
diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-sparql-backend/direct/tracker-direct.c
similarity index 100%
rename from src/libtracker-direct/tracker-direct.c
rename to src/libtracker-sparql-backend/direct/tracker-direct.c
diff --git a/src/libtracker-direct/tracker-direct.h b/src/libtracker-sparql-backend/direct/tracker-direct.h
similarity index 100%
rename from src/libtracker-direct/tracker-direct.h
rename to src/libtracker-sparql-backend/direct/tracker-direct.h
diff --git a/src/libtracker-direct/tracker-direct.vapi 
b/src/libtracker-sparql-backend/direct/tracker-direct.vapi
similarity index 87%
rename from src/libtracker-direct/tracker-direct.vapi
rename to src/libtracker-sparql-backend/direct/tracker-direct.vapi
index 5fb7d2da8..0b0e02815 100644
--- a/src/libtracker-direct/tracker-direct.vapi
+++ b/src/libtracker-sparql-backend/direct/tracker-direct.vapi
@@ -1,7 +1,7 @@
 [CCode (cprefix = "Tracker", gir_namespace = "Tracker", gir_version = "2.0", lower_case_cprefix = 
"tracker_")]
 namespace Tracker {
         namespace Direct {
-                [CCode (cheader_filename = "libtracker-direct/tracker-direct.h")]
+                [CCode (cheader_filename = "tracker-direct.h")]
                 public class Connection : Tracker.Sparql.Connection, GLib.Initable, GLib.AsyncInitable {
                         public Connection (Tracker.Sparql.ConnectionFlags connection_flags, GLib.File loc, 
GLib.File? ontology) throws Tracker.Sparql.Error, GLib.IOError, GLib.DBusError;
                         public unowned Tracker.Data.Manager get_data_manager ();
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index e3736e532..738d43a08 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -1,7 +1,11 @@
+subdir('bus')
+subdir('direct')
+subdir('remote')
+
 libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
     '../libtracker-common/libtracker-common.vapi',
     '../libtracker-data/libtracker-data.vapi',
-    '../libtracker-direct/tracker-direct.vapi',
+    'direct/tracker-direct.vapi',
     'tracker-backend.vala',
 
     gnu_symbol_visibility: 'hidden',
diff --git a/src/libtracker-remote/meson.build b/src/libtracker-sparql-backend/remote/meson.build
similarity index 94%
rename from src/libtracker-remote/meson.build
rename to src/libtracker-sparql-backend/remote/meson.build
index 87d073c49..f4d589d61 100644
--- a/src/libtracker-remote/meson.build
+++ b/src/libtracker-sparql-backend/remote/meson.build
@@ -4,7 +4,7 @@ sources = [
     'tracker-json-cursor.vala',
     'tracker-xml-cursor.vala',
     'tracker-remote.vala',
-    '../libtracker-common/libtracker-common.vapi'
+    '../../libtracker-common/libtracker-common.vapi'
 ]
 
 libtracker_remote = static_library('tracker-remote', sources,
diff --git a/src/libtracker-remote/tracker-json-cursor.vala 
b/src/libtracker-sparql-backend/remote/tracker-json-cursor.vala
similarity index 100%
rename from src/libtracker-remote/tracker-json-cursor.vala
rename to src/libtracker-sparql-backend/remote/tracker-json-cursor.vala
diff --git a/src/libtracker-remote/tracker-remote.vala 
b/src/libtracker-sparql-backend/remote/tracker-remote.vala
similarity index 100%
rename from src/libtracker-remote/tracker-remote.vala
rename to src/libtracker-sparql-backend/remote/tracker-remote.vala
diff --git a/src/libtracker-remote/tracker-xml-cursor.vala 
b/src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala
similarity index 100%
rename from src/libtracker-remote/tracker-xml-cursor.vala
rename to src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala
diff --git a/src/meson.build b/src/meson.build
index 6da14a42c..87d41623f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,9 +15,6 @@ subdir('libtracker-fts')
 subdir('libtracker-data')
 
 # Public libtracker-sparql library
-subdir('libtracker-bus')
-subdir('libtracker-direct')
-subdir('libtracker-remote')
 subdir('libtracker-sparql-backend')
 
 # Public commandline control tool