--- a/Makefile Sat Feb 05 13:27:18 2011 -0500
+++ b/Makefile Mon Sep 14 08:31:11 2015 -0400
@@ -13,44 +13,46 @@
# (internal|external) links when using xinclude. Better would be to
# not used xinclude at all.
-SECTIONS=alpha.xml \
- themes.xml \
+SECTIONS=\
+ alpha.xml \
+ themes.xml \
chronology.xml
-SRC_DEPS= \
- abzoodre.xml \
- amoureux.xml \
- apprends.xml \
- belle.xml \
- coeur.xml \
- democratie.xml \
- desert.xml \
- ecrivain.xml \
- espoir.xml \
- flocons.xml \
- hiver.xml \
- horloge.xml \
- idees.xml \
- jugement.xml \
- langue.xml \
- lettreseule.xml \
- louve.xml \
- nature.xml \
- oiseau.xml \
- ondes.xml \
- orchidee.xml \
- paysage.xml \
- plonger.xml \
- pomme.xml \
- prince.xml \
- renaissance.xml \
- reverie.xml \
- serrure.xml \
- si_tu_maimais.xml \
- tempete.xml \
- testament.xml \
- ton_rire.xml \
- valentin.xml \
- voix.xml \
+SRC_DEPS=\
+ abzoodre.xml \
+ amoureux.xml \
+ apprends.xml \
+ belle.xml \
+ coeur.xml \
+ democratie.xml \
+ desert.xml \
+ ecrivain.xml \
+ espoir.xml \
+ flocons.xml \
+ hiver.xml \
+ horloge.xml \
+ idees.xml \
+ jugement.xml \
+ langue.xml \
+ lettreseule.xml \
+ louve.xml \
+ nature.xml \
+ oiseau.xml \
+ ondes.xml \
+ orchidee.xml \
+ paysage.xml \
+ plonger.xml \
+ pomme.xml \
+ prince.xml \
+ renaissance.xml \
+ reverie.xml \
+ serrure.xml \
+ si_tu_maimais.xml \
+ sombrespensees.xml \
+ tempete.xml \
+ testament.xml \
+ ton_rire.xml \
+ valentin.xml \
+ voix.xml \
wolf.xml
STYLES_DIR=$(TOP)/styles
DTD_DIR=$(TOP)/dtd
@@ -60,8 +62,10 @@
DTD=$(addprefix $(DTD_DIR)/,poetry.dtd)
SGML_CATALOG_FILES=$(TOP)/catalog
export SGML_CATALOG_FILES
-xml_validate=xmllint --catalogs --valid --noout $(1)
-xml_post_validate=xmllint --catalogs --xinclude --postvalid --noout $(1)
+XML_CATALOG_FILES=$(TOP)/catalog.xml
+export XML_CATALOG_FILES
+xml_validate=xmllint -nonet --valid --noout $(1)
+xml_post_validate=xmllint -nonet --xinclude --postvalid --noout $(1)
html_validate=xmllint --xinclude --valid --noout $(1)
#REMOTE_DIR=o:public_html/poesie
@@ -102,7 +106,7 @@
echo $(PRINT_STYLES)
%.fo: %.xml $(PRINT_STYLES) $(SRC_DEPS) $(SECTIONS)
- xsltproc --catalogs --xinclude \
+ xsltproc -nonet --xinclude \
-o $@ $(STYLES_DIR)/poetry_print.xsl $<
%.pdf: %.fo
@@ -112,14 +116,14 @@
# rm $@.tmp.fo
%.html: %.xml $(HTML_STYLES) $(SRC_DEPS) $(SECTIONS)
- xsltproc --catalogs --xinclude \
+ xsltproc -nonet --xinclude \
--stringparam css-base-dir '/~fabien/styles/' \
-o $@ $(STYLES_DIR)/poetry_html.xsl $<
%/index.html: %.xml $(HTML_STYLES) $(SRC_DEPS) $(SECTIONS)
rm -rf $(dir $@)
mkdir -p $(dir $@)
- xsltproc --catalogs --xinclude \
+ xsltproc -nonet --xinclude \
--stringparam css-base-dir '/~fabien/styles/' \
-o $@ $(STYLES_DIR)/poetry_html.xsl $<