diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2012-10-10 09:29:39 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2012-10-10 09:42:34 +0200 |
| commit | 8ec8b7150aa8fa2f24bd86786d23513d07391a2d (patch) | |
| tree | 6d51ef60a573c46986a09a323b91373d002c25e7 /doc/reference | |
| parent | 3f3839179ef578a088d1167a48dbd2e277babc23 (diff) | |
| download | rygel-8ec8b7150aa8fa2f24bd86786d23513d07391a2d.tar.gz | |
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.
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/doc-build.am | 17 |
1 files changed, 12 insertions, 5 deletions
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 |