Explicitly specify all documentation dependencies

Yet another attempt to sort out flaky documentation builds.  This tries to be
careful and describe the complete documentation dependency graph to meson
explicitly (ignoring tool outputs that aren't used).

5 files changed, 33 insertions, 13 deletions

diff --git a/doc/api/meson.build b/doc/api/meson.build
index 1fffa6f..a470564 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,9 +1,9 @@
 # Copyright 2021-2022 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR ISC
 
-c_lilv_rst = custom_target(
+api_lilv_rst = custom_target(
   'lilv.rst',
   command: [sphinxygen, '-f', '@INPUT0@', '@OUTDIR@'],
-  input: [c_index_xml],
+  input: doxygen_xml,
   output: 'lilv.rst',
 )
diff --git a/doc/html/meson.build b/doc/html/meson.build
index 69b56bb..df7cb72 100644
--- a/doc/html/meson.build
+++ b/doc/html/meson.build
@@ -15,14 +15,15 @@ custom_target(
     '@OUTDIR@' / '..',
     '-t', 'html',
   ] + sphinx_flags,
-  input: [c_lilv_rst, c_rst_files, conf_py],
+  input: [api_lilv_rst, conf_py, sphinx_input],
   install: true,
   install_dir: html_dir,
   output: [
+    'index.html',
+
     '_static',
     'api',
     'genindex.html',
-    'index.html',
     'overview.html',
     'plugins.html',
     'uis.html',
diff --git a/doc/meson.build b/doc/meson.build
index 787ab4f..ffdefdd 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -32,15 +32,18 @@ if build_docs
   )
 
   # Copy hand-written documentation files
-  c_rst_files = files(
+  rst_sources = files(
     'index.rst',
     'overview.rst',
     'plugins.rst',
     'uis.rst',
     'world.rst',
   )
-  foreach f : c_rst_files
-    configure_file(copy: true, input: f, output: '@PLAINNAME@')
+  sphinx_input = []
+  foreach f : rst_sources
+    sphinx_input += [
+      configure_file(copy: true, input: f, output: '@PLAINNAME@'),
+    ]
   endforeach
 
   # Generate reference documentation input with Doxygen and Sphinxygen
diff --git a/doc/singlehtml/meson.build b/doc/singlehtml/meson.build
index 055a9c2..5d3912d 100644
--- a/doc/singlehtml/meson.build
+++ b/doc/singlehtml/meson.build
@@ -15,12 +15,13 @@ custom_target(
     '@OUTDIR@' / '..',
     '-t', 'singlehtml',
   ] + sphinx_flags,
-  input: [c_lilv_rst, c_rst_files, conf_py],
+  input: [api_lilv_rst, conf_py, sphinx_input],
   install: true,
   install_dir: singlehtml_dir,
   output: [
-    '_static',
     'index.html',
+
+    '_static',
   ],
 )
 
diff --git a/doc/xml/meson.build b/doc/xml/meson.build
index dc234f3..eb66325 100644
--- a/doc/xml/meson.build
+++ b/doc/xml/meson.build
@@ -7,15 +7,30 @@ config = configuration_data()
 config.set('LILV_SRCDIR', lilv_src_root)
 config.set('DOX_OUTPUT', meson.current_build_dir() / '..')
 
-c_doxyfile = configure_file(
+doxyfile = configure_file(
   configuration: config,
   input: files('../Doxyfile.in'),
   output: 'Doxyfile',
 )
 
-c_index_xml = custom_target(
+doxygen_xml = custom_target(
   'index.xml',
   command: [doxygen, '@INPUT0@'],
-  input: [c_doxyfile] + c_headers,
-  output: 'index.xml',
+  input: [doxyfile] + c_headers,
+  output: [
+    'index.xml',
+
+    'group__lilv.xml',
+    'group__lilv__class.xml',
+    'group__lilv__collections.xml',
+    'group__lilv__instance.xml',
+    'group__lilv__node.xml',
+    'group__lilv__plugin.xml',
+    'group__lilv__port.xml',
+    'group__lilv__scalepoint.xml',
+    'group__lilv__state.xml',
+    'group__lilv__ui.xml',
+    'group__lilv__world.xml',
+    'lilv_8h.xml',
+  ],
 )