From badfc90080561b7bb21cf1eef9107dce3a31b924 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Sat, 30 Dec 2006 20:41:05 +0100 Subject: [PATCH] mf: don't require .tfm for mf-to-table.py --- mf/GNUmakefile | 3 +-- stepmake/stepmake/metafont-rules.make | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 1af2c64e2d..84cd5065d3 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 @@ -136,7 +135,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 -- 2.39.5