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/Makefile.am b/memcheck/Makefile.am
index 7b775e5..e938507 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -1,13 +1,12 @@
SUBDIRS = . tests docs
-INCLUDES = -I$(top_srcdir)/include
+all_includes = -I$(top_srcdir)/include
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
- -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+AM_CPPFLAGS = $(all_includes) -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
@PREFERRED_STACK_BOUNDARY@ -g
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(all_includes)
valdir = $(libdir)/valgrind