X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=mf%2FGNUmakefile;h=3d4bcbd243016f5cc4e9dfb55c377b1ce7a67514;hb=96505f9df73dbec6d19ceb78dbd8d3bb141137fe;hp=4df0a88138901e7c414acb10c4d10abc91714ac6;hpb=ae7aed00f38a400d24c498a8779c9aa0c6ba6b0e;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 4df0a88138..3d4bcbd243 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,11 +6,11 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex
+EXTRA_DIST_FILES += README feta.tex cmr.enc.in
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
-	$(wildcard feta-braces*[0-9].mf)\
+	$(wildcard feta-braces-[a-z].mf)\
 	$(wildcard feta-din*[0-9].mf)\
 	$(wildcard feta-nummer*[0-9].mf)\
 	$(wildcard parmesan[0-9]*.mf)
@@ -23,14 +23,15 @@ LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
 AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm) \
 	$(AF_FILES:%.af=$(outdir)/%.afm)
-ENC_FILES = $(TEXTABLES:.tex=.enc)
-TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
+ENC_FILES = $(TEXTABLES:.tex=.enc) $(outdir)/cmr.enc
+TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) $(addprefix $(outdir)/,$(addsuffix .tfm,$(SAUTER_FONTS)))
 FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 
 
 ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
-
+bla:
+	echo $(TFM_FILES) 
 
 # only for fonts which
 #
@@ -38,8 +39,12 @@ MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
 #
 # 2. are not included with teTeX
 #
-SAUTER_FONTS = cmbxti8 ecbm14 ecrm12
 
+
+## use separate package sauter-fonts-mftraced.
+SAUTER_FONTS = ecb10
+
+#cmbxti8 ecbm14 ecrm12
 MORE_SAUTER_FONTS = cmbx14 cmbx17 \
 	 cmbxti12 cmbxti14 \
 	 cmbxti6 cmbxti7 cmbxti8 \
@@ -60,7 +65,7 @@ ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7
 
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
@@ -80,6 +85,9 @@ INSTALLATION_OUT_FILES5=$(PFA_FILES) $(outdir)/fonts.scale $(outdir)/Fontmap $(o
 INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/dvips/
 INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map
 
+INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/
+INSTALLATION_OUT_FILES7=$(ENC_FILES)
+
 export MFINPUTS:=.:$(MFINPUTS)
 
 default: pfa_warning $(ALL_GEN_FILES)
@@ -199,3 +207,5 @@ $(SAUTER_FONTS:%=$(outdir)/%.bla):
 $(outdir)/%.pfa: $(outdir)/%.bla
 	$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
 
+$(outdir)/%.enc.in: %.enc
+	cp $< $@