commit 1d4d679fb72e1b5d4c693a578992a763da21fb7e
author thughes <thughes@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jun 29 09:45:37 2004 +0000
committer thughes <thughes@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jun 29 09:45:37 2004 +0000
tree c831b637a2298e6a96457ac8733f5f2304e5f6d8
parent 734160c851c73eece121338bffd65f940b8f8778

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 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/Makefile.am

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index affceef..f4855d0 100644
--- 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 @@
 	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 @@
 	$(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 $@