Pass platform-variant tags (-DVGPV_blah_blah_blah) to regtest

compiles.  Also, fix some $(NAME) stuff which looks like it should
have been @NAME@ all along.

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

diff --git a/Makefile.tool-tests.am b/Makefile.tool-tests.am
index a9d3b91001f91f9c4de40ee2d1a72a8ae3851486..79110dfd3e1c0c72fc8e7aa59d026a79311b2e55 100644 (file)
--- a/Makefile.tool-tests.am
+++ b/Makefile.tool-tests.am
@@ -5,9 +5,10 @@ include $(top_srcdir)/Makefile.all.am
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
                -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
                -I$(top_srcdir)/VEX/pub \
-               -DVGA_$(VGCONF_ARCH_PRI)=1 \
-               -DVGO_$(VGCONF_OS)=1 \
-               -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
+               -DVGA_@VGCONF_ARCH_PRI@=1 \
+               -DVGO_@VGCONF_OS@=1 \
+               -DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1 \
+               -DVGPV_@VGCONF_ARCH_PRI@_@VGCONF_OS@_@VGCONF_PLATVARIANT@=1
 # Nb: Tools need to augment these flags with an arch-selection option, such
 # as $(AM_FLAG_M3264_PRI).
 AM_CFLAGS   = -Winline -Wall -Wshadow -g