X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-targets.make;h=0d49357e46bb85bcce3a790057f138058119c809;hb=HEAD;hp=16906c87fe292adb186f363eae1160c2523ad47e;hpb=cdeb130278c75bd9053b82d59bbc29218e759179;p=lilypond.git

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 16906c87fe..0d49357e46 100644
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,21 +1,11 @@
-
 .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:
 
-local-convert-ly:
-	$(PYTHON) $(CONVERT_LY) -e *ly
+ifeq ($(out),www)
+local-WWW-1: $(ly_examples) $(pdf_examples) $(png_examples)
+endif
 
 tar:
 	mkdir -p $(outdir)/$(tarball)
@@ -30,32 +20,8 @@ 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)
+	$(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW-1 $(mutopia-letter)
 
 mutopia: local-mutopia
 	$(LOOP)
@@ -68,11 +34,12 @@ local-letter-clean:
 	rm -f $(outdir)-letter/*
 
 
-local-help:
+local-help: local-mutopia-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\
@@ -81,41 +48,3 @@ local-help:
 #
 
 
-
-#
-# mutopia-archive playground
-#
-
-
-# -> mutopia-vars.make
-MUTOPIA_MIRROR = http://www.mutopiaproject.org/ftp
-# ugh: doesn't work
-# mutopia-dir = $(pwd:%/mutopia/%=mutopia)
-mutopia-dir = $(shell pwd | sed 's@.*mutopia@@')
-wget-list = $(mutopia-examples:%=$(mutopia-dir)/%)
-
-local-remove-ly:
-	-mv -f $(wildcard *.ly) $(outdir)
-
-remove-ly: local-remove-ly
-	$(LOOP)
-
-local-download: $(mutopia-examples:%=%.ly)
-	@echo downloading $<
-
-download: local-download
-	$(LOOP)
-
-# -> mutopia-rules.make
-ifeq ($(zipped),)
-%.ly:
-	wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@
-else
-%.zip:
-	wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@
-
-%.ly:	%-lys.zip
-	unzip $<
-endif
-
-