Out of tree build. Partial fix for Bug 333628.

Patch by Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>.
Partial fix. make && make check now works with builddir != srcdir.
But make regtest doesn't yet.

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

diff --git a/Makefile.all.am b/Makefile.all.am
index d4be312093bbefb240d5b0bbb12c5a989a3239ce..96eb8403f446bfb5da62401776d5068d36db79f7 100644 (file)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -117,6 +117,7 @@ AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/VEX/pub \
+       -I$(top_builddir)/VEX/pub \
        -DVGA_@VGCONF_ARCH_PRI@=1 \
        -DVGO_@VGCONF_OS@=1 \
        -DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1 \
@@ -126,6 +127,7 @@ AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/VEX/pub \
+       -I$(top_builddir)/VEX/pub \
        -DVGA_@VGCONF_ARCH_SEC@=1 \
        -DVGO_@VGCONF_OS@=1 \
        -DVGP_@VGCONF_ARCH_SEC@_@VGCONF_OS@=1 \

diff --git a/Makefile.am b/Makefile.am
index 2426b5c1f9a39c40ad6f29c2230d791a2073cc91..eae51727716a81966129069ed1db8f15fe4654d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,12 +65,12 @@ CLEANFILES     = default.supp
 default.supp: $(DEFAULT_SUPP_FILES)
        echo "# This is a generated file, composed of the following suppression rules:" > default.supp
        echo "# " $(DEFAULT_SUPP_FILES) >> default.supp
-       cat $(DEFAULT_SUPP_FILES) >> default.supp
+       cat $^ >> default.supp
 
 ## Preprend @PERL@ because tests/vg_regtest isn't executable
 ## Ensure make exits with error if PERL fails or post_regtest_checks fails.
 regtest: check
-       gdbserver_tests/make_local_links $(GDB)
+       $(top_srcdir)/gdbserver_tests/make_local_links $(GDB)
        if @PERL@ tests/vg_regtest gdbserver_tests $(TOOLS) $(EXP_TOOLS) ; then \
           tests/post_regtest_checks $(abs_top_srcdir) gdbserver_tests $(TOOLS) $(EXP_TOOLS); \
        else \

diff --git a/Makefile.tool-tests.am b/Makefile.tool-tests.am
index 299ba7b38177b670fc0076fd3682243d2ac2398d..6521afb4ac78ae0b73cec874b79c08fd8bf4ffb4 100644 (file)
--- a/Makefile.tool-tests.am
+++ b/Makefile.tool-tests.am
@@ -5,6 +5,7 @@ include $(top_srcdir)/Makefile.all.am
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
                -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
                -I$(top_srcdir)/VEX/pub \
+               -I$(top_builddir)/VEX/pub \
                -DVGA_@VGCONF_ARCH_PRI@=1 \
                -DVGO_@VGCONF_OS@=1 \
                -DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1 \

diff --git a/Makefile.vex.am b/Makefile.vex.am
index 5adbae86fe09780ba8dfe869c8cd1659654c4098..41690e166003ca602bd0dcb9b9b06c1d3ea07d46 100644 (file)
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -79,11 +79,12 @@ pub/libvex_guest_offsets.h: auxprogs/genoffsets.c \
                            pub/libvex_guest_mips32.h \
                            pub/libvex_guest_mips64.h
        rm -f auxprogs/genoffsets.s
+       $(mkdir_p) auxprogs pub
        $(CC) $(CFLAGS) \
              $(LIBVEX_CFLAGS) \
              $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
                                -O -S -o auxprogs/genoffsets.s \
-                                        auxprogs/genoffsets.c
+                                        $(srcdir)/auxprogs/genoffsets.c
        grep xyzzy auxprogs/genoffsets.s | grep "^#define" \
           | sed "s/xyzzy\\$$//g" \
           | sed "s/xyzzy#//g" \

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 99f767c4b2af1fb5af1a3f404c27f2631c118dda..c3ba6bb9c9ad7cdee8e2f6c1e48dc9130470a975 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -640,7 +640,7 @@ if VGCONF_OS_IS_DARWIN
 
 BUILT_SOURCES += fixup_macho_loadcmds
 fixup_macho_loadcmds: fixup_macho_loadcmds.c
-       $(CC) -g -Wall -o fixup_macho_loadcmds fixup_macho_loadcmds.c
+       $(CC) -g -Wall -o $@ $<
 
 CLEANFILES += fixup_macho_loadcmds