Reworked to avoid depending on $(eval) in the make files as only fairly

new GNU make versions seem to have it.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5037

diff --git a/Makefile.flags.am b/Makefile.flags.am
index 37c2989c5de02e9e037e830039d8d5cb20e7c49a..e9228151b68a0246e45e7b1aa6d10265a8c95fb3 100644 (file)
--- a/Makefile.flags.am
+++ b/Makefile.flags.am
@@ -14,8 +14,6 @@ AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux)
 AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) -Wa,-maltivec -g
 
-PLATFORM = $(shell echo @VG_PLATFORM@ | tr '[a-z-]' '[A-Z_]')
-
-$(eval AM_CPPFLAGS = $(value AM_CPPFLAGS_$(PLATFORM)))
-$(eval AM_CFLAGS = $(value AM_CFLAGS_$(PLATFORM)))
-$(eval AM_CCASFLAGS = $(value AM_CCASFLAGS_$(PLATFORM)))
+AM_CPPFLAGS = $(AM_CPPFLAGS_@VG_MAKE_PLATFORM@)
+AM_CFLAGS = $(AM_CFLAGS_@VG_MAKE_PLATFORM@)
+AM_CCASFLAGS = $(AM_CCASFLAGS_@VG_MAKE_PLATFORM@)

diff --git a/configure.in b/configure.in
index d275191613283687afb131d4efa23b36874554d1..62a8ccdd372244f200deff9ae038d5bdcb4d3a4b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -224,6 +224,9 @@ AM_CONDITIONAL(VG_X86_LINUX, test x$VG_PLATFORM = xx86-linux -o x$VG_PLATFORM =
 AM_CONDITIONAL(VG_AMD64_LINUX, test x$VG_PLATFORM = xamd64-linux)
 AM_CONDITIONAL(VG_PPC32_LINUX, test x$VG_PLATFORM = xppc32-linux)
 
+AC_SUBST(VG_MAKE_PLATFORM)
+VG_MAKE_PLATFORM=`echo $VG_PLATFORM | tr [a-z-] [A-Z_]`
+
 AC_SUBST(DEFAULT_SUPP)
 
 glibc=""