X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Fmutopia-rules.make;h=934b9464e09d1083853a44e725ca40681504f2ef;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=f2328cb16a427856c305864c689f721a2d60a576;hpb=397619f8d14da1248ddc4a40231ae9360df40486;p=lilypond.git

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index f2328cb16a..934b9464e0 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,38 +1,24 @@
 
 
-$(outdir)/%.gif: $(outdir)/%.ps
-	sh $(PS_TO_GIFS) $<
-	-mv $(name-stem)-page*.gif $(outdir)/
-#	touch $@
-	ln -s $(outdir)/$(name-stem)-page1.gif $@
-
-$(outdir)/%.png: $(outdir)/%.ps
-	sh $(PS_TO_PNGS) $<
-	-mv $(name-stem)-page*.png $(outdir)/
-#	touch $@
-	ln -s $(outdir)/$(name-stem)-page1.png $@
-
 $(outdir)/%.ly.txt: %.ly
 	ln -f $< $@
 
+$(outdir)/%.ly.txt: $(outdir)/%.ly
+	cp -f $< $@
+
 $(outdir)/%.ly.txt: %.abc
 #which file to show here -- abc seems more cute?
 	ln -f $< $@
 
 $(outdir)/%.ly: %.abc
-	$(PYTHON) $(ABC2LY) -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
+	$(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-$(outdir)/%.dvi: %.ly
-	$(PYTHON) $(LY2DVI) --output=$@ --dependencies $< 
+# hmm. notdir builds src-dir 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 $< $@