patch::: 1.4.1.jcn1

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

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 923aa009d8ebec28a021bf22ae0ede32ba39bb1f..f2328cb16a427856c305864c689f721a2d60a576 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,14 +1,16 @@
 
 
 $(outdir)/%.gif: $(outdir)/%.ps
-       sh $(buildscript-dir)/ps-to-gifs.sh $<
+       sh $(PS_TO_GIFS) $<
        -mv $(name-stem)-page*.gif $(outdir)/
-       touch $@
+#      touch $@
+       ln -s $(outdir)/$(name-stem)-page1.gif $@
 
 $(outdir)/%.png: $(outdir)/%.ps
-       sh $(buildscript-dir)/ps-to-pngs.sh $<
+       sh $(PS_TO_PNGS) $<
        -mv $(name-stem)-page*.png $(outdir)/
-       touch $@
+#      touch $@
+       ln -s $(outdir)/$(name-stem)-page1.png $@
 
 $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
@@ -18,20 +20,19 @@ $(outdir)/%.ly.txt: %.abc
        ln -f $< $@
 
 $(outdir)/%.ly: %.abc
-       $(PYTHON) $(script-dir)/abc2ly.py -o $@ $< 
+       $(PYTHON) $(ABC2LY) -o $@ $< 
 
 $(outdir)/%.dvi: $(outdir)/%.ly
-       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
-       -mv $(basename $(<F))*.midi $(outdir)
+       $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
 
 # don't junk intermediate .dvi files.  They're easier to view than
-# .ps or .gif
+# .ps or .png
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
-       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
-       -mv $(basename $<)*.midi $(outdir)
+       $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+
+$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
+       $(PYTHON) $(LY2DVI) --output=$@ --dependencies --set=papersize=$(PAPERSIZE) $< 
+
 
-$(outdir)/%.dvi: %.fly
-       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
-       -mv $(basename $<)*.midi $(outdir)