diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-28 09:58:25 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-11-19 09:24:09 -0500 |
| commit | c14486984ec087cabda61bb6ef2a5c587bbaf760 (patch) | |
| tree | ed71cede12adc3b0b2244264f2d2547b259eae2b /libnm/Makefile.am | |
| parent | 3889ff864c5fab3b6d86f0fe19acc206cc5fb37c (diff) | |
| download | NetworkManager-c14486984ec087cabda61bb6ef2a5c587bbaf760.tar.gz | |
libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.
With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).
The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...
(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
Diffstat (limited to 'libnm/Makefile.am')
| -rw-r--r-- | libnm/Makefile.am | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/libnm/Makefile.am b/libnm/Makefile.am index f911d86e66..e00aa87392 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -181,3 +181,28 @@ endif check-local: $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(SYMBOL_VIS_FILE) + +if BUILD_SETTING_DOCS + +noinst_DATA = nm-setting-docs.xml nm-keyfile-docs.xml nm-ifcfg-rh-docs.xml + +docs_sources = $(filter-out nm-core-enum-types.c,$(libnm_core_sources)) + +nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) | NM-1.0.gir NM-1.0.typelib libnm.la + export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(srcdir)/generate-setting-docs.py \ + --gir $(builddir)/NM-1.0.gir \ + --output $@ + +nm-keyfile-docs.xml: generate-plugin-docs.pl $(docs_sources) + $(srcdir)/generate-plugin-docs.pl keyfile $(top_srcdir)/libnm-core $@ +nm-ifcfg-rh-docs.xml: generate-plugin-docs.pl $(docs_sources) + $(srcdir)/generate-plugin-docs.pl ifcfg-rh $(top_srcdir)/libnm-core $@ + +CLEANFILES += $(noinst_DATA) +EXTRA_DIST += $(noinst_DATA) + +endif + +EXTRA_DIST += generate-setting-docs.py generate-plugin-docs.pl |