* mf/merge.pe.in: Set font names, version, license GPL.

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index ec6b43f8e17c96272ef75866865d0314e7930cb8..12962a42c912ba3d5894198371220b9efe6b368a 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,7 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex 
+EXTRA_DIST_FILES += README feta.tex
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
@@ -30,8 +30,6 @@ 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
 #
@@ -45,9 +43,14 @@ foe:
        echo $(TEXMF)
        kpsewhich exbase.mf
 
+$(outdir)/feta20.otf-table:
+       cat $(outdir)/feta20.lisp $(outdir)/parmesan20.lisp > $@
+
+$(outdir)/bigcheese20.otf: $(outdir)/merge.pe $(outdir)/feta20.otf-table
+       (cd $(outdir) && fontforge -script merge.pe)
 
 ## use separate package sauter-fonts-mftraced.
-SAUTER_FONTS = ecb10
+SAUTER_FONTS = 
 
 #cmbxti8 ecbm14 ecrm12
 MORE_SAUTER_FONTS = cmbx14 cmbx17 \
@@ -125,18 +128,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 
@@ -146,7 +147,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)