From 8ec8b7150aa8fa2f24bd86786d23513d07391a2d Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 10 Oct 2012 09:29:39 +0200 Subject: build: Do not require valadoc in tarball builds * configure.ac: Default --enable-valadoc to no. * autogen.sh: Specify --enable-valadoc=yes here, as we already enable vala. * Makefile.am: Remove --enable-valadoc from DISTCHECK_CONFIGURE_FLAGS * doc/reference/doc-build.am: Move the ifdef around so that the html is always installed. --- doc/reference/doc-build.am | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'doc/reference') diff --git a/doc/reference/doc-build.am b/doc/reference/doc-build.am index 3812798e..46ac7a69 100644 --- a/doc/reference/doc-build.am +++ b/doc/reference/doc-build.am @@ -11,7 +11,12 @@ valadoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) -o valadoc \ $(VALADOC_FLAGS) -gtkdoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml +# Avoid regeneration of the html if none of its dependencies have changed: +gtkdoc/html/index.html: gtkdoc-gen + +RYGEL_GTKDOC_DOCS_XML = $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml + +gtkdoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) $(RYGEL_GTKDOC_DOCS_XML) @rm -rf gtkdoc/html $(AM_V_GEN)$(VALADOC) \ -X $(top_srcdir)/src/lib$(RYGEL_DOCBUILD_MODULE)/$(RYGEL_DOCBUILD_MODULE).h \ @@ -38,14 +43,16 @@ clean-local: uninstall-hook: rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE) +all: valadoc-gen gtkdoc-gen + +endif + # The chmod corrects the directory permissions so that distcheck can remove the installed files. -install-data-hook: gtkdoc-gen +install-data-hook: gtkdoc/html/index.html $(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE) cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE) chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE) -all: valadoc-gen gtkdoc-gen -EXTRA_DIST = gtkdoc/lib$(RYGEL_DOCBUILD_MODULE)-docs.xml gtkdoc/html valadoc +EXTRA_DIST = $(RYGEL_GTKDOC_DOCS_XML) gtkdoc/html valadoc -endif -- cgit v1.2.1