From d8992ce931d4648836b466270c757905b9fadab6 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 29 May 2020 10:21:07 +0200
Subject: [PATCH] docs: rename "nm-settings-docs.xml" to
 "nm-settings-docs-dbus.xml"

"nm-settings-docs-dbus.xml" is "nm-settings-docs-gir.xml" merged with
"nm-property-infos-dbus.xml". The name should reflect that, also because
we will get more files with this naming scheme.
---
 .gitignore           |  3 ++-
 Makefile.am          |  6 +++---
 docs/api/Makefile.am |  2 +-
 docs/api/meson.build |  2 +-
 libnm/meson.build    | 22 ++++++++++++----------
 man/meson.build      |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 205a8cc1e9..ed39ed7e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,8 +150,8 @@ test-*.trs
 /libnm/nm-property-infos-dbus.xml
 /libnm/nm-property-infos-ifcfg-rh.xml
 /libnm/nm-property-infos-keyfile.xml
+/libnm/nm-settings-docs-dbus.xml
 /libnm/nm-settings-docs-gir.xml
-/libnm/nm-settings-docs.xml
 /libnm/tests/test-libnm
 /libnm/tests/test-nm-client
 /libnm/tests/test-remote-settings-client
@@ -329,6 +329,7 @@ test-*.trs
 /libnm/nm-setting-docs-overrides.xml
 /libnm/nm-setting-docs.xml
 /libnm/nm-settings-docs-overrides.xml
+/libnm/nm-settings-docs.xml
 /libnm/nm-settings-ifcfg-rh-docs.xml
 /libnm/nm-settings-keyfile-docs.xml
 /libnm/tests/test-general
diff --git a/Makefile.am b/Makefile.am
index f6fcfc7e65..dbdcd12318 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1556,8 +1556,8 @@ libnm_noinst_data = \
 	libnm/nm-property-infos-dbus.xml \
 	libnm/nm-property-infos-ifcfg-rh.xml \
 	libnm/nm-property-infos-keyfile.xml \
+	libnm/nm-settings-docs-dbus.xml \
 	libnm/nm-settings-docs-gir.xml \
-	libnm/nm-settings-docs.xml \
 	$(NULL)
 
 noinst_DATA += $(libnm_noinst_data)
@@ -1577,7 +1577,7 @@ libnm/nm-settings-docs-gir.xml: libnm/generate-docs-nm-settings-docs-gir.py libn
 		--gir $(builddir)/libnm/NM-1.0.gir \
 		--output $@
 
-libnm/nm-settings-docs.xml: libnm/nm-property-infos-dbus.xml libnm/nm-settings-docs-gir.xml libnm/generate-docs-nm-settings-docs-merge.py
+libnm/nm-settings-docs-%.xml: libnm/nm-property-infos-%.xml libnm/nm-settings-docs-gir.xml libnm/generate-docs-nm-settings-docs-merge.py
 	$(AM_V_GEN) "$(PYTHON)" $(srcdir)/libnm/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^)
 
 EXTRA_DIST += $(libnm_noinst_data)
@@ -4966,7 +4966,7 @@ man_nm_settings_xml = \
 
 if HAVE_INTROSPECTION
 
-man/nm-settings.xml: man/nm-settings.xsl libnm/nm-settings-docs.xml man/common.ent
+man/nm-settings.xml: man/nm-settings.xsl libnm/nm-settings-docs-dbus.xml man/common.ent
 	$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $< $(word 2,$^)
 
 man/nm-settings-%.xml: man/nm-settings-%.xsl libnm/nm-property-infos-%.xml man/common.ent
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 376cf613a0..5a79197c8f 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -7,7 +7,7 @@ GENERATED_FILES =
 
 if BUILD_DOCS
 
-settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml
+settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs-dbus.xml
 	$(AM_V_GEN) (! test -f $@ || chmod u+w $@) && xsltproc --output $@ $^
 
 # Top-level SGML file includes (depends on) settings-spec.xml
diff --git a/docs/api/meson.build b/docs/api/meson.build
index d4da41b0b9..5f502b23ac 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -6,7 +6,7 @@ if enable_introspection
 
   inputs = [
     settings + '.xsl',
-    nm_settings_docs,
+    nm_settings_docs_xml['dbus'],
   ]
 
   content_files += custom_target(
diff --git a/libnm/meson.build b/libnm/meson.build
index b77a759640..1b8d128a43 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -288,24 +288,26 @@ if enable_introspection
     depends: libnm_gir,
   )
 
-  nm_settings_docs_xml = {
-    'gir': nm_settings_docs_xml_gir,
-  }
-
-  name = 'nm-settings-docs.xml'
-  nm_settings_docs = custom_target(
-    name,
-    input: [nm_settings_docs_xml_gir, nm_property_infos_xml['dbus']],
-    output: name,
+  name = 'dbus'
+  nm_settings_docs_xml_dbus = custom_target(
+    'nm-settings-docs-' + name + '.xml',
+    input: [nm_settings_docs_xml_gir, nm_property_infos_xml[name]],
+    output: 'nm-settings-docs-' + name + '.xml',
     command: [
       python.path(),
       join_paths(meson.current_source_dir(), 'generate-docs-nm-settings-docs-merge.py'),
       '@OUTPUT@',
-      nm_property_infos_xml['dbus'],
+      nm_property_infos_xml[name],
       nm_settings_docs_xml_gir,
     ],
     depends: libnm_gir,
   )
+
+  nm_settings_docs_xml = {
+    'gir':  nm_settings_docs_xml_gir,
+    'dbus': nm_settings_docs_xml_dbus,
+  }
+
 endif
 
 if enable_tests
diff --git a/man/meson.build b/man/meson.build
index 24e6a6dc20..7d9de1ffe9 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -58,7 +58,7 @@ endforeach
 if enable_introspection
   mans = [
     ['nm-settings-keyfile', '5', nm_property_infos_xml['keyfile']],
-    ['nm-settings', '5', nm_settings_docs],
+    ['nm-settings',         '5', nm_settings_docs_xml['dbus']],
   ]
 
   if enable_ifcfg_rh