release: 1.5.19

[lilypond.git] / make / mutopia-targets.make

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index e3304811220fc5bb00e1c62558266b8f151628b8..3504259fb557722233d4ba97e05aa7d10f1f80b8 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,21 +1,18 @@
 
+include $(stepdir)/www-targets.make
+
+
 .PHONY: download mutopia png ps scores tar
 
 .PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
 .PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
 
-all: $(OUT_FILES)
-
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
-
-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) $(dvi_examples) $(ps_examples) $(png_examples)
 
 tar:
        mkdir -p $(outdir)/$(tarball)
@@ -30,29 +27,6 @@ ps: $(ps_examples)
 scores: $(score_ps)
        $(MAKE) ps_examples="$<" ps
 
-#
-# <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
-
-#
-# 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-mutopia:
        $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
 
@@ -73,7 +47,6 @@ 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\