From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 30 Dec 2006 19:41:05 +0000 (+0100)
Subject: mf: don't require .tfm for mf-to-table.py
X-Git-Tag: release/2.11.6-1~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ee91f25b34bdc615de31fe5429403c3f8649533;p=lilypond.git

mf: don't require .tfm for mf-to-table.py
---

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b61592d708..d90e4bd568 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,6 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-# hangs on feta23
 MFTRACE_FLAGS=  --simplify
 
 EXTRA_DIST_FILES += README 
@@ -135,7 +134,7 @@ tree-regen:
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
+$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
 	$(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) $<
 
 local-clean:
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 99091b02df..6ed6a2f7cb 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,4 +1,3 @@
-
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
 # we want to see botched results as well.
@@ -22,7 +21,3 @@ $(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
 	-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