Commit 7773d279 authored by Ralph Giles's avatar Ralph Giles
Browse files

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.

svn path=/trunk/vorbis/; revision=4095
parent 7043454e
......@@ -6,14 +6,7 @@ SUBDIRS = vorbisfile vorbisenc
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 @@ doc_DATA = components.png \
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 @@ doc_sources = xml/Vorbis_I_spec.xml \
xml/spec-fo.xsl \
xml/spec-html.xsl
EXTRA_DIST = $(doc_DATA)
nobase_EXTRA_DIST = $(doc_sources)
# explicit rules for generating docs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment