1 files changed, 23 insertions, 21 deletions

diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build
index b4a23729..1a73b4dd 100644
--- a/docs/libnm/meson.build
+++ b/docs/libnm/meson.build
@@ -1,4 +1,7 @@
-doc_module = libnm_name
+src_dirs = [
+  libnm_core_inc,
+  libnm_inc,
+]
 
 private_headers = [
   'common.h',
@@ -17,7 +20,6 @@ private_headers = [
   'nm-object-private.h',
   'nm-property-compare.h',
   'nm-remote-connection-private.h',
-  'nm-remote-settings.h',
   'nm-setting-private.h',
   'nm-utils-private.h',
   'nm-core-tests-enum-types.h',
@@ -26,29 +28,29 @@ private_headers = [
   'test-general-enums.h',
 ]
 
-configure_file(
-  input: version_xml + '.in',
-  output: version_xml,
-  configuration: version_conf,
+scan_args = [
+  '--rebuild-types',
+  '--rebuild-sections',
+  '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?',
+  '--ignore-headers=' + ' '.join(private_headers),
+]
+
+version_xml = configure_file(
+  input: 'version.xml.in',
+  output: '@BASENAME@',
+  configuration: data_conf,
 )
 
 gnome.gtkdoc(
-  doc_module,
-  main_xml: doc_module + '-docs.xml',
-  src_dir: [
-    libnm_core_inc,
-    libnm_inc,
-  ],
+  libnm_name,
+  main_xml: libnm_name + '-docs.xml',
+  src_dir: src_dirs,
   dependencies: libnm_dep,
-  scan_args: [
-    '--rebuild-types',
-    '--rebuild-sections',
-    '--ignore-decorators=NM_AVAILABLE_IN_\d_\d\d?|NM_DEPRECATED_IN_\d_\d\d?',
-    '--ignore-headers=' + ' '.join(private_headers),
-  ],
+  scan_args: scan_args,
   scanobjs_args: '--type-init-func="g_type_init();"',
-  fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
-  gobject_typesfile: doc_module + '.types',
-  html_assets: doc_module + '.png',
+  fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(libnm_name)),
+  gobject_typesfile: libnm_name + '.types',
+  html_assets: 'libnm.png',
+  content_files: version_xml,
   install: true,
 )