From 07a8f22aef07f4c77eb91978d2f9ddf87e13b6f8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 16 Nov 2016 12:00:11 +0100 Subject: [PATCH] build: only generate documentation when BUILD_SETTING_DOCS Generating the docs, requires man/nm-settings.xml. That is only present when - ./configure --enable-gtk-doc --with-introspecton - in a dist-tarball, contrary to a git-tree Only create docs, when we also regenerate the manuals (BUILD_SETTING_DOCS). That is, you can no longer generate docs, by relying on the pre-generated manual pages. If you want to generate docs, you have to regenerate the manual pages as well. Previously, doing the following in a git-tree failed: $ git clean -fdx $ ./autogen.sh --enable-gtk-doc --enable-introspection=no && make ... make[2]: Entering directory './NetworkManager/docs/api' DOC Preparing build DOC Scanning header files DOC Introspecting gobjects DOC Building XML DOC Building XML make[2]: *** No rule to make target '../../man/nm-settings.xml', needed by 'html-build.stamp'. Stop. make[2]: Leaving directory './NetworkManager/docs/api' --- Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c5a6853a0b..9a49f54f5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,7 +81,11 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM SUBDIRS = \ . \ - po \ + po + +if BUILD_SETTING_DOCS + +SUBDIRS += \ docs/libnm \ docs/api @@ -91,6 +95,8 @@ SUBDIRS += \ docs/libnm-glib endif +endif + ############################################################################### set_sanitizer_env = \