summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-11-12 15:50:39 -0500
committerDan Winship <danw@gnome.org>2014-11-14 17:14:18 -0500
commit16a9fc49ddd59ded7e03cea2deb3d33bde788000 (patch)
treee5b2e5c84beedf13c1752a9c5096241f1cc2a3f9 /docs
parentd1faee92288831517f6f5f7baa057c790be3b022 (diff)
downloadNetworkManager-16a9fc49ddd59ded7e03cea2deb3d33bde788000.tar.gz
docs: make the settings docs work from tarball builds
docs/api/settings-spec.xml was accidentally not getting disted, because gtk-doc.make explicitly removes all DISTCLEANFILES from distdir. However, it doesn't actually make sense for the settings docs files to be in DISTCLEANFILES anyway; they were put there rather than CLEANFILES (IIRC) so that "make clean" in a tarball build wouldn't delete them and break things. But the right fix is to just make them only be in CLEANFILES when BUILD_SETTING_DOCS is true, and not ever get deleted otherwise. Also adjust the build rules to ensure that the generated docs don't get rebuilt in tarball builds, since that can cause problems when building from a read-only source tree, etc. Meanwhile, in an unrelated but also fatal bug, configure.ac's check for if the generated docs were already present never got updated for the cli/src -> clients/cli move, and so even if we had been disting settings-spec.xml, configure would still think that the tarball didn't have all of the generated docs in it, so SETTING_DOCS_AVAILABLE would be set false and none of the generated docs would get used. https://bugzilla.gnome.org/show_bug.cgi?id=740035
Diffstat (limited to 'docs')
-rw-r--r--docs/api/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 683340e684..a364da035c 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -70,5 +70,10 @@ CLEANFILES += html/* tmpl/* xml/* \
NetworkManager-sections.txt \
NetworkManager-overrides.txt
-DISTCLEANFILES = $(GENERATED_FILES)
+if BUILD_SETTING_DOCS
+CLEANFILES += settings-spec.xml
+endif
+if ENABLE_GTK_DOC
+CLEANFILES += spec.html
+endif