--- a/Makefile	Fri Jan 20 12:10:12 2006 -0500
+++ b/Makefile	Mon Jan 23 13:07:04 2006 -0500
@@ -3,20 +3,27 @@
 # No final slash here!
 # It will mess up rsync behavior.
 TOP=`pwd`
-TARGETS=couleurs colors jjch credo dri-aido jdrdef jdrl resolution
+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
 SGML_CATALOG_FILES=/etc/sgml/catalog
 HTML_FILES=index.en.html index.fr.html
 
-make_subdir=\
-	[ -d $(2) ] || mkdir -p $(2) ; \
-	$(MAKE) SRC_DIR=$(SRC_DIR) VPATH=$(SRC_DIR) \
+make_subdir=						\
+	[ -d $(2) ] || mkdir -p $(2) ;			\
+	$(MAKE) SRC_DIR=$(SRC_DIR) VPATH=$(SRC_DIR)	\
 		-C $(2) -f $(SRC_DIR)/Makefile $(1)
 
 all: $(addsuffix -do,$(TARGETS))
 
+jeuderologie.xml: $(addsuffix .xml, $(FR_ARTICLES))
+rpgtheory.xml: $(addsuffix .xml, $(EN_ARTICLES))
+
 install: $(addsuffix -do,$(TARGETS)) $(HTML_FILES)
 	mkdir -p $(INSTALL_DIR)
 	cp -a $(HTML_FILES) $(TARGETS) $(INSTALL_DIR)
@@ -35,7 +42,7 @@
 	$(MAKE) -f $(SRC_DIR)/Makefile $@.pdf $@.txt $@/index.html $@.html
 
 %.fo: %.xml $(SRC_DIR)/print.xsl
-	xsltproc -o $@ $(SRC_DIR)/print.xsl $< 
+	xsltproc --xinclude -o $@ $(SRC_DIR)/print.xsl $< 
 
 TEX_OPTIONS=-interaction=errorstopmode -file-line-error-style
 TEXERRORLEVEL=2
@@ -44,14 +51,14 @@
 # 	-cp -pf prior.aux pprior.aux
 # 	-cp -pf $(basename $<).aux prior.aux
 # 	pdfxmltex $(TEX_OPTIONS) $< || [ $$? -lt $(TEXERRORLEVEL) ]
-# 	if ! cmp $(basename $<).aux prior.aux &&	\
-# 	   ! cmp $(basename $<).aux pprior.aux &&	\
+# 	if ! cmp $(basename $<).aux prior.aux &&		\
+# 	   ! cmp $(basename $<).aux pprior.aux &&		\
 # 	   expr $(MAKELEVEL) '<' $(MAX_TEX_RECURSION); then	\
 # 		rm -f $@ ;					\
-# 		$(MAKE) -f $(SRC_DIR)/Makefile $@ ;					\
+# 		$(MAKE) -f $(SRC_DIR)/Makefile $@ ;		\
 # 	fi
 # 	rm -f prior.aux pprior.aux
-#	xmlto pdf $<
+# 	xmlto pdf $<
 	fop $< $@
 
 %.txt: %.html
@@ -59,9 +66,9 @@
 
 %/index.html: %.xml $(SRC_DIR)/chunk.xsl
 	rm -rf $(dir $@)
-	xsltproc -o $(dir $@) $(SRC_DIR)/chunk.xsl $<
+	xsltproc --xinclude -o $(dir $@) $(SRC_DIR)/chunk.xsl $<
 
 %.html: %.xml $(SRC_DIR)/html.xsl
-	xsltproc -o $@ $(SRC_DIR)/html.xsl $<
+	xsltproc --xinclude -o $@ $(SRC_DIR)/html.xsl $<
 
 .PHONY: $(TARGETS) $(addsuffix -do,$(TARGETS)) update clean all install