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

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 2c82d19e3a..fd35071131 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,41 +1,24 @@
 
 
-$(outdir)/%.gif: $(outdir)/%.ps
-	sh $(buildscript-dir)/ps-to-gifs.sh $<
-	-mv $(name-stem)-page*.gif $(outdir)/
-	touch $@
-
-$(outdir)/%.png: $(outdir)/%.ps
-	sh $(buildscript-dir)/ps-to-pngs.sh $<
-	-mv $(name-stem)-page*.png $(outdir)/
-	touch $@
-
 $(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) $(script-dir)/abc2ly.py -o $@ $< 
-
-$(outdir)/%.dvi: $(outdir)/%.ly
-	$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $< 
-	-mv $(basename $(<F))*.midi $(outdir)
+	$(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-# don't junk intermediate .dvi files.  They're easier to view than
-# .ps or .gif
-.PRECIOUS: $(outdir)/%.dvi
+# 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)/%.dvi: %.ly
-	$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
-	-mv $(basename $<)*.midi $(outdir)
+$(outdir)/%.ly: %.ly
+	cp $< $@ 
 
-$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
-	$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)-$(PAPERSIZE) -p $(PAPERSIZE) $< 
-	-mv $(basename $<)*.midi $(outdir)-$(PAPERSIZE)
 
-$(outdir)/%.dvi: %.fly
-	$(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
-	-mv $(basename $<)*.midi $(outdir)