X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-targets.make;h=dab3f46d05c76630b3a6856dbe0c85fe51f3e285;hb=c37888fe2f06304914ae980b26cb82de2b1deccf;hp=5c7011da3d8e43d3db48975237825d2d646288e2;hpb=0713e9256dc1f35299ce716cf29ddeab4ebca93b;p=lilypond.git

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 5c7011da3d..dab3f46d05 100644
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,23 +1,24 @@
 
-.PHONY: mutopia png ps scores tar
+include $(stepdir)/www-targets.make
 
-all: $(OUT_FILES)
 
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
+.PHONY: download mutopia png ps scores tar
 
-local-web:
-	$(MAKE) conf=www local-WWW
+.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
+.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
 
-convert-ly: local-convert-ly
-	$(LOOP)
 
-local-convert-ly:
-	$(PYTHON) $(CONVERT_LY) -e *ly
+all: $(OUT_FILES)
+
+# we want dvi_examples as well, because they get thrown away otherwise
+# incurring another costly lilypond run.
+local-WWW: $(ly_examples) $(pdf_examples) $(png_examples)
 
 tar:
 	mkdir -p $(outdir)/$(tarball)
 	cp -p *.ly $(outdir)/$(tarball)
 	cd $(outdir) && tar czf $(tarball).tar.gz $(tarball)
+	rm -rf $(outdir)/$(tarball)
 
 png: $(png_examples)
 
@@ -26,17 +27,31 @@ ps: $(ps_examples)
 scores: $(score_ps)
 	$(MAKE) ps_examples="$<" ps
 
+local-mutopia:
+	$(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
+
+mutopia: local-mutopia
+	$(LOOP)
+
 mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz)
 
-mutopia:
-	$(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
+local-clean: local-letter-clean
+
+local-letter-clean:
+	rm -f $(outdir)-letter/*
+
 
-local-help:
+local-help: local-mutopia-help
+
+local-mutopia-help:
 	@echo -e "\
-  convert-ly  convert all LilyPond sources\n\
+  <NAME>      update $(outdir)/<NAME>.ps\n\
+  <NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
   mutopia     update PNGs, PostScript a4 and letter of all mutopia-examples\n\
   png         update PNGs of all examples\n\
   ps          update PostScript of all examples\n\
   scores      update PostScript of all scores\n\
 "\
 #
+
+