mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
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.
This commit is contained in:
parent
960ab39739
commit
d8992ce931
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,7 +6,7 @@ if enable_introspection
|
|||
|
||||
inputs = [
|
||||
settings + '.xsl',
|
||||
nm_settings_docs,
|
||||
nm_settings_docs_xml['dbus'],
|
||||
]
|
||||
|
||||
content_files += custom_target(
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue