Reworked

diff --git a/docbook/simple/spec/Makefile b/docbook/simple/spec/Makefile
index d16d72b5eff8f965c85a53feaa37e318d2df9742..1cceb85da304b53c3e984265d8ae059320d1f67a 100644 (file)
--- a/docbook/simple/spec/Makefile
+++ b/docbook/simple/spec/Makefile
@@ -1,41 +1,25 @@
 include ../../../cvstools/Makefile.incl
 
-XSLT=xsltproc
-
-STATUS=cs
-OASISTC=docbook
-SPECNAME=simple
-SPECVER=1.0
-
-SPECROOT=$(OASISTC)-$(SPECNAME)
-SPECBASE=$(STATUS)-$(SPECROOT)-$(SPECVER)
+XJPARSE=/home/ndw/bin/xjparse
 
 HTMLSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-html.xsl
-HTMLPARAM=bibliography.collection=file:///home/ndw/.bibliography.xml
+FOSTYLE=fo.xsl
 
-FOSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-fo.xsl
-FOPARAM=oasis.logo=/projects/oasis/spectools/images/oasis.png
+XSLPARAM=""
 
-all: html pdf
+all: docbook-simple.html
 
-valid: $(SPECROOT).xml
+docbook-simple.html: docbook-simple.xml
        $(XJPARSE) $<
+       $(XSLT) $< $(HTMLSTYLE) $@ $(XSLPARAM)
+       tidy -q -utf8 -mn -asxml $@
 
-html: $(SPECBASE).html
-
-fo: $(SPECBASE).fo
-
-pdf: $(SPECBASE).pdf
-
-$(SPECBASE).html: $(SPECROOT).xml valid
-       $(XSLT) $< $(HTMLSTYLE) $(SPECBASE).html $(HTMLPARAM)
-
-$(SPECBASE).fo: $(SPECROOT).xml valid
-       $(XSLT) $< $(FOSTYLE) $(SPECBASE).fo $(FOPARAM)
+docbook-simple.fo: docbook-simple.xml
+       $(XJPARSE) $<
+       $(XSLT) $< $(FOSTYLE) docbook-simple.fo $(XSLPARAM)
 
-$(SPECBASE).pdf: $(SPECBASE).fo
-       xep -2 $(SPECBASE).fo
-       rm -f $(SPECBASE).fo
+docbook-simple.pdf: docbook-simple.fo
+       xep $<
 
 clean:
-       $(RM) -f *.html *.pdf *.fo
+       $(RM) *.html