Makefile.am wibbles:

  - added some missing SUBDIRS variables
  - removed unnecessary coregrind/demangle/ from some INCLUDES lists


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1137 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index c8028a3..a923313 100644
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -1,10 +1,12 @@
 
+SUBDIRS = .
+
 CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
 		-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include
 
 val_PROGRAMS = vgskin_lackey.so