diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2017-12-18 20:33:13 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-18 20:46:03 +0100 |
| commit | cc692a69760358968b250932891f9f61c8d5eac9 (patch) | |
| tree | 2b9d423b4c1c5ab79b5671f0966469584be17f16 | |
| parent | 25d5384c307e150f423ec8ddc9906b64e77d0b12 (diff) | |
| download | NetworkManager-cc692a69760358968b250932891f9f61c8d5eac9.tar.gz | |
build: Remove documentation generation workarounds
Documentation was not working in meson due to problems with files
generated in `libnm`. To avoid these problems, workarounds were
used. This problems have been recently fixed so these workarounds
are not necessary anymore.
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00061.html
| -rw-r--r-- | clients/common/meson.build | 4 | ||||
| -rw-r--r-- | docs/api/meson.build | 4 | ||||
| -rw-r--r-- | libnm-core/meson.build | 4 | ||||
| -rw-r--r-- | libnm/meson.build | 1 |
4 files changed, 3 insertions, 10 deletions
diff --git a/clients/common/meson.build b/clients/common/meson.build index d74da1db72..861a4442f8 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -44,9 +44,7 @@ sources = shared_meta_setting + files( settings_docs = 'settings-docs.c' -# FIXME: there is a problem with the generated file -#if enable_introspection -if false +if enable_introspection settings_docs_source = custom_target( settings_docs, input: nm_property_docs, diff --git a/docs/api/meson.build b/docs/api/meson.build index 904adc0ab7..05c5f98a23 100644 --- a/docs/api/meson.build +++ b/docs/api/meson.build @@ -7,9 +7,7 @@ settings_xml = custom_target( output, input: nm_settings_docs, output: output, - command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'], - # FIXME: used to built properly api documentation - build_by_default: true + command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), settings + '.xsl'), '@INPUT@'] ) configure_file( diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 4f0a0f7d8b..1afd45ab08 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -177,9 +177,7 @@ foreach docbook: docbooks input: docbook[1], output: output, capture: true, - command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'], - # FIXME: used to built properly api documentation - build_by_default: true + command: [perl, enums_to_docbook, docbook[0], docbook[2], '@INPUT@'] ) content_files += xml.full_path() diff --git a/libnm/meson.build b/libnm/meson.build index f286faa805..23971e8c76 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -219,7 +219,6 @@ if enable_introspection install_dir_typelib: typelib_dir ) - # FIXME: the script parses the meson.source_root()/Makefile.am file generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl') name = 'nm-settings-keyfile-docs.xml' |