(CFF_FILES): Bugfix: only big cheeses and braces.

diff --git a/ChangeLog b/ChangeLog
index 6b8c56bc76861b331849a33f3ae8d003c2c427a5..d31742fd33674cb0372975b142232873f6e75195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/GNUmakefile (CFF_FILES): Bugfix: only big cheeses and braces.
+
 2005-01-12  Werner Lemberg  <wl@gnu.org>
 
        This patch addresses the following problems in the feta sources
@@ -109,6 +113,7 @@
        * Documentation/user/notation.itely (Ancient rests): Fix typo
        (thanks Anthony)
 
+>>>>>>> 1.3051
 2005-01-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/auto-beam.scm (score-override-auto-beam-setting): New function.

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index cf8740ce7ad36d7da42c8e0242f7add22a1e196d..951c5bc340a57860d431feb7a09b4746718a41cc 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -25,7 +25,7 @@ OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))
  $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
-CFF_FILES = $(OTF_FILES:%.otf=%.cff) $(ALL_FONTS:%=$(outdir)/%.cff)
+CFF_FILES = $(OTF_FILES:%.otf=%.cff)
 
 
 $(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)