summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2019-09-11 22:28:07 +0200
committerThomas Haller <thaller@redhat.com>2019-10-01 09:49:33 +0200
commitf0b7041063593361419a872df56d27502f174443 (patch)
tree5f91ec5a36ef9a438241af8b8bc8427c441401eb
parent9d4e1ad5e3bd6b903f6c96f65fc1d7ef3a0febc7 (diff)
downloadNetworkManager-f0b7041063593361419a872df56d27502f174443.tar.gz
meson: Improve api documentation build file
the `doc_module` variable has been removed. It was created because its used in the autotools build file but actually `nm_name` variable can be used easily. Different objects used in the documentation target have been grouped together. The content file `version.xml`, and different build files are now added properly.
-rw-r--r--docs/api/meson.build51
1 files changed, 29 insertions, 22 deletions
diff --git a/docs/api/meson.build b/docs/api/meson.build
index 3ea2edd5fe..dde1eecb03 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -1,45 +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(
+content_files += configure_file(
input: 'version.xml.in',
output: '@BASENAME@',
configuration: version_conf,
)
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,