X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=6a6475965e3e21f9d0be0502a02e19d738b67f41;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=646234cd071cb9d030c057f56d4e254a45c1bff3;hpb=af1b0da3853670ee559e148cea70535d5f6ac716;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 646234cd07..6a6475965e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -35,20 +35,11 @@ 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))
 
-HELV_OTFS = $(addprefix $(outdir)/,NimbusSanL-ReguItal.otf \
-				   NimbusSanL-BoldItal.otf \
-				   NimbusSanL-Regu.otf \
-				   NimbusSanL-Bold.otf)
-
-COUR_OTFS = $(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \
-				   NimbusMonL-BoldObli.otf \
-				   NimbusMonL-Regu.otf \
-				   NimbusMonL-Bold.otf)
+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)
@@ -83,27 +74,29 @@ $(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts
 	$< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@))
 
 ALL_GEN_FILES = $(ENC_FILES) \
-		$(NCSB_OTFS) \
-		$(HELV_OTFS) \
-		$(COUR_OTFS) \
 		$(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) $(HELV_OTFS) $(COUR_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
@@ -172,37 +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)
-
-$(outdir)/NimbusSanL-Regu.otf: $(HELV_SOURCE_FILES) \
-	      $(auxscript-dir)/pfx2ttf.fontforge
-	$(foreach i, $(basename $(HELV_SOURCE_FILES)), \
-		$(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \
-			$(i).pfb $(i).afm $(outdir)/ && ) true
-
-$(addprefix $(outdir)/,NimbusSanL-ReguItal.otf \
-	NimbusSanL-Bold.otf \
-	NimbusSanL-BoldItal.otf): $(outdir)/NimbusSanL-Regu.otf
-	$(UPDATE_TARGET)
-
-$(outdir)/NimbusMonL-Regu.otf: $(COUR_SOURCE_FILES) \
-	      $(auxscript-dir)/pfx2ttf-mono.fontforge
-	$(foreach i, $(basename $(COUR_SOURCE_FILES)), \
-		$(FONTFORGE) -script $(auxscript-dir)/pfx2ttf-mono.fontforge \
-			$(i).pfb $(i).afm $(outdir)/ && ) true
-
-$(addprefix $(outdir)/,NimbusMonL-ReguObli.otf \
-	NimbusMonL-Bold.otf \
-	NimbusMonL-BoldObli.otf): $(outdir)/NimbusMonL-Regu.otf
-	$(UPDATE_TARGET)