Merge r9533..9536 (add tests/{asm.h,sys_mman.h,malloc.h} from the DARWIN
branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9537 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 20e7e8f..1101ac9 100644
--- a/perf/Makefile.am
+++ b/perf/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 = vg_perf
@@ -18,9 +17,9 @@
check_PROGRAMS = \
bigcode bz2 fbench ffbench heap sarp tinycc
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = -Winline -Wall -Wshadow -g -O $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CFLAGS += -O $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI)
+
# Extra stuff
bz2_CFLAGS = $(AM_CFLAGS) -Wno-inline