X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-targets.make;h=dab3f46d05c76630b3a6856dbe0c85fe51f3e285;hb=89006169468f47d1fece73a935ca6c1b1f26f481;hp=b01250df598eb0663eafd357eca7785b42f67c4d;hpb=125c505b0b8e664b9df2f11718fa6ffca6806060;p=lilypond.git

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index b01250df59..dab3f46d05 100644
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,21 +1,18 @@
 
-.PHONY: mutopia png ps scores tar
+include $(stepdir)/www-targets.make
 
-.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
-.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
 
-all: $(OUT_FILES)
+.PHONY: download mutopia png ps scores tar
 
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
+.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
+.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
 
-local-web:
-	$(MAKE) conf=www local-WWW
 
-convert-ly: local-convert-ly
-	$(LOOP)
+all: $(OUT_FILES)
 
-local-convert-ly:
-	$(PYTHON) $(CONVERT_LY) -e *ly
+# 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)
@@ -30,47 +27,31 @@ ps: $(ps_examples)
 scores: $(score_ps)
 	$(MAKE) ps_examples="$<" ps
 
-mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz)
-
-mutopia:
+local-mutopia:
 	$(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
 
+mutopia: local-mutopia
+	$(LOOP)
+
+mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz)
+
 local-clean: local-letter-clean
 
 local-letter-clean:
 	rm -f $(outdir)-letter/*
 
-#
-# <NAME> and -book targets only available through ly.make template makefile;
-# too scary to install in LilyPonds make yet.
-#
-#
 
-ifeq (0,1)
-#
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-	psbook $< $<.1
-	pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.1 $@
-	rm -f $<.1
+local-help: local-mutopia-help
 
-#
-# Catch-all target: type `make foo' to make out/foo.ps,
-# or make `foo-book' to make out/foo-book.ps
-#
-%: $(outdir)/%.ps
-	@echo Making $@ from $<
-endif
-
-local-help:
+local-mutopia-help:
 	@echo -e "\
   <NAME>      update $(outdir)/<NAME>.ps\n\
   <NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
-  convert-ly  convert all LilyPond sources\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\
 "\
 #
+
+