X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=e1dd993fff37ac5e78232da417645c413f6fcf8e;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=059d9904466311c1238023d13784f8324ed4665b;hpb=2a44a81f1706340c09ac9f28f0c66796417c3f9f;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 059d990446..e1dd993fff 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -5,29 +5,33 @@ LOCALSTEPMAKE_TEMPLATES=lilypond include $(depth)/make/stepmake.make -AF_FILES = $(wildcard *.af) +AF_FILES = $(call src-wildcard,*.af) + +# hangs on feta23 +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 +PFA_PREFIX = PFA -OTF_FILES = $(addsuffix .otf, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES)))\ +OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\ $(outdir)/aybabtu.otf -PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES))) \ - $(addsuffix .dep, $(addprefix $(outdir)/emmentaler-, $(STAFF_SIZES))) -OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))) \ +PFA_OTF_FILES = $(STAFF_SIZES:%=$(outdir)/$(PFA_PREFIX)emmentaler-%.pfa)\ + $(outdir)/$(PFA_PREFIX)aybabtu.pfa +PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\ + $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep) +OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\ $(BRACES:%=$(outdir)/feta-braces-%.otf-table) FETA_FONTS = $(FETA_MF_FILES:.mf=) SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg) -CFF_FILES = $(OTF_FILES:%.otf=%.cff) -CFF_PS_FILES = $(OTF_FILES:%.otf=%.cff.ps) $(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table) @@ -39,12 +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 -TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) $(addprefix $(outdir)/,$(addsuffix .tfm,$(SAUTER_FONTS))) +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 $( $@ -$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe +$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe + +$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa) $(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_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) $(outdir)/lilypond.map $(OTF_FILES) $(SVG_FILES) $(CFF_PS_FILES) $(CFF_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 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES) -INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7 8 9 +INSTALLATION_OUT_SUFFIXES=1 2 3 5 7 8 9 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) @@ -98,18 +156,9 @@ INSTALLATION_OUT_FILES2=$(OTF_FILES) INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) -INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/ps -INSTALLATION_OUT_FILES4=$(CFF_PS_FILES) - INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1 INSTALLATION_OUT_FILES5=$(PFA_FILES) -INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/fonts/map -INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map - -INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/fonts/cff/ -INSTALLATION_OUT_FILES7=$(CFF_FILES) - INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/ INSTALLATION_OUT_FILES7=$(ENC_FILES) @@ -119,20 +168,26 @@ INSTALLATION_OUT_FILES9=$(SVG_FILES) export MFINPUTS:=.:$(MFINPUTS) -default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf +.PHONY: tree-regen +# FIXME: temporary hack: must regenerate after building fonts +tree-regen: + 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 pfa_warning: 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 @@ -144,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 ## @@ -172,21 +228,6 @@ $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.tex $(outdi fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily) -$(outdir)/lilypond.map: $(AFM_FILES) - for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@ - for i in $(STAFF_SIZES); \ - do echo "Emmentaler-$$i Emmentaler-$$i > $@ - echo "Aybabtu Aybabtu > $@ - -$(outdir)/Fontmap.lily: - for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@ - for i in $(STAFF_SIZES); \ - do echo "/Emmentaler-$$i (emmentaler-$$i.cff.ps);" ; done \ - >> $@ - echo "/Aybabtu (aybabtu.cff.ps);" >> $@ - - local-clean: rm -f mfplain.mem mfplain.log rm -f *.tfm *.log @@ -202,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