Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 0172275c6d6df65cec66a3785ff09c6d35ce1c97..141ba631979ed55edca904e384cb2b24d8c078c5 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -45,19 +45,18 @@ LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 
-$(outdir)/emmentaler-brace.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
-       cat $^ > $@
-
 $(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
        echo '(design_size . 20)' > $@
 
-$(outdir)/%.otf-table: $(outdir)/%.lisp
-       cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
-              $(if $(findstring brace,$<),,$(subst feta,parmesan-noteheads,$<)) \
-              $(if $(findstring brace,$<),,$(subst feta,feta-noteheads,$<)) \
-              $(if $(findstring brace,$<),,$(subst feta,feta-flags,$<)) \
-              $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
+$(outdir)/feta%.otf-table: $(outdir)/feta%.lisp $(outdir)/parmesan%.lisp \
+       $(outdir)/parmesan-noteheads%.lisp \
+       $(outdir)/feta-noteheads%.lisp \
+       $(outdir)/feta-flags%.lisp \
+       $(outdir)/feta-alphabet%.lisp
+       cat $^ > $@
 
+$(outdir)/emmentaler-brace.otf-table: $(foreach x, a b c d e f g h i,$(outdir)/feta-braces-$(x).lisp)
+       cat $^ > $@
 
 $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \
                                $(outdir)/emmentaler-brace.fontname \
@@ -73,13 +72,7 @@ $(outdir)/emmentaler-brace.subfonts:
 $(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts
        $< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@))
 
-# Generate emmentaler-*.pe scripts first, and *.otf, *.svg, *.woff files last,
-# so that normally these files aren't regenerated on a subsequent call to make.
-ALL_GEN_FILES = $(PE_SCRIPTS) \
-               $(LOG_FILES) \
-               $(ENC_FILES) \
-               $(LISP_FILES) \
-               $(OTF_TABLES) \
+ALL_GEN_FILES = $(ENC_FILES) \
                $(NCSB_OTFS) \
                $(OTF_FILES) \
                $(SVG_FILES) \
@@ -151,14 +144,11 @@ $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.pe\
 $(outdir)/emmentaler-brace.svg $(outdir)/emmentaler-brace.woff: $(outdir)/emmentaler-brace.otf
        $(UPDATE_TARGET)
 
-default: $(ALL_GEN_FILES) \
-        $(outdir)/emmentaler-20.otf \
-        tree-regen \
+default: tree-regen \
         $(outdir)/fonts.conf
 
 .PHONY: tree-regen
 
-# FIXME: temporary hack: must regenerate after building fonts
 tree-regen: $(ALL_GEN_FILES)
        ${MAKE} -C $(top-build-dir) link-mf-tree