From ac0e0dd88a01853e1724d43ec0d81d7349100819 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Tue, 15 Jul 2003 14:16:36 +0000 Subject: [PATCH] Improve automake handling of the docbook documentation. We no longer require automake 1.6 to build things, and 'make dist' will now fail if the documentation hasn't been built. Passing --enable-docs to autogen/configure is still necessary. 'make clean' now removes intermediate files and 'make maintainer-clean' removes the built docs themselves. svn path=/trunk/vorbis/; revision=5145 --- doc/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index d1caddc..79ff69f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -43,15 +43,16 @@ static_docs = components.png \ window1.png \ window2.png +built_docs = Vorbis_I_spec.html Vorbis_I_spec.pdf + # conditionally make the generated documentation if BUILD_DOCS -doc_DATA = $(static_docs) Vorbis_I_spec.html Vorbis_I_spec.pdf +doc_DATA = $(static_docs) $(built_docs) else doc_DATA = $(static_docs) endif -## this requires automake 1.6 -EXTRA_DIST = $(doc_DATA) +EXTRA_DIST = $(static_docs) $(built_docs) doc_sources = xml/Vorbis_I_spec.xml \ xml/01-introduction.xml \ @@ -73,6 +74,10 @@ doc_sources = xml/Vorbis_I_spec.xml \ nobase_EXTRA_DIST = $(doc_sources) +# these are expensive; only remove if we have to +MAINTAINERCLEANFILES = $(built_docs) +CLEANFILES = Vorbis_I_spec.fo spec.aux spec.log spec.out + # explicit rules for generating docs Vorbis_I_spec.html: xsltproc --xinclude --output $@ xml/spec-html.xsl xml/Vorbis_I_spec.xml -- 2.7.4