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/example/Makefile.am b/example/Makefile.am
index b33202e..92c3413 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,13 +1,12 @@
 
 SUBDIRS = .
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-		-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+		@PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_example.so
 
 vgskin_example_so_SOURCES = ex_main.c