build: Rename libtracker-sparql VAPI file/target

This is not intermediate, and all public API is C. We can add better
names, and avoid the sed magic altogether.

3 files changed, 21 insertions, 27 deletions

diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index 738d43a08..86dcc04de 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -22,7 +22,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
 
     link_whole: [libtracker_sparql_intermediate],
 
-    dependencies: [tracker_common_dep, tracker_sparql_remote_dep, tracker_sparql_bus_dep, tracker_sparql_direct_dep, libtracker_sparql_c_vapi_dep],
+    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(
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 21e22275b..f50bae559 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -6,8 +6,8 @@ enum_types = gnome.mkenums('tracker-sparql-enum-types',
     install_header: true,
 )
 
-libtracker_sparql_c_vapi = files('libtracker-sparql-intermediate-c.vapi')
-libtracker_sparql_c_vapi_dep = meson.get_compiler('vala').find_library('libtracker-sparql-intermediate-c', dirs: meson.current_source_dir())
+tracker_sparql_vapi = files('tracker-sparql.vapi')
+tracker_sparql_vapi_dep = meson.get_compiler('vala').find_library('tracker-sparql', dirs: meson.current_source_dir())
 
 libtracker_sparql_c_sources = files(
     'tracker-connection.c',
@@ -49,7 +49,7 @@ sparqlinc = [include_directories('.'), meson.current_build_dir()]
 tracker_sparql_intermediate_dep = declare_dependency(
     link_with: [libtracker_sparql_intermediate],
     include_directories: [srcinc, include_directories('.')],
-    dependencies: [ libtracker_sparql_c_vapi_dep ],
+    dependencies: [ tracker_sparql_vapi_dep ],
 )
 
 install_headers(
@@ -58,17 +58,11 @@ install_headers(
     'tracker-sparql.h',
     subdir: 'tracker-@0@/libtracker-sparql'.format(tracker_api_version))
 
-# FIXME: we can't depend properly on the generated .vapi to do this.
-tracker_sparql_vapi = custom_target('tracker-sparql-' + tracker_api_version + '.vapi',
-    #input: 'tracker-sparql-intermediate-vala.vapi',
-    output: 'tracker-sparql-' + tracker_api_version + '.vapi',
-    command: [
-        'sed', '-e', 's#libtracker-sparql/.*[.]h#libtracker-sparql/tracker-sparql.h#',
-        libtracker_sparql_c_vapi,
-    ],
-    capture: true,
-    install: true,
-    install_dir: vapi_dir)
+install_data(
+    tracker_sparql_vapi,
+    rename: ['tracker-sparql-' + tracker_api_version + '.vapi'],
+    install_dir: vapi_dir,
+)
 
 install_data(
     'tracker-sparql.deps',
diff --git a/src/libtracker-sparql/libtracker-sparql-intermediate-c.vapi b/src/libtracker-sparql/tracker-sparql.vapi
index e4a0a9aae..e75e7bcbf 100644
--- a/src/libtracker-sparql/libtracker-sparql-intermediate-c.vapi
+++ b/src/libtracker-sparql/tracker-sparql.vapi
@@ -18,7 +18,7 @@
  */
 
 namespace Tracker {
-	[CCode (cheader_filename = "libtracker-sparql/tracker-connection.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public errordomain Sparql.Error {
 		PARSE,
 		UNKNOWN_CLASS,
@@ -31,13 +31,13 @@ namespace Tracker {
 		UNKNOWN_GRAPH
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-connection.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public enum Sparql.ConnectionFlags {
 		NONE     = 0,
 		READONLY = 1 << 0,
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-cursor.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public enum Sparql.ValueType {
 		UNBOUND,
 		URI,
@@ -62,7 +62,7 @@ namespace Tracker {
 		public static string get_uuid_urn ();
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-connection.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
         public abstract class Sparql.Connection : GLib.Object {
 		public extern static new Connection remote_new (string uri_base);
 		public extern static new Connection new (Sparql.ConnectionFlags flags, GLib.File store, GLib.File? ontology, GLib.Cancellable? cancellable = null) throws Sparql.Error, GLib.IOError;
@@ -93,7 +93,7 @@ namespace Tracker {
                 public async virtual bool close_async () throws GLib.IOError;
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-statement.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public abstract class Sparql.Statement : GLib.Object {
 		public string sparql { get; construct set; }
 		public Connection connection { get; construct set; }
@@ -108,7 +108,7 @@ namespace Tracker {
 		public async abstract Cursor execute_async (GLib.Cancellable? cancellable) throws Sparql.Error, GLib.Error, GLib.IOError, GLib.DBusError;
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-cursor.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public abstract class Sparql.Cursor : GLib.Object {
 		public Connection connection {
 			get;
@@ -135,7 +135,7 @@ namespace Tracker {
 		public virtual bool is_bound (int column);
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-namespace-manager.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public class NamespaceManager : GLib.Object {
 		public NamespaceManager ();
 		public void add_prefix (string prefix, string namespace);
@@ -146,7 +146,7 @@ namespace Tracker {
 		public static NamespaceManager get_default ();
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-resource.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public class Resource : GLib.Object {
 		public Resource (string identifier);
 
@@ -187,7 +187,7 @@ namespace Tracker {
 		public string print_sparql_update (NamespaceManager? namespace_manager, string graph);
 	}
 
-	[CCode (cprefix = "TRACKER_NOTIFIER_FLAG_", cheader_filename = "libtracker-sparql/tracker-notifier.h")]
+	[CCode (cprefix = "TRACKER_NOTIFIER_FLAG_", cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public enum NotifierFlags {
 		QUERY_URN,
 		QUERY_LOCATION,
@@ -200,7 +200,7 @@ namespace Tracker {
 		NOTIFY_UNEXTRACTED
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-notifier.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public class Notifier : GLib.Object {
 		public class NotifierEvent {
 			public enum Type {
@@ -219,12 +219,12 @@ namespace Tracker {
 		public void signal_unsubscribe (uint handler_id);
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-endpoint.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public class Endpoint : GLib.Object {
 		Sparql.Connection get_sparql_connection ();
 	}
 
-	[CCode (cheader_filename = "libtracker-sparql/tracker-endpoint-dbus.h")]
+	[CCode (cheader_filename = "libtracker-sparql/tracker-sparql.h")]
 	public class EndpointDBus : GLib.Object, GLib.Initable {
 		public EndpointDBus (Sparql.Connection sparql_conn, GLib.DBusConnection? dbus_conn, string object_path, GLib.Cancellable? cancellable) throws GLib.Error;
 	}