X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=6a6475965e3e21f9d0be0502a02e19d738b67f41;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=0172275c6d6df65cec66a3785ff09c6d35ce1c97;hpb=4a34b458c4ebc72d515ab9c5b90eb0abfeeda196;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 0172275c6d..6a6475965e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -35,29 +35,29 @@ OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
 SVG_FILES = $(OTF_FILES:%.otf=%.svg)
 WOFF_FILES = $(OTF_FILES:%.otf=%.woff)
 
-NCSB_OTFS = $(addprefix $(outdir)/,CenturySchL-Ital.otf \
-				   CenturySchL-BoldItal.otf \
-				   CenturySchL-Roma.otf \
-				   CenturySchL-Bold.otf)
+TEXGYRE_OTFS = $(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES))
+URWOTF_OTFS = $(addprefix $(URWOTF_DIR)/,$(URWOTF_FILES))
+
+LILYPOND_FONTS_CONF = $(outdir)/00-lilypond-fonts.conf \
+		      $(outdir)/99-lilypond-fonts.conf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 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,32 +73,30 @@ $(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) \
-		$(NCSB_OTFS) \
+ALL_GEN_FILES = $(ENC_FILES) \
 		$(OTF_FILES) \
 		$(SVG_FILES) \
-		$(WOFF_FILES)
+		$(WOFF_FILES) \
+		$(LILYPOND_FONTS_CONF)
 
 # PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
 INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
 INSTALLATION_FILES = $(MF_FILES)
 
-INSTALLATION_OUT_SUFFIXES = 1 2
+INSTALLATION_OUT_SUFFIXES = 1 2 3
 
 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
 INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
-			  $(NCSB_OTFS)
+			  $(TEXGYRE_OTFS) \
+			  $(URWOTF_OTFS)
 
 INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
 
+INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts
+INSTALLATION_OUT_FILES3 = $(LILYPOND_FONTS_CONF)
+
 export MFINPUTS := .:$(MFINPUTS)
 
 # A few rules here generate multiple files from one command line.  For
@@ -151,14 +149,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
 
@@ -170,15 +165,3 @@ local-clean:
 
 $(outdir)/fonts.conf:
 	echo '<fontconfig><dir>'$(shell cd $(outdir); pwd)'</dir></fontconfig>' > $@
-
-
-$(outdir)/CenturySchL-Roma.otf: $(NCSB_SOURCE_FILES) \
-	      $(auxscript-dir)/pfx2ttf.fontforge
-	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
-		$(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \
-			$(i).pfb $(i).afm $(outdir)/ && ) true
-
-$(addprefix $(outdir)/,CenturySchL-Ital.otf \
-	CenturySchL-Bold.otf \
-	CenturySchL-BoldItal.otf): $(outdir)/CenturySchL-Roma.otf
-	$(UPDATE_TARGET)