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/Makefile.am b/Makefile.am
index 3c16913..270c9df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,12 +13,15 @@
lackey \
none
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
- -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+ @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp xfree-3.supp xfree-4.supp
+SUPP_FILES = \
+ glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
+ xfree-3.supp xfree-4.supp
val_DATA = $(SUPP_FILES) default.supp