The conversion to HTML creates proper XHTML.

[xmldoc.git] / doc / makefile

diff --git a/doc/makefile b/doc/makefile
index bdebd00..8fa353d 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -12,7 +12,7 @@ IMAGES=
 
 PICTURES=
 
-html: guide.html
+html: guide.xhtml
 
 ps: guide.ps
 
@@ -20,31 +20,25 @@ txt: guide.txt
 
 all:  ps html txt
 
-guide.html : $(XMLS) $(IMAGES) ../html.xsl
-       ../xp ../preprocess.xsl guide.xml >guide.tmp
-       ../xp ../html.xsl guide.tmp > guide.html
-       rm guide.tmp
+guide.xhtml : $(XMLS) $(IMAGES) ../html.xsl
+       ../xp ../html.xsl guide.xml > guide.xhtml
 
 guide.ps : $(XMLS)  $(PICTURES) ../latex.xsl ../xp
-       ../xp ../preprocess.xsl guide.xml >guide.tmp
-       ../xp --latex ../latex.xsl guide.tmp > guide.tex 
+       ../xp --latex ../latex.xsl guide.xml > guide.tex 
        latex guide.tex
        dvips -o guide.ps guide.dvi
-       rm guide.tmp
 
 guide.pdf : $(XMLS)  $(PICTURES) ../latex.xsl ../xp
-       ../xp ../preprocess.xsl guide.xml >guide.tmp
-       ../xp --latex ../latex.xsl guide.tmp > guide.tex 
+       ../xp --latex ../latex.xsl guide.xml > guide.tex 
        pdflatex guide.tex
-       rm guide.tmp
 
 guide.txt : $(XMLS) ../text.xsl
-       ../xp ../preprocess.xsl guide.xml >guide.tmp
-       ../xp ../text.xsl guide.tmp > guide.txt
-       rm guide.tmp
+       ../xp ../text.xsl guide.xml > guide.txt
 
 check:
-       xmllint --noout --valid $(XMLS)
+       xmllint --noout --xinclude --loaddtd --noent --schema ../doc.xsd guide.xml
+#      xmllint --noout --valid $(XMLS)
+
 clean:
-       rm -f guide.html guide.ps guide.tex guide.dvi guide.log guide.txt guide.pdf
+       rm -f guide.xhtml guide.ps guide.tex guide.dvi guide.log guide.txt guide.pdf
        rm -f $(IMAGES) $(PICTURES)