* stepmake/stepmake/*:

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 8710f18b42e689e2bd0bab3c8fcb8af3eb6acba9..e1dd993fff37ac5e78232da417645c413f6fcf8e 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -5,7 +5,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 
 include $(depth)/make/stepmake.make 
 
-AF_FILES = $(wildcard *.af)
+AF_FILES = $(call src-wildcard,*.af)
 
 # hangs on feta23
 MFTRACE_FLAGS=  # --simplify
@@ -13,10 +13,10 @@ MFTRACE_FLAGS=  # --simplify
 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)\
-       $(wildcard feta-braces-[a-z].mf)\
-       $(wildcard feta-alphabet*[0-9].mf)\
-       $(wildcard parmesan[0-9]*.mf)
+FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\
+       $(call src-wildcard,feta-braces-[a-z].mf)\
+       $(call src-wildcard,feta-alphabet*[0-9].mf)\
+       $(call src-wildcard,parmesan[0-9]*.mf)
 
 STAFF_SIZES = 11 13 14 16 18 20 23 26
 BRACES = a b c d e f g h i
@@ -43,13 +43,13 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
-ENC_FILES = $(TEXTABLES:.tex=.enc) $(outdir)/cmr.enc
+ENC_FILES = $(TEXTABLES:.tex=.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)\
  $(SAUTER_FONTS:%=$(outdir)/%.tfm)
 FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 
 
-ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
+ENCODING_FILE=$(findstring $(<F:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) --no-afm
 
 # only for fonts which
@@ -62,7 +62,7 @@ MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) --no-afm
 $(outdir)/$(PFA_PREFIX)%.pfa $(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe
        (cd $(outdir) && $(FONTFORGE) -script $(notdir $<))
        $(PYTHON) $(buildscript-dir)/substitute-encoding.py --outdir=$(outdir) $@
-       -rm $(outdir)/*.scale.pfa
+       -rm -f $(outdir)/*.scale.pfa
 
 # ugh, this does not work
 $(outdir)/%.pfa: $(outdir)/%.log
@@ -120,18 +120,25 @@ $(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.svg:
 $(outdir)/aybabtu.fontname:
        echo -n 'aybabtu' > $@ 
 $(outdir)/aybabtu.subfonts: 
-       echo $(subst .mf,,$(wildcard feta-braces-[a-z].mf)) > $@
+       echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
 $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
        $(PYTHON) $< --dir=$(outdir)
 
+$(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES)
+       cd $(outdir) ; fc-cache .
+
+local-install: install-fc-cache
+
+install-fc-cache:
+       fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES)
 
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES)
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
@@ -164,8 +171,8 @@ export MFINPUTS:=.:$(MFINPUTS)
 .PHONY: tree-regen
 # FIXME: temporary hack: must regenerate after building fonts
 tree-regen:
-       rm -rf $(builddir)/share
-       ${MAKE} -C $(builddir) link-tree
+       rm -rf $(top-build-dir)/share
+       ${MAKE} -C $(top-build-dir) link-tree
 
 default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 
@@ -174,13 +181,13 @@ ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
        @echo ""
        @echo "ERROR: mftrace not found"
        @echo ""
-       @echo "For obtaining PFA fonts, either install mftrace "
+       @echo "For obtaining PFA/SVG fonts, either install mftrace "
        @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"
        @echo "or try one of the following commands in this directory: "
        @echo ""
-       @echo " make get-pfa "
-       @echo " make get-rpm-pfa "
-       @echo " make get-deb-pfa "
+       @echo " make get-fonts "
+       @echo " make get-rpm-fonts "
+       @echo " make get-deb-fonts "
        @echo ""
        @echo "These commands will try to download the files from internet."
        @false
@@ -192,24 +199,25 @@ debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
 $(outdir)/$(debian-package):
        wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
 
-get-deb-pfa: $(outdir)/$(debian-package)
+get-deb-fonts: $(outdir)/$(debian-package)
        rm -rf $(outdir)/./usr
        ar p $< data.tar.gz | \
-               tar -C $(outdir) -zvxf - '*.pfa'
-       cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
+               tar -C $(outdir) -zvxf - '*.pfa' '*.svg'
+       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
 
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-3/$(redhat-package)
+       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package)
 
-get-rpm-pfa: $(outdir)/$(redhat-package)
+get-rpm-fonts: $(outdir)/$(redhat-package)
        cd $(outdir) ; rm -rf usr/ # (root alert!) 
-       cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
-       cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
+       cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg'
+       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
 
 # change this dependency 
-get-pfa: get-rpm-pfa
+get-fonts: get-rpm-fonts
+get-pfa: get-rpm-fonts
 
 
 ##
@@ -235,3 +243,6 @@ local-install:
 local-uninstall:
        -rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/map
        -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
+
+foe:
+       @echo mf:$(FETA_MF_FILES)
\ No newline at end of file