(LINK_GXX_STATICALLY): --enable-ncsb-path option.

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index e70ed800938299edf853b3455974ce0d42601bdd..13ebabb5a49acd7910da8bd2ea5d01fc97f2efd9 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -34,9 +34,8 @@ FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
 
 
-NCSB_FILES=c059013l c059016l c059033l c059036l
-NCSB_TTFS=$(addprefix $(outdir)/,$(addsuffix .ttf, $(NCSB_FILES)))
-NCSB_PATH=/usr/share/fonts/default/Type1
+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
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
@@ -137,7 +136,7 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
 $(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES)
        cd $(outdir) ; fc-cache .
 
-local-install: install-ncsb-ttf install-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
@@ -177,14 +176,16 @@ INSTALLATION_OUT_FILES9=$(SVG_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
+
+
+default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
+
 .PHONY: tree-regen
 
 # FIXME: temporary hack: must regenerate after building fonts
 tree-regen:
        ${MAKE} -C $(top-build-dir) link-mf-tree
 
-default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
-
 pfa_warning:
 ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
        @echo ""
@@ -254,8 +255,7 @@ local-uninstall:
        -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
 
 
-$(outdir)/%.ttf: $(NCSB_PATH)/%.pfb
-       $(foreach i,$(NCSB_FILES), \
+$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_PATH)/,$(NCSB_SOURCE_FILES)))
+       $(foreach i,$(NCSB_SOURCE_FILES), \
                $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
-                       $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm \
-                       $(outdir)/$(i).ttf && ) true
+                       $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm $(outdir)/ && ) true