($(outdir)/emmentaler-%.otf

$(outdir)/emmentaler-%.svg): rewrite without functions; too many
Make incompatibilities.

diff --git a/ChangeLog b/ChangeLog
index 7c59e3d9e4dc212ca78864ab1cf10cb44491939d..8be56f5dd1389bc5712260186476da68cd8a248c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-03-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * mf/GNUmakefile ($(outdir)/emmentaler-%.otf
+       $(outdir)/emmentaler-%.svg): rewrite without functions; too many
+       Make incompatibilities.
+
        * scm/output-ps.scm (grob-cause): replace backslashes by /
        (glyph-string): use ~$ for less decimals for glyph-string and grob-cause.
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 7978f67ff8689cdb4599cb4122f5ca8b00cf6e10..0f666b5c1e8f8e509532edacecc942b3d69b0002 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -61,13 +61,8 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 #
 
 
-## No \ escaping for newlines!
-define EMMENTALER_RULE
-$(outdir)/emmentaler-$(1).otf $(outdir)/emmentaler-$(1).svg: $(outdir)/emmentaler-$(1).pe $(outdir)/feta$(1).pfa  $(outdir)/feta-alphabet$(1).pfa  $(outdir)/parmesan$(1).pfa
-       cd $(outdir) && $(FONTFORGE) -script emmentaler-$(1).pe
-endef
-
-$(foreach size, $(STAFF_SIZES), $(eval $(call EMMENTALER_RULE,$(size))))
+$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa
+       cd $(outdir) && $(FONTFORGE) -script $(notdir $(subst otf,pe,$@))
 
 $(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa)
        cd $(outdir) && $(FONTFORGE) -script aybabtu.pe