[Valgrind-developers] Valgrind: r13949 - in /trunk: Makefile.all.am Makefile.am Makefile.tool-tests.am Makefile.vex.am coregrind/Makefile.am

[<sv...@va...>]

Author: mjw
Date: Fri May  9 13:34:13 2014
New Revision: 13949

Log:
Out of tree build. Partial fix for Bug 333628.

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

Modified:
    trunk/Makefile.all.am
    trunk/Makefile.am
    trunk/Makefile.tool-tests.am
    trunk/Makefile.vex.am
    trunk/coregrind/Makefile.am

Modified: trunk/Makefile.all.am
==============================================================================
--- trunk/Makefile.all.am (original)
+++ trunk/Makefile.all.am Fri May  9 13:34:13 2014
@@ -117,6 +117,7 @@
 	-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 @@
 	-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 \

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Fri May  9 13:34:13 2014
@@ -65,12 +65,12 @@
 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 \

Modified: trunk/Makefile.tool-tests.am
==============================================================================
--- trunk/Makefile.tool-tests.am (original)
+++ trunk/Makefile.tool-tests.am Fri May  9 13:34:13 2014
@@ -5,6 +5,7 @@
 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 \

Modified: trunk/Makefile.vex.am
==============================================================================
--- trunk/Makefile.vex.am (original)
+++ trunk/Makefile.vex.am Fri May  9 13:34:13 2014
@@ -79,11 +79,12 @@
 			    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" \

Modified: trunk/coregrind/Makefile.am
==============================================================================
--- trunk/coregrind/Makefile.am (original)
+++ trunk/coregrind/Makefile.am Fri May  9 13:34:13 2014
@@ -640,7 +640,7 @@
 
 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