浏览代码

- target check uses xmllint

Jan Janak 20 年之前
父节点
当前提交
e5131a99c2
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      Makefile.doc

+ 4 - 3
Makefile.doc

@@ -36,10 +36,12 @@ CATALOG=$(ROOT_DIR)/doc/catalog.xml
 LYNX     ?= lynx
 LYNX     ?= lynx
 DIA      ?= dia
 DIA      ?= dia
 XSLTPROC ?= xsltproc
 XSLTPROC ?= xsltproc
+XMLLINT ?= /usr/bin/xmllint
 
 
 LYNX_FLAGS     ?= -nolist
 LYNX_FLAGS     ?= -nolist
 DIA_ARGS       ?=
 DIA_ARGS       ?=
 XSLTPROC_FLAGS ?=
 XSLTPROC_FLAGS ?=
+XMLLINT_FLAGS ?= --xinclude --postvalid --noout
 
 
 ifeq ($(VALIDATE), 0)
 ifeq ($(VALIDATE), 0)
 	override XSLTPROC_FLAGS := $(XSLTPROC_FLAGS) --novalid
 	override XSLTPROC_FLAGS := $(XSLTPROC_FLAGS) --novalid
@@ -71,11 +73,10 @@ txt: $(txt_files)
 %.d: %.xml $(alldep) 
 %.d: %.xml $(alldep) 
 	$(XSLTPROC) $(XSLTPROC_FLAGS) --nonet --novalid --stringparam output $@ $(DEP_XSL) $< 
 	$(XSLTPROC) $(XSLTPROC_FLAGS) --nonet --novalid --stringparam output $@ $(DEP_XSL) $< 
 
 
-
 .PHONY: check
 .PHONY: check
 check: $(xml_files)
 check: $(xml_files)
-	@XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) --xinclude --nowrite --nomkdir --noout $(DEP_XSL) $<
-	
+	XML_CATALOG_FILES=$(CATALOG) $(XMLLINT) $(XMLLINT_FLAGS) $<
+
 .PHONY: clean
 .PHONY: clean
 clean:
 clean:
 	rm -f $(txt_files)
 	rm -f $(txt_files)