Use GNU make pattern rule in ld Makefile

Use the pattern rule in a comment from commit 77ac17b8453f.

	* Makefile.am (run-genscripts): Delete.  Use pattern rule
	e%.c instead.
	* Makefile.in: Regenerate.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index be4562757484d033fccd2206a9183bb88bb7b93f..fcb93060a143b7abd57ed2e12d2fa75c1b879316 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -633,19 +633,10 @@ GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed
 
 @TDIRS@
 
-# We can't use pattern rules as we don't want to depend on GNU
-# make, or else these rules could have been expressed in one
-# two-liner: 'e%.c:' and '     ${GENSCRIPTS} $* "$(tdir_$*)"'.
-# (The recursive variable expansion is portable.)
-
-run-genscripts:
-       $(AM_V_at)${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
-
-.PHONY: run-genscripts
+e%.c:
+       $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
 
 $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
-       $(AM_V_GEN)base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
-       $(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
 
 # It's a pity we can't generate these include "./deps/e*.Pc" lines
 # from ALL_EMULATION_SOURCES and ALL_64_EMULATION_SOURCES, but that isn't

diff --git a/ld/Makefile.in b/ld/Makefile.in
index c6a79774f38bdac65029de6589e58f95c47f99c1..fc6dccbad20130e1d0d631123d16fb049ac9a14b 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2355,19 +2355,10 @@ stringify.sed: ${srcdir}/emultempl/$(STRINGIFY)
 
 @TDIRS@
 
-# We can't use pattern rules as we don't want to depend on GNU
-# make, or else these rules could have been expressed in one
-# two-liner: 'e%.c:' and '     ${GENSCRIPTS} $* "$(tdir_$*)"'.
-# (The recursive variable expansion is portable.)
-
-run-genscripts:
-       $(AM_V_at)${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
-
-.PHONY: run-genscripts
+e%.c:
+       $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
 
 $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
-       $(AM_V_GEN)base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
-       $(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
 
 # It's a pity we can't generate these include "./deps/e*.Pc" lines
 # from ALL_EMULATION_SOURCES and ALL_64_EMULATION_SOURCES, but that isn't