Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 0ff9f50e47002305ee2b31a804d56a9fa5f43490..898a4c245b132bce3aa155ee0260f6c3d837dc76 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -23,8 +23,7 @@ BRACES = a b c d e f g h i
 
 OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
            $(outdir)/aybabtu.otf
-PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe) \
-            $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep)
+PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)
 OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
             $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
@@ -82,30 +81,30 @@ $(outdir)/%.otf-table: $(outdir)/%.lisp
 
 
 ## ugh -- we want this to prevent failing -j2 compiles.
-# $(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \
-#                            $(outdir)/parmesan26.lisp \
-#                            $(outdir)/feta-alphabet26.lisp
-# $(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \
-#                            $(outdir)/parmesan23.lisp \
-#                            $(outdir)/feta-alphabet23.lisp
-# $(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \
-#                            $(outdir)/parmesan20.lisp \
-#                            $(outdir)/feta-alphabet20.lisp
-# $(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \
-#                            $(outdir)/parmesan18.lisp \
-#                            $(outdir)/feta-alphabet18.lisp
-# $(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \
-#                            $(outdir)/parmesan16.lisp \
-#                            $(outdir)/feta-alphabet16.lisp
-# $(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \
-#                            $(outdir)/parmesan14.lisp \
-#                            $(outdir)/feta-alphabet14.lisp
-# $(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \
-#                            $(outdir)/parmesan13.lisp \
-#                            $(outdir)/feta-alphabet13.lisp
-# $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \
-#                            $(outdir)/parmesan11.lisp \
-#                            $(outdir)/feta-alphabet11.lisp
+$(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \
+                           $(outdir)/parmesan26.lisp \
+                           $(outdir)/feta-alphabet26.lisp
+$(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \
+                           $(outdir)/parmesan23.lisp \
+                           $(outdir)/feta-alphabet23.lisp
+$(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \
+                           $(outdir)/parmesan20.lisp \
+                           $(outdir)/feta-alphabet20.lisp
+$(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \
+                           $(outdir)/parmesan18.lisp \
+                           $(outdir)/feta-alphabet18.lisp
+$(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \
+                           $(outdir)/parmesan16.lisp \
+                           $(outdir)/feta-alphabet16.lisp
+$(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \
+                           $(outdir)/parmesan14.lisp \
+                           $(outdir)/feta-alphabet14.lisp
+$(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \
+                           $(outdir)/parmesan13.lisp \
+                           $(outdir)/feta-alphabet13.lisp
+$(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \
+                           $(outdir)/parmesan11.lisp \
+                           $(outdir)/feta-alphabet11.lisp
 
 $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts \
                       $(outdir)/aybabtu.fontname \
@@ -121,7 +120,7 @@ $(outdir)/aybabtu.fontname:
 $(outdir)/aybabtu.subfonts:
        echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS): $(buildscript-dir)/out/gen-emmentaler-scripts
+$(PE_SCRIPTS): $(top-build-dir)/buildscripts/$(outdir)/gen-emmentaler-scripts
        $(PYTHON) $< --dir=$(outdir)
 
 ALL_FONTS = $(FETA_FONTS)
@@ -166,7 +165,7 @@ default: $(ALL_GEN_FILES) \
 .PHONY: tree-regen
 
 # FIXME: temporary hack: must regenerate after building fonts
-tree-regen:
+tree-regen: $(ALL_GEN_FILES)
        ${MAKE} -C $(top-build-dir) link-mf-tree
 
 ##
@@ -174,12 +173,11 @@ tree-regen:
 $(outdir)/%.lisp \
 $(outdir)/%.otf-gtable \
 $(outdir)/%.enc \
-$(outdir)/%.dep: $(outdir)/%.log
+$(outdir)/%.pe: $(outdir)/%.log
        $(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) \
                  $<