* make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting.

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

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 08445758d53908ab05bf49f719dbfbd38ea3c5e9..a86e9c7e4229e9c98a266bc37a992059c20b5283 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,15 +1,5 @@
 
 
-$(outdir)/%.gif: $(outdir)/%.ps
-       sh $(PS_TO_GIFS) $<
-       -mv $(name-stem)-page*.gif $(outdir)/
-       ln -s $(name-stem)-page1.gif $@
-
-$(outdir)/%.png: $(outdir)/%.ps
-       sh $(PS_TO_PNGS) $<
-       -mv $(name-stem)-page*.png $(outdir)/
-       ln -s $(name-stem)-page1.png $@
-
 $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
 
@@ -23,17 +13,11 @@ $(outdir)/%.ly.txt: %.abc
 $(outdir)/%.ly: %.abc
        $(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-$(outdir)/%.dvi: $(outdir)/%.ly
-       $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
-
-# don't junk intermediate .dvi files.  They're easier to view than
-# .ps or .png
-.PRECIOUS: $(outdir)/%.dvi
-
-$(outdir)/%.dvi: %.ly
-       $(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
+# hmm. notdir builds srcdir builds? 
+       cd $(outdir); $(LILYPOND) --pdf --ps --png $(notdir $<)
 
-$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
-       $(PYTHON) $(LY2DVI) --output=$@ --dependencies --set=papersize=$(PAPERSIZE) $< 
+$(outdir)/%.ly: %.ly
+       cp $< $@