[tracker/tracker-2.1] build: Fixes to docs generation

[Carlos Garnacho <carlosg src gnome org>]

commit 3c628b30875846d1391ba4b2cf267e84a936b611
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Oct 12 13:59:27 2018 +0200

    build: Fixes to docs generation
    
    The docs were not going through gtkdoc-scangobj, and the libtracker-sparql
    docs were just looking in source dir while it should also look for gtk-doc
    comments in generated files from vala.
    
    Now that we're there, use include_directories() to get rid of relative
    paths.

 docs/reference/libtracker-control/meson.build | 4 +++-
 docs/reference/libtracker-miner/meson.build   | 4 +++-
 docs/reference/libtracker-sparql/meson.build  | 5 +++--
 src/libtracker-control/meson.build            | 2 ++
 src/libtracker-miner/meson.build              | 2 ++
 src/libtracker-sparql/meson.build             | 2 ++
 6 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/libtracker-control/meson.build b/docs/reference/libtracker-control/meson.build
index ad067d949..907e8231e 100644
--- a/docs/reference/libtracker-control/meson.build
+++ b/docs/reference/libtracker-control/meson.build
@@ -3,7 +3,9 @@ version_xml = configure_file(input: 'version.xml.in',
     configuration: conf)
 
 gnome.gtkdoc('libtracker-control',
-    src_dir: join_paths(meson.current_source_dir(), '..', '..', '..', 'src', 'libtracker-control'),
+    src_dir: controlinc,
     main_sgml: 'libtracker-control-docs.sgml',
     content_files: ['migrating-1to2.xml'],
+    dependencies: tracker_control_dep,
+    gobject_typesfile: 'libtracker-control.types',
     install: true)
diff --git a/docs/reference/libtracker-miner/meson.build b/docs/reference/libtracker-miner/meson.build
index 3e92d7a04..ff987b07a 100644
--- a/docs/reference/libtracker-miner/meson.build
+++ b/docs/reference/libtracker-miner/meson.build
@@ -3,7 +3,9 @@ version_xml = configure_file(input: 'version.xml.in',
     configuration: conf)
 
 gnome.gtkdoc('libtracker-miner',
-    src_dir: join_paths(meson.current_source_dir(), '..', '..', '..', 'src', 'libtracker-miner'),
+    src_dir: minerinc,
     main_sgml: 'libtracker-miner-docs.sgml',
     content_files: ['overview.sgml', 'migrating-1to2.xml'],
+    dependencies: tracker_miner_dep,
+    gobject_typesfile: 'libtracker-miner.types',
     install: true)
diff --git a/docs/reference/libtracker-sparql/meson.build b/docs/reference/libtracker-sparql/meson.build
index aa6d1d564..ccf3d1d7e 100644
--- a/docs/reference/libtracker-sparql/meson.build
+++ b/docs/reference/libtracker-sparql/meson.build
@@ -28,8 +28,9 @@ example_files = [
 ]
 
 gnome.gtkdoc('libtracker-sparql',
-    src_dir: join_paths(meson.current_source_dir(), '..', '..', '..', 'src', 'libtracker-sparql'),
+    src_dir: sparqlinc,
     main_sgml: 'libtracker-sparql-docs.sgml',
     content_files: ['overview.sgml', 'examples.sgml', 'ontologies.sgml', 'private-store.xml', 
'migrating-1to2.xml', example_files],
-    dependencies: generated,
+    dependencies: tracker_sparql_dep,
+    gobject_typesfile: 'libtracker-sparql.types',
     install: true)
diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build
index 6081b2d5b..81578e306 100644
--- a/src/libtracker-control/meson.build
+++ b/src/libtracker-control/meson.build
@@ -20,6 +20,8 @@ libtracker_control = library('tracker-control-' + tracker_api_version,
     link_with: libtracker_common,
 )
 
+controlinc = include_directories('.')
+
 tracker_control_dep = declare_dependency(
     link_with: libtracker_control,
     dependencies: tracker_miner_dep
diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
index b7325d07e..e53b21cf9 100644
--- a/src/libtracker-miner/meson.build
+++ b/src/libtracker-miner/meson.build
@@ -70,6 +70,8 @@ libtracker_miner = library(
     link_with: [libtracker_miner_private],
 )
 
+minerinc = include_directories('.')
+
 tracker_miner_dep = declare_dependency(
     sources: miner_enums[1],
     link_with: libtracker_miner,
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index b74c4e337..f6b7e83ce 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -77,6 +77,8 @@ libtracker_sparql_intermediate_c = static_library('tracker-sparql-intermediate-c
     dependencies: [tracker_common_dep, json_glib],
 )
 
+sparqlinc = [include_directories('.'), meson.current_build_dir()]
+
 tracker_sparql_intermediate_dep = declare_dependency(
     link_with: [libtracker_sparql_intermediate_c, libtracker_sparql_intermediate_vala],
     sources: tracker_sparql_generated_header,