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

[Ralph Giles]

giles       02/11/07 09:04:06

  Modified:    doc      Makefile.am
  Log:
  Rearrange the conditional so the automake 1.4 generates a valid
  makefile. This doesn't really work, but may avoid complaints
  
  MAKE DIST IS BROKEN WITH AUTOMAKE 1.4! The built documentation will be
  silently omitted from 'make dist' unless you use automake 1.6.

Revision  Changes    Path
1.12      +12 -12    vorbis/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am	7 Nov 2002 11:54:24 -0000	1.11
+++ Makefile.am	7 Nov 2002 14:04:06 -0000	1.12
@@ -6,14 +6,7 @@
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 
-# conditionally make the generated documentation
-if BUILD_DOCS
-built_docs = Vorbis_I_spec.html Vorbis_I_spec.pdf
-else
-built_docs =
-endif
-
-doc_DATA = components.png \
+static_docs = components.png \
         draft-moffitt-vorbis-rtp-00.txt \
         eightphase.png \
         evenlsp.png \
@@ -48,9 +41,17 @@
         white-ogg.png \
         white-xifish.png \
         window1.png \
-	window2.png \
-	Vorbis_I_spec.html \
-	$(built_docs)
+	window2.png
+
+# conditionally make the generated documentation
+if BUILD_DOCS
+doc_DATA = $(static_docs) Vorbis_I_spec.html Vorbis_I_spec.pdf
+else
+doc_DATA = $(static_docs)
+endif
+
+## this requires automake 1.6
+EXTRA_DIST = $(doc_DATA)
 
 doc_sources = xml/Vorbis_I_spec.xml \
         xml/01-introduction.xml \
@@ -70,7 +71,6 @@
         xml/spec-fo.xsl \
         xml/spec-html.xsl
 
-EXTRA_DIST = $(doc_DATA)
 nobase_EXTRA_DIST = $(doc_sources)
 
 # explicit rules for generating docs

<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.