[xiph-cvs] cvs commit: vorbis/doc Makefile.am

[Ralph Giles]

giles       03/07/15 10:16:36

  Modified:    doc      Makefile.am
  Log:
  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.

Revision  Changes    Path
1.13      +8 -3      vorbis/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am	7 Nov 2002 14:04:06 -0000	1.12
+++ Makefile.am	15 Jul 2003 14:16:36 -0000	1.13
@@ -43,15 +43,16 @@
         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 \
@@ -72,6 +73,10 @@
         xml/spec-html.xsl
 
 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:

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.