From 500467da2a26905ee10bc25cbd3f205ffbcf8b56 Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Mon, 22 Nov 2004 13:44:11 +0000
Subject: [PATCH] Tiresome build-system hacks to connect to the VEX includes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3052
---
 Makefile.am                  | 11 +++++++++--
 Makefile.core-AM_CPPFLAGS.am |  3 ++-
 Makefile.tool-flags.am       |  3 ++-
 configure.in                 |  4 ++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 74f35a963..9f95c7bd6 100644
--- a/Makefile.am
+++ b/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
diff --git a/Makefile.core-AM_CPPFLAGS.am b/Makefile.core-AM_CPPFLAGS.am
index 88e222dbd..03c313ff4 100644
--- a/Makefile.core-AM_CPPFLAGS.am
+++ b/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@
diff --git a/Makefile.tool-flags.am b/Makefile.tool-flags.am
index 01b2a8e62..6b47ff6f8 100644
--- a/Makefile.tool-flags.am
+++ b/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@
diff --git a/configure.in b/configure.in
index d7778149e..1401ea191 100644
--- a/configure.in
+++ b/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=""