release: 1.5.21

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 220f84ef341f3bc7ad3f59c02e10a7d59e9e0db9..9b2ae77de20f143f242253fc1c3b85f0d75095b3 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,8 +1,9 @@
-# mf/Makefile
-
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost asciifont install install-out
+STEPMAKE_TEMPLATES=metafont metapost install install-out
+LOCALSTEPMAKE_TEMPLATES=asciifont
+
+
 include $(depth)/make/stepmake.make 
 
 AF_FILES = $(wildcard *.af) 
@@ -18,14 +19,17 @@ XPM_FONTS = feta20 feta-nummer10 feta-braces20
 #CM_AFM_FILES = cmr10
 
 $(outdir)/cmr10.afm:
-       -$(BASH) $(buildscripts)/tfmtoafm.sh `kpsewhich cmr10.tfm`
+       -$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
        -mv $(@F) $@
 
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES)))
 TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
-PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) 
+PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+PFB_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfb))
+
+pfb: $(PFB_FILES) 
 
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
@@ -53,12 +57,15 @@ INSTALLATION_OUT_FILES4=$(PFA_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
-default: $(ALL_GEN_FILES)
+default: $(PFA_FILES) $(ALL_GEN_FILES)
 
-$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-       $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+##
+## todo: this also depends on .tfm, FIXME.
+$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
-localclean:
+local-clean:
        rm -f mfplain.mem mfplain.log mpout.log
        rm -f *.tfm *.log
 
+