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
This commit is contained in:
Tom Hughes 2004-06-29 09:45:37 +00:00
parent 4453c3f527
commit a2a0946b8a
12 changed files with 29 additions and 19 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 $@

View File

@ -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 = \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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