diff -r 3c74e425a409 -r 125e031074f3 Makefile --- a/Makefile Thu Feb 09 11:57:13 2006 -0500 +++ b/Makefile Thu Feb 09 11:57:18 2006 -0500 @@ -8,12 +8,14 @@ FR_ARTICLES=couleurs jjch credo systemes EN_ARTICLES=colors UNPUBLISHED=dri-aido jdrdef jdrl resolution -TARGETS=jeuderologie rpgtheory $(FR_ARTICLES) $(EN_ARTICLES) $(UNPUBLISHED) +BOOKS=jeuderologie rpgtheory +TARGETS=$(BOOKS) $(FR_ARTICLES) $(EN_ARTICLES) $(UNPUBLISHED) HTML_FILES=index.en.html index.fr.html SGML_CATALOG_FILES=/etc/sgml/catalog export SGML_CATALOG_FILES -xml_validate=xmllint --xinclude --valid --noout $(1) -html_validate=xmllint --valid --noout $(1) +xml_validate=xmllint --valid --noout $(1) +xml_post_validate=xmllint --postvalid --xinclude --noout $(1) +html_validate=$(xml_validate) make_subdir= \ [ -d $(2) ] || mkdir -p $(2) ; \ @@ -30,13 +32,18 @@ validate-rpgtheory: $(addsuffix -validate, $(EN_ARTICLES)) +%-post-validate: %.xml + $(call xml_post_validate,$<) + %-validate: %.xml $(call xml_validate,$<) %.html-validate: %.html $(call html_validate,$<) -validate: $(addsuffix -validate,$(TARGETS) $(HTML_FILES)) +validate: $(addsuffix -validate,$(TARGETS) $(HTML_FILES)) post-validate + +post-validate: $(addsuffix -post-validate,$(BOOKS)) install: $(addsuffix -do,$(TARGETS)) $(HTML_FILES) mkdir -p $(INSTALL_DIR)