[tracker] libtracker-sparql: Fix tracker-sparql-2.0.vapi generation

[Carlos Garnacho <carlosg src gnome org>]

commit 2957dd7df553bac3bc3820672b2ced398a33118d
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jul 19 11:52:33 2017 +0200

    libtracker-sparql: Fix tracker-sparql-2.0.vapi generation
    
    It would be left partly including headers that must not be accessed
    directly. Also, ensure that we look for the C vapi file in srcdir for
    both meson and autotools.

 src/libtracker-sparql/Makefile.am |    6 +++---
 src/libtracker-sparql/meson.build |    8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 34cc893..9351d10 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -66,11 +66,11 @@ vala_header = tracker-generated.h
        $(AM_V_GEN)(cat $< >> $@)
 
 VAPIFILES = \
-       libtracker-sparql-intermediate-c.vapi \
-       tracker-sparql.vapi
+       $(srcdir)/libtracker-sparql-intermediate-c.vapi \
+       $(srcdir)/tracker-sparql.vapi
 
 tracker-sparql-$(TRACKER_API_VERSION).vapi: $(VAPIFILES)
-       $(AM_V_GEN)(sed -e 's/tracker-generated-no-checks.h/tracker-sparql.h/' $(VAPIFILES) > $@)
+       $(AM_V_GEN)(sed -e 's#libtracker-sparql/.*\.h#libtracker-sparql/tracker-sparql.h#' $(VAPIFILES) > $@)
 
 libtracker_sparqlinclude_HEADERS =                     \
        $(vala_header)                                 \
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index e41625d..a326c2e 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -10,6 +10,7 @@ enums_h = gnome.mkenums('tracker-sparql-enum-types',
 tracker_sparql_intermediate_dependencies = [uuid]
 
 # First build the Vala parts ...
+libtracker_sparql_c_vapi = files('libtracker-sparql-intermediate-c.vapi')
 
 libtracker_sparql_intermediate_vala = static_library('tracker-sparql-intermediate-vala',
     'tracker-namespace.vala',
@@ -27,6 +28,7 @@ libtracker_sparql_intermediate_vala = static_library('tracker-sparql-intermediat
         # FIXME: Meson has code to add --target-glib automatically, but it
         # doesn't seem to work here.
         '--target-glib', glib_required,
+        libtracker_sparql_c_vapi
     ],
     # This doesn't depend on tracker_common_dep because of
     # https://github.com/mesonbuild/meson/issues/671
@@ -105,7 +107,11 @@ meson.add_install_script('../install-generated-header.sh',
 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/tracker-generated-no-checks.h/tracker-sparql.h/', 
join_paths(meson.current_build_dir(), 'tracker-sparql-intermediate-c.vapi', 
'tracker-sparql-intermediate-vala.vapi')],
+    command: [
+        'sed', '-e', 's#libtracker-sparql/.*[.]h#libtracker-sparql/tracker-sparql.h#',
+        libtracker_sparql_c_vapi,
+        join_paths(meson.current_build_dir(), 'tracker-sparql-intermediate-vala.vapi')
+    ],
     depends: libtracker_sparql_intermediate_vala,
     capture: true,
     install: true,