[PATCH] build: Remove documentation generation workarounds

[Iñigo Martínez <inigomartinez gmail com>]

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.
---
 clients/common/meson.build | 4 +---
 docs/api/meson.build       | 4 +---
 libnm-core/meson.build     | 4 +---
 libnm/meson.build          | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/clients/common/meson.build b/clients/common/meson.build
index d74da1db7..861a4442f 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 904adc0ab..05c5f98a2 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 4f0a0f7d8..1afd45ab0 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 f286faa80..23971e8c7 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'
-- 
2.15.1