--- a/Makefile	Mon Dec 26 19:21:22 2005 -0500
+++ b/Makefile	Fri Dec 30 19:55:33 2005 -0500
@@ -1,30 +1,26 @@
 #!/usr/bin/make
 
-MAKE_RCS_VERSION="$Revision: 1841 $ $Name$"
+MAKE_RCS_VERSION="$Revision: 1883 $ $Name$"
 
 TOP=$(shell pwd)
-
+RULES=$(TOP)/utils/Makefile.rules
 PACKAGE=arpeges
-INSTALL_DIR=install
 PROFCOND=full
 
-ifdef SHORT_VERSION
+ifeq ($(SHORT_VERSION),1)
 VALID_OPTIONS=-iSHORT_VERSION
-JADEFLAGS=-iSHORT_VERSION -V $(PACKAGE)-short-version
 NAME_SUFFIX=-basic
 # FOP=fop
 else
 NAME_SUFFIX=
 endif
 
-HTML_OUTPUTDIR=$(PACKAGE)$(NAME_SUFFIX)
 XML_EXT=sgml
 SGML_CATALOG_FILES=$(shell pwd)/catalog
 
 DTD_FILES=struct.dtd
-SGML_MAIN_FILE=$(PACKAGE)$(NAME_SUFFIX).sgml
 SGML_FILES=arpeges-main.sgml
-ifdef SHORT_VERSION
+ifeq ($(SHORT_VERSION),1)
 	SGML_FILES+=\
 	license_basic.sgml\
 	intro_allegee.sgml\
@@ -87,88 +83,88 @@
 	esquive.sgml\
 	licharm.sgml\
 	licfdlen.sgml\
-	licfdlfr.sgml
+	licfdlfr.
 
-all: a4 letter
+AIDES_TARGETS=$(addprefix perso,.pdf .svg) \
+	$(addprefix create,.pdf)
+AIDES_SRC=perso.sk create.fig
 
-install:
-	$(MAKE) all
+all: aides
+	for short in 0 1 ; do \
+		make TOP=$(TOP) RULES=$(RULES) \
+		SHORT_VERSION=$$short rules ; \
+	done
 
-a4:
-	$(MAKE) PAPERCONF=a4 normal short aides
+rules: html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) \
+		PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) paper ; \
+	done
 
-letter:
-	$(MAKE) PAPERCONF=letter normal short aides
+paper: $(PAPER_TARGETS)
 
-validate:
-ifdef SHORT_VERSION
-	$(error "Please, undefined SHORT_VERSION before running this target")
-else
-	$(MAKE) valid
-	$(MAKE) SHORT_VERSION=1 valid
-endif
+html: $(HTML_TARGETS)
+
+aides: $(AIDES_TARGETS)
+
+.PHONY: all rules paper html aides
 
-normal:
-ifdef SHORT_VERSION
-	$(error "Please, undefined SHORT_VERSION before running this target")
-else
-	$(MAKE) dist
-endif
+install: install-aides
+	for short in 0 1 ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		SHORT_VERSION=$$short install-rules ; \
+	done
 
-short:
-	$(MAKE) SHORT_VERSION=1 dist
+install-rules: install-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) \
+		install-paper ; \
+	done
 
-aides: perso.ps perso.pdf perso.svg create.ps create.pdf
-	mkdir -p $(INSTALL_DIR)
-	$(foreach target,$^,cp $(target) $(INSTALL_DIR)/$(basename $(target))$(filter-out -,-$(RELEASE))$(suffix $(target));)
-
-include $(TOP)/utils/Makefile.rules
-
-SUFFIX_TARGETS=-$(PAPERCONF)-book.pdf .txt -$(PAPERCONF).pdf .html .html.tar.gz
-DIST_TARGETS=$(addprefix $(PACKAGE)$(NAME_SUFFIX),$(SUFFIX_TARGETS))
 
-dist: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).fo $(DIST_TARGETS)
+install-paper: $(PAPER_TARGETS)
 	mkdir -p $(INSTALL_DIR)
-	for target in $(DIST_TARGETS) ; do			\
-		cp $$target					\
-			$(INSTALL_DIR)/`echo $$target | sed	\
-			s/$(PACKAGE)$(NAME_SUFFIX)/$(PACKAGE)$(NAME_SUFFIX)$(filter-out -,-$(RELEASE))/` ;	\
-	done
-	-rm -r $(INSTALL_DIR)/$(PACKAGE)$(NAME_SUFFIX)$(filter-out -,-$(RELEASE))
-	cp -r $(PACKAGE) $(INSTALL_DIR)/$(PACKAGE)$(NAME_SUFFIX)$(filter-out -,-$(RELEASE))
+	cp -a $(PAPER_TARGETS) $(INSTALL_DIR)
+
+install-html: $(HTML_TARGETS)
+	mkdir -p $(INSTALL_DIR)
+	cp -a $(HTML_TARGETS) $(INSTALL_DIR)
 
-.PHONY: all normal short dist validate aides install a4 letter
-
-# $(PACKAGE): ps pdf text html html_one rtf htgz zip dvi tex
-$(PACKAGE): html
+install-aides: $(AIDES_TARGETS) $(AIDES_SRC)
+	mkdir -p $(INSTALL_DIR)
+	cp -a $(AIDES_TARGETS) $(INSTALL_DIR)
+	cp -a $(AIDES_SRC) $(INSTALL_DIR)
 
-dvi: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).dvi
+.PHONY: install install-rules install-paper install-html install-aides
 
-view: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).dvi
-	xdvi $<
+purge: clean purge-aides
+	for short in 0 1 ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		SHORT_VERSION=$$short purge-rules ; \
+	done
 
-text: $(PACKAGE)$(NAME_SUFFIX).txt
-
-print: pdf
+purge-rules: purge-html
+	for paper in $(PAPER_TYPE) ; do \
+		make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \
+		PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) \
+		purge-paper ; \
+	done
 
-ps: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).ps
-#	lpr $@
 
-html: $(HTML_ROOTFILE)
-
-html_one: $(PACKAGE)$(NAME_SUFFIX).html
+purge-paper:
+	rm -f $(PAPER_TARGETS)
 
-pdf: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).fo $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF).pdf
-
-rtf: $(PACKAGE)$(NAME_SUFFIX).rtf
-
-htgz: $(PACKAGE)$(NAME_SUFFIX).html.tar.gz
+purge-html: 
+	rm -rf $(HTML_TARGETS)
 
-zip: $(PACKAGE)$(NAME_SUFFIX).html.zip
+purge-aides: 
+	rm -f $(AIDES_TARGETS)
 
-tex: $(PACKAGE)$(NAME_SUFFIX).tex
+.PHONY: purge purge-rules purge-paper purge-html purge-aides
 
-zTXT: $(PACKAGE)$(NAME_SUFFIX).zTXT
+
+include $(RULES)
 
 $(PACKAGE)$(NAME_SUFFIX).html.tar.gz: $(HTML_ROOTFILE)
 	tar -czf $@ $(HTML_OUTPUTDIR)
@@ -184,21 +180,5 @@
 	xsltproc --xinclude --stringparam profile.userlevel adv --stringparam profile.condition $(PROFCOND) -o $@ $(DOCBOOK_XSL_PATH)/profiling/profile.xsl $<
 	 perl -pi -e 's;xmlns:xi=".*?";;' $@
 
-booklet: $(PACKAGE)$(NAME_SUFFIX)-$(PAPERCONF)-book.pdf
-
-purge_it:
-	rm -f *.fo *.gif *.png *.eps *.ps *.pdf *.svg \
-		$(addprefix $(PACKAGE)$(NAME_SUFFIX), .sgml .txt .rtf -$(PAPERCONF).ps -$(PAPERCONF).pdf .html .html.tar.gz .zip $(PAPERCONF).dvi .tex .ltx -$(PAPERCONF).fo -$(PAPERCONF)-book.ps -$(PAPERCONF)-book.pdf)
-	rm -rf $(PACKAGE)$(NAME_SUFFIX)
+.PHONY: clean purge
 
-purge: clean
-	for paper in $(PAPER_TYPE) ; do					\
-		$(MAKE) PAPERCONF=$$paper purge_it ;			\
-		$(MAKE) PAPERCONF=$$paper SHORT_VERSION=1 purge_it ;	\
-	done
-
-snapshot:
-	rm -f ../$(PACKAGE).tar.bz2 
-	$(MAKE) ../$(PACKAGE).tar.bz2
-
-.PHONY:	dvi view text print ps html html_one pdf rtf zTXT purge purge_it booklet