[PATCH 2/2] build: Workaround for gtkdoc dependencies

gtkdoc uses some custom generated targets as content files. However,
there are still two problem. The first is that gtkdoc does not
support targets which are not strings. This is being fixed in the
following issue:


The second issue is that the gtkdoc function produces a target which
is triggered at install time. This makes the dependencies generation
to not be triggered.

This patch uses a workaround for that second issue.
 docs/api/meson.build   | 4 +++-
 libnm-core/meson.build | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/api/meson.build b/docs/api/meson.build
index 0560502d0..7b9166a32 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -7,7 +7,9 @@ settings_xml = custom_target(
   input: nm_settings_docs,
   output: output,
-  command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), 
+  command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), 
+  # FIXME: there is no target depending on this, so it will not be built
+  build_by_default: true
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 1afd45ab0..97040709f 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -177,7 +177,10 @@ foreach docbook: docbooks
     input: docbook[1],
     output: output,
     capture: true,
-    command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@']
+    command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'],
+    # FIXME: gtkdoc does not depend directly on this.
+    #        https://github.com/mesonbuild/meson/pull/2806
+    build_by_default: true
   content_files += xml.full_path()

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]