X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=eb37ee3093e8f2747d5c7f03fae9b3799bcc5fb6;hb=5a462e8c890f6ea8c7e027fa899f583c34b76d61;hp=b19b3400d150d039db71b59c1729703c66b30c15;hpb=e140e56934a8ac70b854aed01783287a55074f2e;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index b19b3400d1..eb37ee3093 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -1,50 +1,48 @@ +# mf/GNUmakefile + depth = .. -STEPMAKE_TEMPLATES=metafont install install-out -LOCALSTEPMAKE_TEMPLATES=lilypond +STEPMAKE_TEMPLATES = metafont \ + install \ + install-out +LOCALSTEPMAKE_TEMPLATES = lilypond include $(depth)/make/stepmake.make -AF_FILES = $(call src-wildcard,*.af) - -# hangs on feta23 -MFTRACE_FLAGS= --simplify -EXTRA_DIST_FILES += README feta.tex +EXTRA_DIST_FILES += README mf2pt1.mp # We don't use $(MF_FILES), because there's more .mf cruft here -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) +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 -OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\ - $(outdir)/aybabtu.otf -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) +OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \ + $(outdir)/aybabtu.otf +PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe) +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) +SVG_FILES = $(OTF_FILES:%.otf=%.svg) +FC_FIND = $(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' \ + | grep 'file:' \ + | sed 's/.*"\([^"]*\)".*/\1/g') -NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l -NCSB_TTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf) -NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf +NCSB_OTFS = $(addprefix $(outdir)/,CenturySchL-Ital.otf \ + CenturySchL-BoldItal.otf \ + CenturySchL-Roma.otf \ + CenturySchL-Bold.otf) +NCSB_INSTALL_DIR = $(local_lilypond_datadir)/fonts/otf 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) -TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)\ - $(SAUTER_FONTS:%=$(outdir)/%.tfm) - - -ENCODING_FILE=$(findstring $( $@ @@ -60,76 +58,109 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) # 2. are not included with teTeX # - -$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa +$(outdir)/emmentaler-%.otf \ +$(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe \ + $(outdir)/feta%.pfb \ + $(outdir)/feta-alphabet%.pfb \ + $(outdir)/parmesan%.pfb \ + $(outdir)/feta%.otf-table \ + $(outdir)/feta%.otf-gtable cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe) -$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) +$(outdir)/aybabtu.otf \ +$(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe \ + $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \ + $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable cd $(outdir) && $(FONTFORGE) -script aybabtu.pe - -rm -f $(outdir)/*.scale.{pfa,afm} -$(outdir)/%.pfa: $(outdir)/%.log - -$(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) - cat $< \ - $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \ - $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@ - -$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe - -$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa) +$(outdir)/%.pfb: $(outdir)/%.log + +$(outdir)/%.otf-table: $(outdir)/%.lisp + cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \ + $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@ + + +## ugh -- we want this to prevent failing -j2 compiles. +$(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \ + $(outdir)/parmesan26.lisp \ + $(outdir)/feta-alphabet26.lisp +$(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \ + $(outdir)/parmesan23.lisp \ + $(outdir)/feta-alphabet23.lisp +$(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \ + $(outdir)/parmesan20.lisp \ + $(outdir)/feta-alphabet20.lisp +$(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \ + $(outdir)/parmesan18.lisp \ + $(outdir)/feta-alphabet18.lisp +$(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \ + $(outdir)/parmesan16.lisp \ + $(outdir)/feta-alphabet16.lisp +$(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \ + $(outdir)/parmesan14.lisp \ + $(outdir)/feta-alphabet14.lisp +$(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \ + $(outdir)/parmesan13.lisp \ + $(outdir)/feta-alphabet13.lisp +$(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \ + $(outdir)/parmesan11.lisp \ + $(outdir)/feta-alphabet11.lisp + +$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts \ + $(outdir)/aybabtu.fontname \ + $(outdir)/aybabtu.otf-table \ + $(outdir)/aybabtu.otf-gtable \ + $(outdir)/aybabtu.pe + +$(outdir)/aybabtu.otf \ +$(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb) $(outdir)/aybabtu.fontname: echo -n 'aybabtu' > $@ $(outdir)/aybabtu.subfonts: echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@ -$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py +$(PE_SCRIPTS): $(top-build-dir)/buildscripts/$(outdir)/gen-emmentaler-scripts $(PYTHON) $< --dir=$(outdir) -$(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES) - cd $(outdir) ; fc-cache . - -local-install: install-fc-cache - -install-fc-cache: - $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), rm -f $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/fonts.cache-1 && ) true - fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))) - -ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) -PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) +ALL_FONTS = $(FETA_FONTS) +PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb) # 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) $(NCSB_TTFS) $(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) +ALL_GEN_FILES = $(LOG_FILES) \ + $(ENC_FILES) \ + $(LISP_FILES) \ + $(OTF_TABLES) \ + $(NCSB_OTFS) \ + $(PFB_FILES) \ + $(OTF_FILES) \ + $(SVG_FILES) -INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 +# PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" -INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex -INSTALLATION_OUT_FILES1=$(TEXTABLES) +INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source +INSTALLATION_FILES = $(MF_FILES) -INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf -INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS) +INSTALLATION_OUT_SUFFIXES = 1 2 3 -INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm -INSTALLATION_OUT_FILES3=$(TFM_FILES) +INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf +INSTALLATION_OUT_FILES1 = $(OTF_FILES) \ + $(NCSB_OTFS) -INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg -INSTALLATION_OUT_FILES4=$(SVG_FILES) +INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg +INSTALLATION_OUT_FILES2 = $(SVG_FILES) -INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1 -INSTALLATION_OUT_FILES5=$(PFA_FILES) +INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts/type1 +INSTALLATION_OUT_FILES3 = $(PFB_FILES) -export MFINPUTS:=.:$(MFINPUTS) +export MFINPUTS := .:$(MFINPUTS) - -default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen +default: $(ALL_GEN_FILES) \ + $(outdir)/emmentaler-20.otf \ + tree-regen \ + $(outdir)/fonts.conf .PHONY: tree-regen @@ -137,67 +168,31 @@ default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen tree-regen: ${MAKE} -C $(top-build-dir) link-mf-tree -pfa_warning: -ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace) - @echo "" - @echo "ERROR: mftrace not found" - @echo "" - @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-fonts " - @echo " make get-rpm-fonts " - @echo " make get-deb-fonts " - @echo "" - @echo "These commands will try to download the files from internet." - @false -endif - - -debian-mirror=http://ftp.us.debian.org -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-fonts: $(outdir)/$(debian-package) - rm -rf $(outdir)/./usr - ar p $< data.tar.gz | \ - 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-4/$(redhat-package) - -get-rpm-fonts: $(outdir)/$(redhat-package) - cd $(outdir) ; rm -rf usr/ # (root alert!) - cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg' - cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/ - -# change this dependency -get-fonts: get-rpm-fonts -get-pfa: get-rpm-fonts - - ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm - $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$('$(shell cd $(outdir); pwd)'' > $@ -$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) $(buildscript-dir)/pfx2ttf.fontforge - $(foreach i,$(NCSB_SOURCE_FILES), \ +$(NCSB_OTFS): $(NCSB_SOURCE_FILES) \ + $(buildscript-dir)/pfx2ttf.fontforge + $(foreach i, $(basename $(NCSB_SOURCE_FILES)), \ $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \ - $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true + $(i).pfb $(i).afm $(outdir)/ && ) true + +# eof