conditionalize rules which are DSSSL or XSL only; now 'make MODE=xsl

qandaset.001.pdf' works again

diff --git a/testdocs/.cvsignore b/testdocs/.cvsignore
index 7150c8d43ce5bb9ecf9461d49dac3a334ab5c2fd..70039e6ca6d40be2c0418119cb0d6552ec8857b9 100644 (file)
--- a/testdocs/.cvsignore
+++ b/testdocs/.cvsignore
@@ -1,12 +1,14 @@
+*.fo
+*.htm
 *.html
+*.index
+*.index.xml
+*.out
+*.pdf
+*.tex
 WhatsNew
 focustom.xsl
 htmlcustom.xsl
-*.htm
-*.index
-*.index.xml
-*.fo
-mlang.fo
 mlang.sgm
 mlang.xml
 mtest

diff --git a/testdocs/Makefile b/testdocs/Makefile
index 8c276e2a71fc375bf3509e9e735f86ae639ddec7..1c9331430594fc9486ab6803183e1675974c329f 100644 (file)
--- a/testdocs/Makefile
+++ b/testdocs/Makefile
@@ -29,7 +29,7 @@ DSSSLINDEXER  ?= perl $(DSSSLROOT)/bin/collateindex.pl
 XSLPARAM       ?=
 
 # what to use to format XSL FO
-FO_FORMATTER   ?= xep
+FO_FORMATTER   ?= tex
 
 
 # ======================================================================
@@ -91,35 +91,26 @@ else
        $(JADE) fo $(DSSSLPRINT) $< -o $@
 endif
 
+ifeq ($(MODE),dsssl)
 .xml.tex:
 ifeq ($(VALIDATE),1)
        $(XJPARSE) $<
 endif
-ifeq ($(MODE),xsl)
-       @echo "don't know how to make TeX with XSL, is it useful?" >&2
-       exit 1
-else
        $(JADE) tex $(DSSSLPRINT) $< -o $@
 endif
 
+ifeq ($(MODE),dsssl)
 .tex.dvi:
-ifeq ($(MODE),xsl)
-       @echo "don't know how to do this in XSL, is it useful?" >&2
-       exit 1
-else
        jadetex $<
 endif
 
-.tex.pdf:
 ifeq ($(MODE),xsl)
-       @echo "don't know how to do this in XSL, is it useful?" >&2
-       exit 1
-else
+.tex.pdf:
        pdfjadetex $<
 endif
 
-.fo.pdf:
 ifeq ($(MODE),xsl)
+.fo.pdf:
 ifeq ($(FO_FORMATTER),tex)
        pdftex "&pdfxmltex" $<
        @if [ `grep Rerun $(basename $@).log | wc -l` -gt 0 ]; then \
@@ -139,10 +130,7 @@ else
 endif                          # xep
 endif                          # fop
 endif                          # tex
-else                           # dsssl
-       @echo "don't know how to do this in DSSSL, is it useful?" >&2
-       exit 1
-endif
+endif                          # xsl
 
 
 # ======================================================================