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/corecheck/Makefile.am b/corecheck/Makefile.am
index f74488f..c9fd968 100644
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -1,18 +1,13 @@
SUBDIRS = . tests docs
-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_corecheck.so
vgskin_corecheck_so_SOURCES = cc_main.c
vgskin_corecheck_so_LDFLAGS = -shared
-
-##vgskin_corecheck.so$(EXEEXT): $(vgskin_corecheck_so_OBJECTS)
-## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_corecheck.so \
-## $(vgskin_corecheck_so_OBJECTS)