Merge libtracker-sparql-backend with libtracker-sparql

One more step towards the unification of libtracker-sparql.

21 files changed, 70 insertions, 73 deletions

diff --git a/src/libtracker-sparql-backend/.gitignore b/src/libtracker-sparql-backend/.gitignore
deleted file mode 100644
index f8e59d4d9..000000000
--- a/src/libtracker-sparql-backend/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tracker-backend.c
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
deleted file mode 100644
index 86dcc04de..000000000
--- a/src/libtracker-sparql-backend/meson.build
+++ /dev/null
@@ -1,65 +0,0 @@
-subdir('bus')
-subdir('direct')
-subdir('remote')
-
-libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
-    '../libtracker-common/libtracker-common.vapi',
-    '../libtracker-data/libtracker-data.vapi',
-    'direct/tracker-direct.vapi',
-    'tracker-backend.vala',
-
-    gnu_symbol_visibility: 'hidden',
-
-    soversion: soversion,
-    version: libversion,
-
-    install: true,
-    install_rpath: tracker_internal_libs_dir,
-
-    c_args: [
-	'-include', 'libtracker-sparql/tracker-private.h',
-    ],
-
-    link_whole: [libtracker_sparql_intermediate],
-
-    dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, tracker_sparql_direct_dep, tracker_sparql_vapi_dep],
-)
-
-tracker_sparql_dep = declare_dependency(
-    link_with: libtracker_sparql,
-    include_directories: srcinc,
-    dependencies: [tracker_common_dep],
-)
-
-pkg.generate(libtracker_sparql,
-    description: 'Tracker : A SPARQL triple store library',
-    requires: [glib, gio, gobject, gmodule],
-    subdirs: [
-        'tracker-' + tracker_api_version,
-        'tracker-' + tracker_api_version / 'libtracker-sparql',
-    ],
-    variables: [
-        'exec_prefix=${prefix}',
-        'libexecdir=${prefix}' / get_option('libexecdir'),
-        'datadir=${prefix}' / get_option('datadir'),
-        'tracker_datadir=${datadir}' / tracker_versioned_name,
-        'ontologies_dir=' + tracker_ontologies_dir,
-    ],
-)
-
-tracker_sparql_gir = gnome.generate_gir(libtracker_sparql,
-    sources: libtracker_sparql_c_sources + libtracker_sparql_c_public_headers,
-    nsversion: tracker_api_version,
-    namespace: 'Tracker',
-    identifier_prefix: 'Tracker',
-    symbol_prefix: 'tracker',
-    includes : ['GLib-2.0', 'GObject-2.0', 'Gio-2.0' ],
-    link_with: libtracker_sparql,
-    install: true,
-    extra_args: [
-        '--c-include',
-        'libtracker-sparql/tracker-sparql.h',
-        '-DTRACKER_COMPILATION',
-    ])
-
-tracker_sparql_uninstalled_dir = meson.current_build_dir()
diff --git a/src/libtracker-sparql-backend/bus/.gitignore b/src/libtracker-sparql/bus/.gitignore
index c34fe4c56..c34fe4c56 100644
--- a/src/libtracker-sparql-backend/bus/.gitignore
+++ b/src/libtracker-sparql/bus/.gitignore
diff --git a/src/libtracker-sparql-backend/bus/meson.build b/src/libtracker-sparql/bus/meson.build
index 6d4edf2b1..6d4edf2b1 100644
--- a/src/libtracker-sparql-backend/bus/meson.build
+++ b/src/libtracker-sparql/bus/meson.build
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala b/src/libtracker-sparql/bus/tracker-bus-fd-cursor.vala
index 954ad1ec7..954ad1ec7 100644
--- a/src/libtracker-sparql-backend/bus/tracker-bus-fd-cursor.vala
+++ b/src/libtracker-sparql/bus/tracker-bus-fd-cursor.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus-statement.vala b/src/libtracker-sparql/bus/tracker-bus-statement.vala
index b14143901..b14143901 100644
--- a/src/libtracker-sparql-backend/bus/tracker-bus-statement.vala
+++ b/src/libtracker-sparql/bus/tracker-bus-statement.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-bus.vala b/src/libtracker-sparql/bus/tracker-bus.vala
index 72069873f..72069873f 100644
--- a/src/libtracker-sparql-backend/bus/tracker-bus.vala
+++ b/src/libtracker-sparql/bus/tracker-bus.vala
diff --git a/src/libtracker-sparql-backend/bus/tracker-namespace.vala b/src/libtracker-sparql/bus/tracker-namespace.vala
index 9e0a404de..9e0a404de 100644
--- a/src/libtracker-sparql-backend/bus/tracker-namespace.vala
+++ b/src/libtracker-sparql/bus/tracker-namespace.vala
diff --git a/src/libtracker-sparql-backend/direct/meson.build b/src/libtracker-sparql/direct/meson.build
index c1ec244e9..c1ec244e9 100644
--- a/src/libtracker-sparql-backend/direct/meson.build
+++ b/src/libtracker-sparql/direct/meson.build
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct-statement.c b/src/libtracker-sparql/direct/tracker-direct-statement.c
index 609dbb485..609dbb485 100644
--- a/src/libtracker-sparql-backend/direct/tracker-direct-statement.c
+++ b/src/libtracker-sparql/direct/tracker-direct-statement.c
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct-statement.h b/src/libtracker-sparql/direct/tracker-direct-statement.h
index d68bb6bc8..d68bb6bc8 100644
--- a/src/libtracker-sparql-backend/direct/tracker-direct-statement.h
+++ b/src/libtracker-sparql/direct/tracker-direct-statement.h
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.c b/src/libtracker-sparql/direct/tracker-direct.c
index 355c5debf..355c5debf 100644
--- a/src/libtracker-sparql-backend/direct/tracker-direct.c
+++ b/src/libtracker-sparql/direct/tracker-direct.c
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.h b/src/libtracker-sparql/direct/tracker-direct.h
index c47087dd5..c47087dd5 100644
--- a/src/libtracker-sparql-backend/direct/tracker-direct.h
+++ b/src/libtracker-sparql/direct/tracker-direct.h
diff --git a/src/libtracker-sparql-backend/direct/tracker-direct.vapi b/src/libtracker-sparql/direct/tracker-direct.vapi
index 0b0e02815..0b0e02815 100644
--- a/src/libtracker-sparql-backend/direct/tracker-direct.vapi
+++ b/src/libtracker-sparql/direct/tracker-direct.vapi
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index f50bae559..4e37a0a25 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -69,3 +69,69 @@ install_data(
     rename: ['tracker-sparql-' + tracker_api_version + '.deps'],
     install_dir: vapi_dir,
 )
+
+subdir('bus')
+subdir('direct')
+subdir('remote')
+
+libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
+    '../libtracker-common/libtracker-common.vapi',
+    '../libtracker-data/libtracker-data.vapi',
+    'direct/tracker-direct.vapi',
+    'tracker-backend.vala',
+
+    gnu_symbol_visibility: 'hidden',
+
+    soversion: soversion,
+    version: libversion,
+
+    install: true,
+    install_rpath: tracker_internal_libs_dir,
+
+    c_args: [
+	'-include', 'libtracker-sparql/tracker-private.h',
+    ],
+
+    link_whole: [libtracker_sparql_intermediate],
+
+    dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, tracker_sparql_direct_dep, tracker_sparql_vapi_dep],
+)
+
+tracker_sparql_dep = declare_dependency(
+    link_with: libtracker_sparql,
+    include_directories: srcinc,
+    dependencies: [tracker_common_dep],
+)
+
+pkg.generate(libtracker_sparql,
+    description: 'Tracker : A SPARQL triple store library',
+    requires: [glib, gio, gobject, gmodule],
+    subdirs: [
+        'tracker-' + tracker_api_version,
+        'tracker-' + tracker_api_version / 'libtracker-sparql',
+    ],
+    variables: [
+        'exec_prefix=${prefix}',
+        'libexecdir=${prefix}' / get_option('libexecdir'),
+        'datadir=${prefix}' / get_option('datadir'),
+        'tracker_datadir=${datadir}' / tracker_versioned_name,
+        'ontologies_dir=' + tracker_ontologies_dir,
+    ],
+)
+
+tracker_sparql_gir = gnome.generate_gir(libtracker_sparql,
+    sources: libtracker_sparql_c_sources + libtracker_sparql_c_public_headers,
+    nsversion: tracker_api_version,
+    namespace: 'Tracker',
+    identifier_prefix: 'Tracker',
+    symbol_prefix: 'tracker',
+    includes : ['GLib-2.0', 'GObject-2.0', 'Gio-2.0' ],
+    link_with: libtracker_sparql,
+    install: true,
+    extra_args: [
+        '--c-include',
+        'libtracker-sparql/tracker-sparql.h',
+        '-DTRACKER_COMPILATION',
+    ])
+
+tracker_sparql_uninstalled_dir = meson.current_build_dir()
diff --git a/src/libtracker-sparql-backend/remote/meson.build b/src/libtracker-sparql/remote/meson.build
index f4d589d61..f4d589d61 100644
--- a/src/libtracker-sparql-backend/remote/meson.build
+++ b/src/libtracker-sparql/remote/meson.build
diff --git a/src/libtracker-sparql-backend/remote/tracker-json-cursor.vala b/src/libtracker-sparql/remote/tracker-json-cursor.vala
index 047d47278..047d47278 100644
--- a/src/libtracker-sparql-backend/remote/tracker-json-cursor.vala
+++ b/src/libtracker-sparql/remote/tracker-json-cursor.vala
diff --git a/src/libtracker-sparql-backend/remote/tracker-remote.vala b/src/libtracker-sparql/remote/tracker-remote.vala
index 206c237fc..206c237fc 100644
--- a/src/libtracker-sparql-backend/remote/tracker-remote.vala
+++ b/src/libtracker-sparql/remote/tracker-remote.vala
diff --git a/src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala b/src/libtracker-sparql/remote/tracker-xml-cursor.vala
index a7a710041..a7a710041 100644
--- a/src/libtracker-sparql-backend/remote/tracker-xml-cursor.vala
+++ b/src/libtracker-sparql/remote/tracker-xml-cursor.vala
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql/tracker-backend.vala
index fc3682872..fc3682872 100644
--- a/src/libtracker-sparql-backend/tracker-backend.vala
+++ b/src/libtracker-sparql/tracker-backend.vala
diff --git a/src/meson.build b/src/meson.build
index 87d41623f..2f9817ece 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,11 +1,6 @@
 # Shared common code
 subdir('libtracker-common')
 
-# Intermediate library of RDF & SPARQL helper functions.
-# This gets used internally and also becomes part of the
-# public libtracker-sparql library.
-subdir('libtracker-sparql')
-
 # Public ontologies
 subdir('ontologies')
 
@@ -14,8 +9,10 @@ subdir('gvdb')
 subdir('libtracker-fts')
 subdir('libtracker-data')
 
-# Public libtracker-sparql library
-subdir('libtracker-sparql-backend')
+# Intermediate library of RDF & SPARQL helper functions.
+# This gets used internally and also becomes part of the
+# public libtracker-sparql library.
+subdir('libtracker-sparql')
 
 # Public commandline control tool
 subdir('tracker')