Make VPATH builds work so that valgrind can be built in a different

directory from the source tree. This resolves bug 83040.

Based on patch from Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.

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

diff --git a/Makefile.am b/Makefile.am
index 271e1b8857bce13f6159557bf1ee30a570b38161..02e2c8566a9b3e32fc70d50a235b54d1c7a4ef25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,8 @@ install-exec-hook:
 all-local:
        mkdir -p $(top_builddir)/.in_place
        rm -f $(addprefix $(top_builddir)/.in_place/,default.supp $(SUPP_FILES))
-       ln -s $(addprefix $(top_srcdir)/../,default.supp $(SUPP_FILES)) $(top_builddir)/.in_place
+       ln -s ../default.supp $(top_builddir)/.in_place
+       ln -s $(addprefix ../$(top_srcdir)/,$(SUPP_FILES)) $(top_builddir)/.in_place
 
 distclean-local:
        rm -rf $(top_builddir)/.in_place

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 3c86d5bac0616500c8b48197fb3ba750d798f08e..f4f97c267050ababe35b29e013f3eb095b176033 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -2,8 +2,8 @@
 SUBDIRS = . docs tests
 
 # include memcheck/ for mac_shared.h
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/memcheck \
-               -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -I$(top_srcdir)/memcheck -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 62e0ff71c9b8b6dbee255d0dbd88446f67f8df22..d9d0b2dc050fa42032dc2205cd792485bf73d8cd 100644 (file)
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . 
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coregrind \
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
                -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -O -g
 

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index a00235e24a55de7e61ca4b73c38269198c279425..0f0a5fea1236912969673dee6ac7d3021c420a61 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . docs tests
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index b1682cc16ad220fd156f70b70279f2ff87c2e572..02880dcdb690d7c4c83b1d3becaabb941a2e5565 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . tests docs
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index affceefdd6364b9fb188b4770658e9f7e8b06a08..f4855d06feebc904bd044592421d4114010538c9 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = x86 demangle . docs
 
-add_includes = -I$(srcdir)/demangle -I$(top_srcdir)/include -I$(srcdir)/x86
+add_includes = -I$(srcdir)/demangle -I$(top_builddir)/include \
+               -I$(top_srcdir)/include -I$(srcdir)/x86
 
 valdir = $(libdir)/valgrind
 inplacedir = $(top_builddir)/.in_place
@@ -90,15 +91,15 @@ stage2_LDADD= \
        demangle/safe-ctype.o \
        -ldl
 
-vg_intercept.c: $(srcdir)/gen_intercepts.pl vg_intercept.c.base
+vg_intercept.c: $(srcdir)/gen_intercepts.pl $(srcdir)/vg_intercept.c.base
        rm -f $@
-       $(PERL) $(srcdir)/gen_intercepts.pl < vg_intercept.c.base > $@
+       $(PERL) $(srcdir)/gen_intercepts.pl < $(srcdir)/vg_intercept.c.base > $@
 
-vg_replace_malloc.c: $(srcdir)/gen_intercepts.pl vg_replace_malloc.c.base
+vg_replace_malloc.c: $(srcdir)/gen_intercepts.pl $(srcdir)/vg_replace_malloc.c.base
        rm -f $@
-       $(PERL) $(srcdir)/gen_intercepts.pl < vg_replace_malloc.c.base > $@
+       $(PERL) $(srcdir)/gen_intercepts.pl < $(srcdir)/vg_replace_malloc.c.base > $@
 
-vg_toolint.c: $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def $(srcdir)/Makefile
+vg_toolint.c: $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def ./Makefile
        rm -f $@
        $(PERL) $(srcdir)/gen_toolint.pl callwrap     < $(srcdir)/toolfuncs.def >  $@ || rm -f $@
        $(PERL) $(srcdir)/gen_toolint.pl missingfuncs < $(srcdir)/toolfuncs.def >> $@ || rm -f $@
@@ -106,7 +107,7 @@ vg_toolint.c: $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def $(srcdir)/Makefil
        $(PERL) $(srcdir)/gen_toolint.pl initdlsym    < $(srcdir)/toolfuncs.def >> $@ || rm -f $@
        $(PERL) $(srcdir)/gen_toolint.pl structdef    < $(srcdir)/toolfuncs.def >> $@ || rm -f $@
 
-vg_toolint.h:  $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def $(srcdir)/Makefile
+vg_toolint.h:  $(srcdir)/gen_toolint.pl $(srcdir)/toolfuncs.def ./Makefile
        rm -f $@
        $(PERL) $(srcdir)/gen_toolint.pl proto  < $(srcdir)/toolfuncs.def >  $@ || rm -f $@
        $(PERL) $(srcdir)/gen_toolint.pl struct < $(srcdir)/toolfuncs.def >> $@ || rm -f $@

diff --git a/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index 1ac2b8fc8fa664c8a42ad22e056568b0c830d517..b1956c44e9756ca190ed09f37ed8c4df2121801f 100644 (file)
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,5 +1,6 @@
 
-AM_CPPFLAGS = -I$(top_srcdir)/coregrind -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
+              -I$(top_builddir)/include -I$(top_srcdir)/include
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 
 noinst_HEADERS = \

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index eab751501b9c7f780c8df4dd0bdf4b1eef24c14b..09dc6a844c1f0dfd0f003f87feb7ab80852389db 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . docs tests
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index fdadc30e40429cbcf2fee55213d5b35fc9b59635..7b0599b48fe29b5e72ca4b2b507d52e3a6a3d731 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . docs tests
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/massif/Makefile.am b/massif/Makefile.am
index 7e1ce6b1871f03d5d548ad65ab3ef3829b9e8a98..65a69383d4c5552d35679b9799f4d3a0ce2ec0f4 100644 (file)
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . tests docs hp2ps
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index ec5c4731e8ea766a4f5a0932d075cea5b66f3f7d..5d5fd1568819aea5852bb11b7d82a5b68ff597f0 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -1,7 +1,7 @@
 
 SUBDIRS = . tests docs
 
-all_includes = -I$(top_srcdir)/include
+all_includes = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 AM_CPPFLAGS = $(all_includes) -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \

diff --git a/none/Makefile.am b/none/Makefile.am
index 30a631ea47b24ad2f6ee78fad3c85e42b548760a..775a0cd9baf6fd5f42dbbed35fceaddae10c8183 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -1,7 +1,8 @@
 
 SUBDIRS = . docs tests
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -DVG_LIBDIR="\"$(libdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g