diff -r c072d78b7ac2 -r 976a1b8d4706 Makefile --- a/Makefile Fri Dec 30 19:55:33 2005 -0500 +++ b/Makefile Fri Dec 30 19:56:24 2005 -0500 @@ -1,9 +1,9 @@ #!/usr/bin/make -MAKE_RCS_VERSION="$Revision: 1883 $ $Name$" +MAKE_RCS_VERSION="$Revision: 1885 $ $Name$" -TOP=$(shell pwd) -RULES=$(TOP)/utils/Makefile.rules +TOP?=$(shell pwd) +RULESDIR?=$(TOP) PACKAGE=arpeges PROFCOND=full @@ -83,7 +83,7 @@ esquive.sgml\ licharm.sgml\ licfdlen.sgml\ - licfdlfr. + licfdlfr.sgml AIDES_TARGETS=$(addprefix perso,.pdf .svg) \ $(addprefix create,.pdf) @@ -91,37 +91,57 @@ all: aides for short in 0 1 ; do \ - make TOP=$(TOP) RULES=$(RULES) \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) \ SHORT_VERSION=$$short rules ; \ done rules: html for paper in $(PAPER_TYPE) ; do \ - make TOP=$(TOP) RULES=$(RULES) \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) \ PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) paper ; \ done +install: install-aides $(PACKAGE).tar.bz2 + for short in 0 1 ; do \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \ + SHORT_VERSION=$$short install-rules ; \ + done + cp -a $(PACKAGE).tar.bz2 $(INSTALL_DIR) + +install-rules: install-html + for paper in $(PAPER_TYPE) ; do \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \ + PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) \ + install-paper ; \ + done + + +purge: clean purge-aides + for short in 0 1 ; do \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \ + SHORT_VERSION=$$short purge-rules ; \ + done + +purge-rules: purge-html + for paper in $(PAPER_TYPE) ; do \ + make TOP=$(TOP) RULESDIR=$(RULESDIR) INSTALL_DIR=$(INSTALL_DIR) \ + PAPERCONF=$$paper SHORT_VERSION=$(SHORT_VERSION) \ + purge-paper ; \ + done + + +.PHONY: all rules install install-rules purge purge-rules + + +include $(RULESDIR)/Makefile.rules + paper: $(PAPER_TARGETS) html: $(HTML_TARGETS) aides: $(AIDES_TARGETS) -.PHONY: all rules paper html aides - -install: install-aides - for short in 0 1 ; do \ - make TOP=$(TOP) RULES=$(RULES) INSTALL_DIR=$(INSTALL_DIR) \ - SHORT_VERSION=$$short install-rules ; \ - done - -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 - +.PHONY: paper html aides install-paper: $(PAPER_TARGETS) mkdir -p $(INSTALL_DIR) @@ -136,21 +156,7 @@ cp -a $(AIDES_TARGETS) $(INSTALL_DIR) cp -a $(AIDES_SRC) $(INSTALL_DIR) -.PHONY: install install-rules install-paper install-html install-aides - -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 - -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 - +.PHONY: install-paper install-html install-aides purge-paper: rm -f $(PAPER_TARGETS) @@ -161,10 +167,7 @@ purge-aides: rm -f $(AIDES_TARGETS) -.PHONY: purge purge-rules purge-paper purge-html purge-aides - - -include $(RULES) +.PHONY: purge-paper purge-html purge-aides $(PACKAGE)$(NAME_SUFFIX).html.tar.gz: $(HTML_ROOTFILE) tar -czf $@ $(HTML_OUTPUTDIR)