Tiresome build-system hacks to connect to the VEX includes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3052

Makefile.am

@@ -5,12 +5,19 @@ include $(top_srcdir)/Makefile.all.am
 
 ## include must be first for tool.h
 ## addrcheck must come after memcheck, for mac_*.o
+#SUBDIRS = 	include coregrind . docs tests auxprogs \
+#		memcheck \
+#		addrcheck \
+#		cachegrind \
+#		corecheck \
+#		helgrind \
+#		massif \
+#		lackey \
+#		none
 SUBDIRS = 	include coregrind . docs tests auxprogs \
 		memcheck \
 		addrcheck \
-		cachegrind \
 		corecheck \
-		helgrind \
 		massif \
 		lackey \
 		none

Makefile.core-AM_CPPFLAGS.am

@@ -5,7 +5,8 @@ add_includes = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
 		-I$(top_builddir)/include -I$(top_srcdir)/include \
 		-I$(top_srcdir)/include/$(VG_ARCH) \
 		-I$(top_srcdir)/include/$(VG_OS) \
-		-I$(top_srcdir)/include/$(VG_PLATFORM)
+		-I$(top_srcdir)/include/$(VG_PLATFORM) \
+		-I@VEX_DIR@/pub
 
 AM_CPPFLAGS = $(add_includes)
 AM_CCASFLAGS = $(add_includes) @ARCH_CORE_AM_CCASFLAGS@

Makefile.tool-flags.am

@@ -3,7 +3,8 @@
 add_includes = -I$(top_builddir)/include -I$(top_srcdir)/include \
 		-I$(top_srcdir)/include/$(VG_ARCH) \
 		-I$(top_srcdir)/include/$(VG_OS) \
-		-I$(top_srcdir)/include/$(VG_PLATFORM)
+		-I$(top_srcdir)/include/$(VG_PLATFORM) \
+		-I@VEX_DIR@/pub
 
 AM_CPPFLAGS = $(add_includes)
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -g @ARCH_TOOL_AM_CFLAGS@

configure.in

@@ -6,6 +6,10 @@ AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE
 
+# Where is VEX ? ToDo: --with-vex=
+VEX_DIR=/home/sewardj/Vex/vex/trunk
+AC_SUBST(VEX_DIR)
+
 # Checks for programs.
 CFLAGS=""