X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-rules.make;h=fd3507113139616691eea3cca1955d188deb1b9c;hb=73b8aa0b86d5beb74db97b7999069e200cc465af;hp=03cba6f2e9c8a6ca67a351b9e23284aa48522442;hpb=fabf53486884f78f54855a7b4a59cb105d83f638;p=lilypond.git

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 03cba6f2e9..fd35071131 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,11 +1,5 @@
 
 
-$(outdir)/%.png: $(outdir)/%.ps
-	gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit
-	-mv $(name-stem)-page*.png $(outdir)/
-	rm -f $@
-	ln -s $(name-stem)-page1.png $@
-
 $(outdir)/%.ly.txt: %.ly
 	ln -f $< $@
 
@@ -19,22 +13,12 @@ $(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)/%.pdf: $(outdir)/%.dvi
-	dvips -u +lilypond.map -t $(DVIPS_PAPERSIZE) -o $@.pdfps  -Ppdf $<
-	ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
+# hmm. notdir builds srcdir builds? 
+$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
+	cd $(outdir); $(LILYPOND) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
+	touch $(outdir)/$(basename $(notdir $<)).png
 
-$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies --set=papersize=$(PAPERSIZE) $< 
+$(outdir)/%.ly: %.ly
+	cp $< $@