X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-rules.make;h=cbacdaa0c7ab74e16abf2497e8664408b4692274;hb=52c8e6abea26fa63f995556fc6555e3895c215e9;hp=81b6b57fd41a1c17428d4bdb6ab11a877b3268b0;hpb=43e92a55dd6874d78abc5c32a74bd987753e26db;p=lilypond.git

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 81b6b57fd4..cbacdaa0c7 100644
--- 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 $< $@
 
@@ -21,26 +11,14 @@ $(outdir)/%.ly.txt: %.abc
 	ln -f $< $@
 
 $(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 -o $@.pdfps  -Ppdf $<
-	ps2pdf $@.pdfps $@
+	$(PYTHON) $(ABC2LY) --strict -o $@ $<
 
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+# hmm. notdir builds src-dir builds?
+$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
+	cd $(outdir); $(LILYPOND_BINARY) --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 $< $@