Fix 884.

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 6cc194a5aeb2db1b8aee6a235d6d506669264ad6..31b1f99e8c9fb7276579b0f8a1803322ca7ae249 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -16,6 +16,7 @@ EXTRA_DIST_FILES += README mf2pt1.mp
 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,feta-notehead*[0-9].mf) \
                $(call src-wildcard,parmesan[0-9]*.mf)
 
 STAFF_SIZES = 11 13 14 16 18 20 23 26
@@ -29,7 +30,7 @@ OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg)
 
-FC_FIND = $(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' \
+FC_FIND = $(shell $(FCLIST) --verbose 'Century Schoolbook L:style=$(1)' \
                  | grep 'file:' \
                  | sed 's/.*"\([^"]*\)".*/\1/g')
 
@@ -61,6 +62,7 @@ $(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gt
 $(outdir)/emmentaler-%.otf \
 $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe \
                            $(outdir)/feta%.pfb \
+                           $(outdir)/feta-noteheads%.pfb \
                            $(outdir)/feta-alphabet%.pfb \
                            $(outdir)/parmesan%.pfb \
                            $(outdir)/feta%.otf-table \
@@ -77,40 +79,49 @@ $(outdir)/%.pfb: $(outdir)/%.log
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
        cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
+              $(if $(findstring brace,$<),,$(subst feta,feta-noteheads,$<)) \
               $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
 
 
 ## ugh -- we want this to prevent failing -j2 compiles.
 $(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \
+                           $(outdir)/feta-noteheads26.lisp \
                            $(outdir)/parmesan26.lisp \
                            $(outdir)/feta-alphabet26.lisp
 $(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \
+                           $(outdir)/feta-noteheads23.lisp \
                            $(outdir)/parmesan23.lisp \
                            $(outdir)/feta-alphabet23.lisp
 $(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \
+                           $(outdir)/feta-noteheads23.lisp \
                            $(outdir)/parmesan20.lisp \
                            $(outdir)/feta-alphabet20.lisp
 $(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \
+                           $(outdir)/feta-noteheads18.lisp \
                            $(outdir)/parmesan18.lisp \
                            $(outdir)/feta-alphabet18.lisp
 $(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \
+                           $(outdir)/feta-noteheads16.lisp \
                            $(outdir)/parmesan16.lisp \
                            $(outdir)/feta-alphabet16.lisp
 $(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \
+                           $(outdir)/feta-noteheads14.lisp \
                            $(outdir)/parmesan14.lisp \
                            $(outdir)/feta-alphabet14.lisp
 $(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \
+                           $(outdir)/feta-noteheads13.lisp \
                            $(outdir)/parmesan13.lisp \
                            $(outdir)/feta-alphabet13.lisp
 $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \
+                           $(outdir)/feta-noteheads11.lisp \
                            $(outdir)/parmesan11.lisp \
                            $(outdir)/feta-alphabet11.lisp
 
 $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \
-                      $(outdir)/emmentaler-brace.fontname \
-                      $(outdir)/emmentaler-brace.otf-table \
-                      $(outdir)/emmentaler-brace.otf-gtable \
-                      $(outdir)/emmentaler-brace.pe
+                               $(outdir)/emmentaler-brace.fontname \
+                               $(outdir)/emmentaler-brace.otf-table \
+                               $(outdir)/emmentaler-brace.otf-gtable \
+                               $(outdir)/emmentaler-brace.pe
 
 $(outdir)/emmentaler-brace.otf \
 $(outdir)/emmentaler-brace.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
@@ -126,6 +137,9 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
 ALL_FONTS = $(FETA_FONTS)
 PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
+.PRECIOUS: $(PFB_FILES)
+
+
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
 ALL_GEN_FILES = $(LOG_FILES) \
@@ -133,7 +147,6 @@ ALL_GEN_FILES = $(LOG_FILES) \
                $(LISP_FILES) \
                $(OTF_TABLES) \
                $(NCSB_OTFS) \
-               $(PFB_FILES) \
                $(OTF_FILES) \
                $(SVG_FILES)
 
@@ -151,13 +164,10 @@ INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
 INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES2 = $(SVG_FILES)
 
-INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts/type1
-INSTALLATION_OUT_FILES3 = $(PFB_FILES)
-
 export MFINPUTS := .:$(MFINPUTS)
 
 
-default: $(ALL_GEN_FILES) \
+default: $(PFB_FILES) $(ALL_GEN_FILES) \
         $(outdir)/emmentaler-20.otf \
         tree-regen \
         $(outdir)/fonts.conf