X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=71cd6f1bda8d7b47c13e7ca36f61d23f3c2b4aa7;hb=5fef810883521d169090b76a91bb16c811d29865;hp=d1bbc418d56fa56790e9aca225bd2f56b6e27d3d;hpb=1a3aa203657d4b02298980ddf712c43db486deb0;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index d1bbc418d5..71cd6f1bda 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,42 +1,27 @@
-
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
 # we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-	-$(METAFONT) "\scrollmode; input $<;"
-	gftodvi  $(basename $<)
+	-MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
+	gftodvi $(basename $<)
 	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
-# This is not metafont, this is feta-specific
-$(outdir)/%.log: %.mf
-	$(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
-	mv $(@F) $@
-	rm $(basename $(@F)).*gf
-
-$(outdir)/%.tfm $(outdir)%.log: %.mf
-	$(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
+$(outdir)/%.tfm $(outdir)/%.log: %.mf
+	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
 # Let's keep this log output, it saves another mf run.
 	mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
-	rm $(basename $(@F)).*gf 
-
-$(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
-	$(METAFONT) "\\mode=$(XPM_MODE); \\input $<"
-# Let's keep this log output, it saves another mf run.
-	mv $(@F) $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
-
-$(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
-	gftopk $< $@
-
-
-MFTRACE_FORMATS = pfa pfb svg
-$(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-	$(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
-#	-mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
-	-mv $(basename $(@F)).pfa $(outdir)
-	-mv $(basename $(@F)).pfb $(outdir)
-	-mv $(basename $(@F)).svg $(outdir)
-
-#%.afm:
-#	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
-#	mv $@ $@.in
+	rm -f $(basename $(@F)).*gf  $(basename $(@F)).*pk
+
+# ugh . mf2pt1 is extremely broken, it pollutes CWD iso. creating a
+# temp dir.
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
+	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` ; \
+		( cd $$TMP ; \
+		ln -s ../mf2pt1.mem . ; \
+		MFINPUTS=../..:../:: $(PERL) ../../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $< ) ; \
+		mv $$TMP/*pfb $(outdir) ; \
+		rm -rf $$TMP
+
+$(outdir)/mf2pt1.mem:
+	cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump