diff -r 54f63240b921 -r dba3080acefd Makefile --- a/Makefile Tue Jan 24 13:23:21 2006 -0500 +++ b/Makefile Tue Jan 24 13:23:44 2006 -0500 @@ -3,16 +3,16 @@ # No final slash here! # It will mess up rsync behavior. TOP=`pwd` +SRC_DIR=`pwd` +INSTALL_DIR=$(TOP)/install FR_ARTICLES=couleurs jjch credo systemes EN_ARTICLES=colors UNPUBLISHED=dri-aido jdrdef jdrl resolution TARGETS=jeuderologie rpgtheory $(FR_ARTICLES) $(EN_ARTICLES) $(UNPUBLISHED) - -UPDATE_FILES=$(TARGETS) index.en.html index.fr.html -SRC_DIR=`pwd` -INSTALL_DIR=$(TOP)/install +HTML_FILES=index.en.html index.fr.html SGML_CATALOG_FILES=/etc/sgml/catalog -HTML_FILES=index.en.html index.fr.html +xml_validate=xmllint --xinclude --postvalid --noout $(1) +html_validate=true make_subdir= \ [ -d $(2) ] || mkdir -p $(2) ; \ @@ -22,8 +22,17 @@ all: $(addsuffix -do,$(TARGETS)) jeuderologie.xml: $(addsuffix .xml, $(FR_ARTICLES)) + rpgtheory.xml: $(addsuffix .xml, $(EN_ARTICLES)) +$(addsuffix -validate,$(TARGETS)): + $(call xml_validate,$(subst -validate,.xml,$@)) + +$(addsuffix -validate,$(HTML_FILES)): + $(call html_validate,$(subst -validate,,$@)) + +validate: $(addsuffix -validate,$(TARGETS) $(HTML_FILES)) + install: $(addsuffix -do,$(TARGETS)) $(HTML_FILES) mkdir -p $(INSTALL_DIR) cp -a $(HTML_FILES) $(TARGETS) $(INSTALL_DIR) @@ -71,4 +80,5 @@ %.html: %.xml $(SRC_DIR)/html.xsl xsltproc --xinclude -o $@ $(SRC_DIR)/html.xsl $< -.PHONY: $(TARGETS) $(addsuffix -do,$(TARGETS)) update clean all install +.PHONY: $(TARGETS) $(addsuffix -do,$(TARGETS)) +.PHONY: update clean all install validate