*** empty log message ***

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index d0fa506b31a5d0941eeec7fb5906f024908ed551..9b01b6553cdd68d7a6c70021b51c5e2886758ddc 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,8 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex
+EXTRA_DIST_FILES += README feta.tex  merge.pe
+
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
@@ -23,14 +24,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 +40,17 @@ MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
 #
 # 2. are not included with teTeX
 #
-SAUTER_FONTS = cmbxti8 ecbm14 ecrm12
 
+foe:
+       echo $(MFINPUTS)
+       echo $(TEXMF)
+       kpsewhich exbase.mf
+
+
+## use separate package sauter-fonts-mftraced.
+SAUTER_FONTS = 
+
+#cmbxti8 ecbm14 ecrm12
 MORE_SAUTER_FONTS = cmbx14 cmbx17 \
         cmbxti12 cmbxti14 \
         cmbxti6 cmbxti7 cmbxti8 \
@@ -115,18 +126,16 @@ get-deb-pfa: $(outdir)/$(debian-package)
        rm -rf $(outdir)/./usr
        ar p $< data.tar.gz | \
                tar -C $(outdir) -zvxf - '*.pfa'
-       touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
        cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
 
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-1/$(redhat-package)
+       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-3/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
        cd $(outdir) ; rm -rf usr/ # (root alert!) 
        cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
-       touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
        cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
 
 # change this dependency 
@@ -136,7 +145,7 @@ get-pfa: get-rpm-pfa
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-       $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)
 
@@ -202,3 +211,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 $< $@