1 files changed, 32 insertions, 26 deletions
diff --git a/docs/api/meson.build b/docs/api/meson.build
index 6b3a0fa7..30f82188 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -1,46 +1,52 @@
-doc_module = nm_name
+if enable_introspection
+  settings = 'settings-spec'
+  output = settings + '.xml'
 
-settings = 'settings-spec'
-output = settings + '.xml'
+  inputs = [
+    settings + '.xsl',
+    nm_settings_docs,
+  ]
 
-if enable_introspection
-  settings_xml = custom_target(
+  content_files += custom_target(
     output,
-    input: nm_settings_docs,
+    input: inputs,
     output: output,
-    command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'],
-    # FIXME: there is no target depending on this, so it will not be built
+    command: [xsltproc, '--output', '@OUTPUT@', '@INPUT0@', '@INPUT1@'],
     build_by_default: true,
   )
 endif
 
-configure_file(
-  input: version_xml + '.in',
-  output: version_xml,
-  configuration: version_conf,
+content_files += configure_file(
+  input: 'version.xml.in',
+  output: '@BASENAME@',
+  configuration: data_conf,
 )
 
-content_files += join_paths(meson.source_root(), 'COPYING')
 filecopier = find_program('cp')
-foreach intro : introspection_files
-  path = intro[1].split('/')[-1]
-  custom_target(path,
-                input: intro[0],
-                output: path,
-                command: [filecopier, intro[1], '@OUTPUT@'],
-                build_by_default: true,
+foreach intro: introspection_files
+  output = intro[1].split('/')[-1]
+
+  content_files += custom_target(
+    output,
+    input: intro[0],
+    output: output,
+    command: [filecopier, intro[1], '@OUTPUT@'],
+    build_by_default: true,
   )
 endforeach
 
-custom_target('common.ent',
-              input: common_ent_file,
-              output: 'common.ent',
-              command: [filecopier, '@INPUT@', '@OUTPUT@'],
-              build_by_default: true,
+output = 'common.ent'
+
+content_files += custom_target(
+  output,
+  input: common_ent_file,
+  output: output,
+  command: [filecopier, '@INPUT@', '@OUTPUT@'],
+  build_by_default: true,
 )
 
 gnome.gtkdoc(
-  doc_module,
+  nm_name,
   main_xml: 'network-manager-docs.xml',
   src_dir: meson.current_source_dir(),
   content_files: content_files,