r8114: finish conversion to xinclude

[uffi.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index d13a1e31680b4a4c0da9cbbca96da4e476e5d558..e9c26fb23dca45bd8004cfa7c8c9e681aad4d017 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,14 +29,16 @@ ifndef DOCFILE_EXT
 DOCFILE_EXT=${DOCFILE_EXT_DEFAULT}
 endif
 
-DOCFILE=${DOCFILE_BASE}.${DOCFILE_EXT}
-FOFILE=${DOCFILE_BASE}.fo
-PDFFILE=${DOCFILE_BASE}.pdf
-PSFILE=${DOCFILE_BASE}.ps
-DVIFILE=${DOCFILE_BASE}.dvi
-TXTFILE=${DOCFILE_BASE}.txt
-TMPFILES=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
-DOCFILES=$(shell echo *.xml)
+DOCFILE:=${DOCFILE_BASE}.${DOCFILE_EXT}
+FOFILE:=${DOCFILE_BASE}.fo
+PDFFILE:=${DOCFILE_BASE}.pdf
+PSFILE:=${DOCFILE_BASE}.ps
+DVIFILE:=${DOCFILE_BASE}.dvi
+TXTFILE:=${DOCFILE_BASE}.txt
+TMPFILES:=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
+DOCFILES:=$(shell echo *.xml)
+
+CHECK:=xmllint --noout --catalogs --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all
 all: html pdf 
@@ -54,15 +56,15 @@ check:
 .PHONY: html
 html: html.tar.gz
 
-html.tar.gz: $(DOCFILES) Makefile
+html.tar.gz: $(DOCFILES) Makefile check
        @rm -rf html
-       @xmlto -o html xhtml $(DOCFILE)
+       @xmlto --skip-validation -o html xhtml $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo
 fo: ${FOFILE}
 
-${FOFILE}: $(DOCFILES) Makefile
+${FOFILE}: $(DOCFILES) Makefile check
        @xmlto fo $(DOCFILE)
 
 .PHONY: pdf