build: Use build_by_default to generate ontology docs

The build_always option is deprecated since meson 0.38.0

3 files changed, 8 insertions, 16 deletions

diff --git a/docs/reference/libtracker-sparql/meson.build b/docs/reference/libtracker-sparql/meson.build
index 68e9889dc..193cded84 100644
--- a/docs/reference/libtracker-sparql/meson.build
+++ b/docs/reference/libtracker-sparql/meson.build
@@ -9,10 +9,8 @@ generated = custom_target('base-ontology-doc-generated',
               '-o', join_paths(meson.current_build_dir(), 'xml/'),
               '-e', meson.current_source_dir()],
     depends: ttl2sgml,
-    # FIXME: this shouldn't be necessary, but currently the 'dependencies'
-    # parameter to gnome.gtkdoc() doesn't actually trigger building of custom
-    # targets.
-    build_always: true
+    depend_files: base_ontology,
+    build_by_default: true,
 )
 
 example_files = [
diff --git a/docs/reference/ontology/meson.build b/docs/reference/ontology/meson.build
index 60ac90654..ee2f9e929 100644
--- a/docs/reference/ontology/meson.build
+++ b/docs/reference/ontology/meson.build
@@ -9,17 +9,11 @@ generated = custom_target('ontology-doc-generated',
               '-o', join_paths(meson.current_build_dir(), 'xml/'),
               '-e', meson.current_source_dir()],
     depends: ttl2sgml,
-    # FIXME: this shouldn't be necessary, but currently the 'dependencies'
-    # parameter to gnome.gtkdoc() doesn't actually trigger building of custom
-    # targets.
-    build_always: true
+    depend_files: nepomuk,
+    build_by_default: true,
 )
 
 gnome.gtkdoc('ontology',
     src_dir: include_directories('.'),
     main_sgml: 'ontology-docs.sgml',
-    # FIXME: passing 'generated' here has no effect; the gtkdoc support in
-    # Meson actually only uses this parameter for building and linking the
-    # GObject Introspection scanner right now.
-    dependencies: generated,
     install: true)
diff --git a/src/ontologies/meson.build b/src/ontologies/meson.build
index 684e1a563..429bff3f7 100644
--- a/src/ontologies/meson.build
+++ b/src/ontologies/meson.build
@@ -1,4 +1,4 @@
-internal_config = [
+base_ontology = files(
     '10-xsd.description',
     '10-xsd.ontology',
     '11-rdf.description',
@@ -9,9 +9,9 @@ internal_config = [
     '20-dc.ontology',
     '31-nao.description',
     '31-nao.ontology',
-]
+)
 
-nepomuk = [
+nepomuk = files(
     'nepomuk/30-nie.description',
     'nepomuk/30-nie.ontology',
     'nepomuk/32-nco.description',
@@ -44,7 +44,7 @@ nepomuk = [
     'nepomuk/92-slo.ontology',
     'nepomuk/93-libosinfo.description',
     'nepomuk/93-libosinfo.ontology',
-]
+)
 
 tracker_gresources = gnome.compile_resources('tracker_gresources', 'builtin-ontology.gresource.xml')