* flower/test-std.cc: Add simple unit test for vector migration.

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index a56e3c4710bdbdffba9afc5211e2d5646bac3202..ae1bce56016109946a7a9f7f4a73f946497542ea 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)
@@ -151,10 +150,11 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES)
 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)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 5 7 8 9
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 
 
 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
@@ -165,26 +165,28 @@ INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS)
 INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
+INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
+INSTALLATION_OUT_FILES4=$(SVG_FILES)
+
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES5=$(PFA_FILES)
 
-INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/
-INSTALLATION_OUT_FILES7=$(ENC_FILES)
-
-INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/fonts/svg
-INSTALLATION_OUT_FILES9=$(SVG_FILES)
+INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/ps/
+INSTALLATION_OUT_FILES6=$(ENC_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 ""
@@ -232,7 +234,7 @@ get-pfa: get-rpm-fonts
 ##
 ## todo: this also depends on .tfm, FIXME.
 $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-       $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)
 
@@ -244,18 +246,8 @@ local-clean:
 $(outdir)/%.enc.in: %.enc
        cp $< $@
 
-# teTeX-2.0.x compatibility.
-local-install:
-       -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/dvips
-       (cd $(DESTDIR)$(local_lilypond_datadir)/dvips && ln -sf ../fonts/map .)
-
-local-uninstall:
-       -rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/map
-       -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
-
 
-$(outdir)/%.ttf: $(NCSB_PATH)/%.pfb
-       $(foreach i,$(NCSB_FILES), \
+$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(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_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true