Convert $(foreach...) to more portable suffix substitution rules

1 files changed, 37 insertions, 36 deletions

diff --git a/Makefile.am b/Makefile.am
index ff5a2f2..3972ce2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,59 +99,59 @@ EXTRA_FONT_FILES = \
 FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
 TRUNC_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)
 
-TRUNC_BDF_FILES = $(foreach X, $(TRUNC_FONT_FILES), $(X)t.bdf)
-TRUNC_PCF_FILES = $(foreach X, $(TRUNC_FONT_FILES), $(X).pcf.gz)
+TRUNC_BDF_FILES = $(TRUNC_FONT_FILES:%=%t.bdf)
+TRUNC_PCF_FILES = $(TRUNC_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_5_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-5.bdf)
-ISO8859_5_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-5.pcf.gz)
+ISO8859_5_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.bdf)
+ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf.gz)
 
-ISO8859_7_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-7.bdf)
-ISO8859_7_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-7.pcf.gz)
+ISO8859_7_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.bdf)
+ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf.gz)
 
-ISO8859_8_BDF_FILES = $(foreach X, $(BDF2UCS_8_FONT_FILES), $(X)-ISO8859-8.bdf)
-ISO8859_8_PCF_FILES = $(foreach X, $(BDF2UCS_8_FONT_FILES), $(X)-ISO8859-8.pcf.gz)
+ISO8859_8_BDF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.bdf)
+ISO8859_8_PCF_FILES = $(BDF2UCS_8_FONT_FILES:%=%-ISO8859-8.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_11_BDF_FILES = $(foreach X, $(BDF2UCS_11_FONT_FILES), $(X)-ISO8859-11.bdf)
-ISO8859_11_PCF_FILES = $(foreach X, $(BDF2UCS_11_FONT_FILES), $(X)-ISO8859-11.pcf.gz)
+ISO8859_11_BDF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.bdf)
+ISO8859_11_PCF_FILES = $(BDF2UCS_11_FONT_FILES:%=%-ISO8859-11.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)
 
-ISO8859_16_BDF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-16.bdf)
-ISO8859_16_PCF_FILES = $(foreach X, $(BDF2UCS_FONT_FILES), $(X)-ISO8859-16.pcf.gz)
+ISO8859_16_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.bdf)
+ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf.gz)
 
-KOI8_R_BDF_FILES = $(foreach X, $(BDF2UCS_KOI8_FONT_FILES), $(X)-KOI8-R.bdf)
-KOI8_R_PCF_FILES = $(foreach X, $(BDF2UCS_KOI8_FONT_FILES), $(X)-KOI8-R.pcf.gz)
+KOI8_R_BDF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.bdf)
+KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=%-KOI8-R.pcf.gz)
 
-JISX0201_BDF_FILES = $(foreach X, $(BDF2UCS_JISX0201_FONT_FILES), $(X)-JISX0201.1976-0.bdf)
-JISX0201_PCF_FILES = $(foreach X, $(BDF2UCS_JISX0201_FONT_FILES), $(X)-JISX0201.1976-0.pcf.gz)
+JISX0201_BDF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.bdf)
+JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=%-JISX0201.1976-0.pcf.gz)
 
 UTIL_DIR = @MAPFILES_PATH@
 
@@ -268,6 +268,7 @@ font_DATA = \
 	$(ISO8859_16_PCF_FILES) \
 	$(KOI8_R_PCF_FILES) \
 	$(JISX0201_PCF_FILES)
+BUILT_SOURCES = $(font_DATA:%.pcf.gz=%.bdf)
 CLEANFILES = $(font_DATA) $(TRUNC_BDF_FILES)
 
 EXTRA_DIST = $(BDF_FILES) autogen.sh