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

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

diff --git a/Makefile.am b/Makefile.am
index 74f35a9637d179fd00f8702753f8382676b0dbd2..9f95c7bd614e7d5864bb6bc9c471fff33eaec36e 100644 (file)
--- 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 88e222dbd134f03147bc80397be0c4a926bbf0ed..03c313ff4873701fe3e7261065553f5cb36fd7b4 100644 (file)
--- 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 01b2a8e62d54b260229435127a23b49c13dc9d0c..6b47ff6f89baf268f10fa90f7541b3c0b09ed606 100644 (file)
--- 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 d7778149e3e70390c8d411a5a32fd055e832b72c..1401ea191b5f98e76b11a45c4a2181af49e6681a 100644 (file)
--- 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=""