From c703eef674fa7a8cf2dc32bbf9e07b6c6621e3bf Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 19 Jul 2005 02:40:05 +0000 Subject: Convert $(foreach...) to more portable suffix substitution rules --- Makefile.am | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index e627b4f..420e257 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,35 +43,35 @@ BDF2UCS_FONT_FILES = \ UTRG__24 FONT_FILES = $(BDF2UCS_FONT_FILES) -BDF_FILES = $(foreach X, $(FONT_FILES), $(X).bdf) -PCF_FILES = $(foreach X, $(FONT_FILES), $(X).pcf.gz) +BDF_FILES = $(FONT_FILES:%=%.bdf) +PCF_FILES = $(FONT_FILES:%=%.pcf.gz) -ISO8859_1_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-1.pcf.gz) +ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) -ISO8859_2_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-2.pcf.gz) +ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) -ISO8859_3_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-3.pcf.gz) +ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) -ISO8859_4_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-4.pcf.gz) +ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) -ISO8859_9_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-9.pcf.gz) +ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) -ISO8859_10_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-10.pcf.gz) +ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) -ISO8859_13_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-13.pcf.gz) +ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) -ISO8859_14_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-14.pcf.gz) +ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) -ISO8859_15_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-15.pcf.gz) +ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) UTIL_DIR = @MAPFILES_PATH@ @@ -138,6 +138,7 @@ font_DATA = \ $(ISO8859_13_PCF_FILES) \ $(ISO8859_14_PCF_FILES) \ $(ISO8859_15_PCF_FILES) +BUILT_SOURCES = $(font_DATA:%.pcf.gz=%.bdf) CLEANFILES = $(font_DATA) EXTRA_DIST = $(BDF_FILES) autogen.sh -- cgit v1.2.3