From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 13 Sep 2010 17:44:51 +0000 (+0000)
Subject: Avoid triggering AM_CFLAGS / AM_CXXFLAGS redefinition warnings.
X-Git-Tag: svn/VALGRIND_3_6_0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2382e79f3dbb9481c4424bd9e4557534ea4026ed;p=thirdparty%2Fvalgrind.git

Avoid triggering AM_CFLAGS / AM_CXXFLAGS redefinition warnings.

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

diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am
index 8c7535e358..40033fc315 100644
--- a/memcheck/tests/ppc32/Makefile.am
+++ b/memcheck/tests/ppc32/Makefile.am
@@ -9,5 +9,5 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
 	power_ISA2_05
 
-AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include @FLAG_M32@
-AM_CXXFLAGS = $(AM_CFLAGS) @FLAG_M32@
+power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \
+		-I$(top_srcdir)/include @FLAG_M32@
diff --git a/memcheck/tests/ppc64/Makefile.am b/memcheck/tests/ppc64/Makefile.am
index a67f5a5161..a18afd76fc 100644
--- a/memcheck/tests/ppc64/Makefile.am
+++ b/memcheck/tests/ppc64/Makefile.am
@@ -9,6 +9,5 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
 	power_ISA2_05
 
-AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include \
-		@FLAG_M64@
-AM_CXXFLAGS = $(AM_CFLAGS) @FLAG_M64@
+power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \
+		-I$(top_srcdir)/include @FLAG_M64@