patch::: 1.3.81.jcn2

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index a6804652c5376d74a09e8655fb34cc6dec0331bd..027f47c8830a0097c7fab174447b69744221081b 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -2,25 +2,35 @@
 
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost install install-out
+STEPMAKE_TEMPLATES=metafont metapost asciifont install install-out
+include $(depth)/make/stepmake.make 
+
+AF_FILES = $(wildcard *.af) 
+
+EXTRA_DIST_FILES += README feta.tex
 
-EXTRA_DIST_FILES += README
+# don't try to make fonts from test files
+TEST_FILES = $(wildcard *test*.mf)
+FET_FILES = $(filter-out $(TEST_FILES),$(wildcard feta[0-9]*.mf))
+FONT_FILES = $(filter-out $(TEST_FILES),$(wildcard feta*[0-9].mf))
 
-FET_FILES = $(wildcard feta[0-9]*.mf)
+XPM_FONTS = feta20 feta-nummer10 feta-braces20
 
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
 TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-XPM_FONTS = feta20
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) 
-TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) 
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(AF_FILES:.af=.afm))
+TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
+PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) 
 
-ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
+# Make tfm files first, log files last, 
+# so that normally log files aren't made twice
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(PFA_FILES) $(LOG_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(datadir)/mf/
-INSTALLATION_FILES=$(MF_FILES)
+INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3
+INSTALLATION_OUT_SUFFIXES=1 2 3 4
 
 INSTALLATION_OUT_DIR1=$(datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
@@ -31,8 +41,12 @@ INSTALLATION_OUT_FILES2=$(AFM_FILES)
 INSTALLATION_OUT_DIR3=$(datadir)/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
+# comment these out if you don't want pfa's to be generated
+# or you don't have metapost.
+INSTALLATION_OUT_DIR4=$(datadir)/pfa
+INSTALLATION_OUT_FILES4=$(PFA_FILES)
+
 export MFINPUTS:=.:$(MFINPUTS)
-include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)
 
@@ -41,3 +55,5 @@ $(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
 
 localclean:
        rm -f mfplain.mem mfplain.log mpout.log
+       rm -f *.tfm *.log
+