Some Makefile.am changes. Lots of them affected:
- changed deprecated INCLUDES variable to AM_CPPFLAGS
- moved the -DVG_LIBDIR definition from AM_CFLAGS into AM_CPPFLAGS
- generally neatened them up a bit -- removed old commented out stuff, fixed a
couple of other minor things
Everything works for me, hopefully it won't break things for anyone else...
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1680 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1704e04..1c6dfc1 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -1,20 +1,12 @@
-## Process this file with automake to produce Makefile.in
-
##---------------------------------------------------------------------------
## Need more tests:
## - lots more mmap/munmap/mremap/mprotect ones
-
-## Notes:
-## - HEAD and ERASER stderr.exp are different for signal2 due to lazy vs.
-## strict EIP updating
##---------------------------------------------------------------------------
noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr \
filter_stderr_backtrace
-
-EXTRA_DIST = \
- $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
badaddrvalue.stderr.exp \
badaddrvalue.stdout.exp badaddrvalue.vgtest \
badfree-2trace.stderr.exp badfree-2trace.vgtest \
@@ -73,9 +65,9 @@
trivialleak tronical weirdioctl \
mismatches new_override
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
AM_CXXFLAGS = $(AM_CFLAGS)
-INCLUDES = -I$(top_srcdir)/include
# C ones
badaddrvalue_SOURCES = badaddrvalue.c