From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 23 Feb 2009 01:03:06 +0000 (+0000)
Subject: Cleanup this Makefile.am like other recent test Makefile.am files.
X-Git-Tag: svn/VALGRIND_3_5_0~942
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3d4b192551ee8ba2829b779d4f2b424a8f34fbe;p=thirdparty%2Fvalgrind.git

Cleanup this Makefile.am like other recent test Makefile.am files.



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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index be722045ab..43d7d88a8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,5 @@
 
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
+include $(top_srcdir)/Makefile.tool-tests.am
 
 noinst_SCRIPTS = \
 	filter_addresses \
@@ -20,11 +19,6 @@ check_PROGRAMS = \
 	toobig-allocs \
 	true
 
-AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
-# generic C ones
-arch_test_CFLAGS  	= $(AM_CFLAGS) \
-				-DVGA_$(VGCONF_ARCH_PRI)=1 \
-				-DVGO_$(VGCONF_OS)=1 \
-				-DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1