[xiph-commits] r7816 - in trunk/vorbis: . doc

[giles at motherfish-iii.xiph.org]

Author: giles
Date: 2004-09-20 19:17:43 -0700 (Mon, 20 Sep 2004)
New Revision: 7816

Modified:
   trunk/vorbis/configure.in
   trunk/vorbis/doc/Makefile.am
Log:
Issue an explicit warning if the docs can't be built at 'make dist' 
time, as is now required.

This is a little less broken than the previous config in that the dist 
will need to have the build docs, and a normal build from a dist tarball
won't try. However if you --enable-docs on the dist tarball, it will 
rebuild them even if they're up to date. Among other things, this makes
'make distcheck' annoying.


Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2004-09-20 21:47:32 UTC (rev 7815)
+++ trunk/vorbis/configure.in	2004-09-21 02:17:43 UTC (rev 7816)
@@ -63,7 +63,7 @@
   AC_CHECK_PROGS([PDFXMLTEX], pdfxmltex, [/bin/false])
   if test "x$XSLTPROC" = "x/bin/false" || test "x$PDFXMLTEX" = "x/bin/false"; then
     build_docs=false
-    AC_MSG_WARN([Documentation will not be built])
+    AC_MSG_WARN([Documentation will not be built!])
   fi
 fi
 

Modified: trunk/vorbis/doc/Makefile.am
===================================================================
--- trunk/vorbis/doc/Makefile.am	2004-09-20 21:47:32 UTC (rev 7815)
+++ trunk/vorbis/doc/Makefile.am	2004-09-21 02:17:43 UTC (rev 7816)
@@ -105,6 +105,7 @@
 # cat $< | sed 's///g' | sed 's/</\&lt;/g' | sed 's/>/\&gt;/g' > $@
 
 # explicit rules for generating docs
+if BUILD_DOCS
 Vorbis_I_spec.html: $(SPEC_PNG_BUILD) $(BUILDDIR)/Vorbis_I_spec.xml
 	cd build; xsltproc --xinclude --output Vorbis_I_spec.html spec-html.xsl Vorbis_I_spec.xml && mv $@ ..
 
@@ -117,6 +118,15 @@
 	cd build; pdfxmltex --interaction nonstopmode spec.fo
 	rm build/spec.fo
 	mv build/spec.pdf $@
+else
+Vorbis_I_spec.html: NO_DOCS_ERROR
+Vorbis_I_spec.pdf: NO_DOCS_ERROR
+NO_DOCS_ERROR:
+	@echo
+	@echo "*** Documentation has not been built! ***"
+	@echo "Try re-running after passing --enable-docs to configure."
+	@echo
+endif
 
 # clean up build dir
 clean-local: