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

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 4ecf99019047c6d5517c6c41df71b280250a2407..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)
@@ -148,7 +147,7 @@ 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) $(outdir)/fonts.cache-1
+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
@@ -159,9 +158,8 @@ INSTALLATION_OUT_SUFFIXES=1 2 3 5 7 8 9
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
 
-# must not be installed with .cff, pango/fontconfig does not like .cff fonts 
 INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
-INSTALLATION_OUT_FILES2=$(OTF_FILES)
+INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS)
 
 INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
@@ -178,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 ""
@@ -255,12 +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
-
-install-ncsb-ttf: $(NCSB_TTFS)
-       $(INSTALL) -d $(DESTDIR)$(NCSB_INSTALL_DIR)
-       $(INSTALL) $(NCSB_TTFS) $(DESTDIR)$(NCSB_INSTALL_DIR)
+                       $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm $(outdir)/ && ) true