Updated

diff --git a/litprog/.cvsignore b/litprog/.cvsignore
index 20344c9807e2a2cc0068a4458f14c5971081e05d..ef6a50e1f7cec6ef80d146f2902f093644861712 100644 (file)
--- a/litprog/.cvsignore
+++ b/litprog/.cvsignore
@@ -1,6 +1,6 @@
-litprog.xml
-litprog.xsl
-litprog.html
+wdocbook.xml
+wdocbook.xsl
+wdocbook.html
 weave.xml
 weave.xsl
 weave.html

diff --git a/litprog/Makefile b/litprog/Makefile
index 47143d2cf127c2b9f069837ae866b067b3655a3c..9f67816441735b431986274f2d28f79bc21e85e8 100644 (file)
--- a/litprog/Makefile
+++ b/litprog/Makefile
@@ -1,6 +1,7 @@
 include ../cvstools/Makefile.incl
 
-all: tangle.html weave.html litprog.html
+all: tangle.html weave.html wdocbook.html
+       $(MAKE) -C html
 
 tangle.html: tangle.xml litprog.xsl
        $(XSLT) $< litprog.xsl $@
@@ -26,11 +27,11 @@ weave.xml: weave.xweb weave.xsl
 weave.xsl: weave.xweb tangle.xsl
        $(XSLT)  $< tangle.xsl $@
 
-litprog.html: litprog.xml litprog.xsl
-       $(XSLT) $< litprog.xsl $@
+wdocbook.html: wdocbook.xml wdocbook.xsl
+       $(XSLT) $< wdocbook.xsl $@
 
-litprog.xml: litprog.xweb weave.xsl
+wdocbook.xml: wdocbook.xweb weave.xsl
        $(XSLT) $< weave.xsl $@
 
-litprog.xsl: litprog.xweb tangle.xsl
+wdocbook.xsl: wdocbook.xweb tangle.xsl
        $(XSLT) $< tangle.xsl $@