patch::: 1.3.130.jcn4

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

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index b741023eaf75bdfc1bfb66e92aebb49b8a49768e..382871d39f94e58cb6f27f32ee666a1f06626001 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,40 +1,41 @@
 
 
 $(outdir)/%.gif: $(outdir)/%.ps
-       sh $(buildscripts)/ps-to-gifs.sh $<
+       sh $(PS_TO_GIFS) $<
        -mv $(name-stem)-page*.gif $(outdir)/
        touch $@
 
 $(outdir)/%.png: $(outdir)/%.ps
-       sh $(buildscripts)/ps-to-pngs.sh $<
+       sh $(PS_TO_PNGS) $<
        -mv $(name-stem)-page*.png $(outdir)/
        touch $@
 
 $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
 
-$(outdir)/%.fly.txt: %.fly
-       ln -f $< $@
-
 $(outdir)/%.ly.txt: %.abc
 #which file to show here -- abc seems more cute?
        ln -f $< $@
 
 $(outdir)/%.ly: %.abc
-       $(PYTHON) $(depth)/scripts/abc2ly.py -o $@ $< 
+       $(PYTHON) $(ABC2LY) -o $@ $< 
 
 $(outdir)/%.dvi: $(outdir)/%.ly
-       $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(LY2DVI) --outdir=$(outdir) --dependencies $< 
        -mv $(basename $(<F))*.midi $(outdir)
 
 # 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) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(LY2DVI) --outdir=$(outdir) --dependencies $< 
        -mv $(basename $<)*.midi $(outdir)
 
+$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
+       $(PYTHON) $(LY2DVI) --outdir=$(outdir)-$(PAPERSIZE) --dependencies --papersize=$(PAPERSIZE) $< 
+       -mv $(basename $<)*.midi $(outdir)-$(PAPERSIZE)
+
 $(outdir)/%.dvi: %.fly
-       $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(LY2DVI) -o $(outdir)  $< 
        -mv $(basename $<)*.midi $(outdir)