build: rename intermediate doc xmls

Allows to use pattern rules by making the
related files having a common naming scheme.

This commit only renames files.
This commit is contained in:
Thomas Haller 2016-11-23 17:09:48 +01:00
parent ec4a1b7540
commit 2ac6c5a981
3 changed files with 21 additions and 17 deletions

12
.gitignore vendored
View File

@ -176,11 +176,11 @@ test-*.trs
/libnm-util/tests/test-setting-8021x
/libnm-util/tests/test-setting-dcb
/libnm/nm-ifcfg-rh-docs.xml
/libnm/nm-keyfile-docs.xml
/libnm/nm-settings-ifcfg-rh-docs.xml
/libnm/nm-property-docs.xml
/libnm/nm-setting-docs.xml
/libnm/nm-setting-docs-overrides.xml
/libnm/nm-settings-docs.xml
/libnm/nm-settings-docs-overrides.xml
/libnm/nm-settings-keyfile-docs.xml
/libnm/tests/test-nm-client
/libnm/tests/test-remote-settings-client
/libnm/tests/test-secret-agent
@ -299,3 +299,7 @@ test-*.trs
/introspection/nmdbus-*.c
/introspection/nmdbus-*.h
/introspection/nmdbus-*.xml
/libnm/nm-ifcfg-rh-docs.xml
/libnm/nm-keyfile-docs.xml
/libnm/nm-setting-docs.xml
/libnm/nm-setting-docs-overrides.xml

View File

@ -846,16 +846,16 @@ if BUILD_SETTING_DOCS
libnm_noinst_data = \
libnm/nm-property-docs.xml \
libnm/nm-setting-docs-overrides.xml \
libnm/nm-setting-docs.xml \
libnm/nm-keyfile-docs.xml \
libnm/nm-ifcfg-rh-docs.xml
libnm/nm-settings-docs-overrides.xml \
libnm/nm-settings-docs.xml \
libnm/nm-settings-keyfile-docs.xml \
libnm/nm-settings-ifcfg-rh-docs.xml
noinst_DATA += $(libnm_noinst_data)
libnm_docs_sources = $(libnm_core_lib_c_real)
libnm/nm-setting-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@
# When the python scripts loads libnm and the address sanitizers is
@ -870,19 +870,19 @@ libnm/nm-property-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources)
--gir $(builddir)/libnm/NM-1.0.gir \
--output $@
libnm/nm-setting-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources) libnm/nm-setting-docs-overrides.xml | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la
libnm/nm-settings-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources) libnm/nm-settings-docs-overrides.xml | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la
$(AM_V_GEN) \
export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
$(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \
$(srcdir)/libnm/generate-setting-docs.py \
--gir $(builddir)/libnm/NM-1.0.gir \
--overrides $(builddir)/libnm/nm-setting-docs-overrides.xml \
--overrides $(builddir)/libnm/nm-settings-docs-overrides.xml \
--output $@
libnm/nm-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@
libnm/nm-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@
EXTRA_DIST += $(libnm_noinst_data)
@ -3912,13 +3912,13 @@ endif
if BUILD_SETTING_DOCS
man/nm-settings.xml: man/nm-settings.xsl libnm/nm-setting-docs.xml
man/nm-settings.xml: man/nm-settings.xsl libnm/nm-settings-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl libnm/nm-keyfile-docs.xml
man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl libnm/nm-settings-keyfile-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl libnm/nm-ifcfg-rh-docs.xml
man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl libnm/nm-settings-ifcfg-rh-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
CLEANFILES += \

View File

@ -7,7 +7,7 @@ GENERATED_FILES =
if SETTING_DOCS_AVAILABLE
settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-setting-docs.xml
settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-settings-docs.xml
$(AM_V_GEN) xsltproc --output $@ $^
# Top-level SGML file includes (depends on) settings-spec.xml