diff options
| author | Dan Winship <danw@gnome.org> | 2014-06-27 12:25:54 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-06-27 17:24:57 -0400 |
| commit | 377f72a66f0f3794780da77aa3090fd575639b43 (patch) | |
| tree | 026f394f7aa27d0424f18bfa197ff2db4d7fcb0f /docs | |
| parent | 87c48023f149d70d031def5150c1093f07e33178 (diff) | |
| download | NetworkManager-377f72a66f0f3794780da77aa3090fd575639b43.tar.gz | |
build: fix nm-setting-docs build in various configurations
Certain build configurations (like --enable-gtk-doc
--disable-introspection) were broken with respect to nm-setting-docs.
Fix this. Also, we don't require just gobject-introspection, we need
pygobject specifically as well.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/Makefile.am | 20 | ||||
| -rw-r--r-- | docs/api/network-manager-docs.xml | 12 |
2 files changed, 24 insertions, 8 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 219aff3b4a..683340e684 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -11,7 +11,19 @@ OTHER_FILES= \ $(top_srcdir)/tools/doc-generator.xsl \ $(top_srcdir)/introspection/generic-types.xml -GENERATED_FILES = spec.html settings-spec.xml +GENERATED_FILES = spec.html + +if SETTING_DOCS_AVAILABLE + +settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml + $(AM_V_GEN) xsltproc --output $@ $^ + +# Top-level SGML file includes (depends on) settings-spec.xml +$(DOC_MAIN_SGML_FILE): settings-spec.xml + +GENERATED_FILES += settings-spec.xml + +endif if ENABLE_GTK_DOC @@ -20,16 +32,10 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp mkdir -p $(builddir)/html/ cp spec.html $(builddir)/html/ -settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml - $(AM_V_GEN) xsltproc --output $@ $^ - all: $(GENERATED_FILES) endif -# Top-level SGML file includes (depends on) settings-spec.xml -$(DOC_MAIN_SGML_FILE): settings-spec.xml - #################################### # The name of the module. diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index fadc886288..0f9c7dbb43 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -54,7 +54,17 @@ setting names (like "wimax" or "bluetooth") to a dictionary of key/value pairs that represents each itself. </para> - <xi:include href="settings-spec.xml" /> + <xi:include href="settings-spec.xml"> + <xi:fallback> + <section> + <title>Configuration Settings</title> + <note><para> + (NetworkManager was built without full introspection support. Setting + documentation is not available.) + </para></note> + </section> + </xi:fallback> + </xi:include> <section id="secrets-flags"> <title>Secret flag types</title> <para> |