junk XPM support from Metafont.

[lilypond.git] / stepmake / stepmake / metafont-rules.make

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 585da6669f63955e0a5fc76455800e87e7e11f6a..263a7f8b36903f8e9c8ee92a1917ac90d589b9c1 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -3,35 +3,21 @@
 
 # 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 $<;"
+       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 $< $@
+       rm -f $(basename $(@F)).*gf
 
 
 MFTRACE_FORMATS = pfa pfb svg
 $(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-       $(MFTRACE) $(MFTRACE_FLAGS) --simplify -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
+       MFINPUTS=$(src-dir) $(MFTRACE) $(MFTRACE_FLAGS) -I $(src-dir) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
 #      -mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
        -mv $(basename $(@F)).pfa $(outdir)
        -mv $(basename $(@F)).pfb $(outdir)