Merged r9596 (build system tweaks, minus the Darwin bits) from the DARWIN

branch.

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

diff --git a/Makefile.am b/Makefile.am
index e794adff7d89a89476dab5cf2367955ab04473e6..816417788375b09a1db44469dcc0837708e9df17 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,7 @@ all-local: default.supp
        rm -f $(inplacedir)/default.supp
        ln -s ../default.supp $(inplacedir)
 
-distclean-local:
+clean-local:
        rm -rf $(inplacedir)
 
 # These list the bits of vex we need to install

diff --git a/Makefile.install.am b/Makefile.core-tool.am
similarity index 90%
rename from Makefile.install.am
rename to Makefile.core-tool.am
index c797ee7139aeba0798e3ab968e9a633523b53f5d..e5ba1180972d80a2377b5279b8d5293213219d8e 100644 (file)
--- a/Makefile.install.am
+++ b/Makefile.core-tool.am
@@ -1,3 +1,6 @@
+# This file contains things shared by coregrind/Makefile.am and tool
+# Makefile.am files.
+
 # This is used by coregrind/Makefile.am and Makefile.tool.am for doing
 # "in-place" installs.  It copies $(noinst_PROGRAMS) into $inplacedir.
 # It needs to be depended on by an 'all-local' rule.

diff --git a/Makefile.tool.am b/Makefile.tool.am
index e65586bad395e5a72dd71f31d11b67e10e05a1ac..08127286a62b963ac734bbfda7bdafbc30d561f7 100644 (file)
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -3,7 +3,7 @@ SUBDIRS = . tests docs
 
 include $(top_srcdir)/Makefile.all.am
 include $(top_srcdir)/Makefile.flags.am
-include $(top_srcdir)/Makefile.install.am
+include $(top_srcdir)/Makefile.core-tool.am
 
 
 LIBREPLACEMALLOC_X86_LINUX = \

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 1daeae2bce52070f85fb93e93b546d4195173e7b..d1b1b096049da4a31db1cf254c3769409465a143 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -5,7 +5,7 @@
 
 include $(top_srcdir)/Makefile.all.am
 include $(top_srcdir)/Makefile.flags.am
-include $(top_srcdir)/Makefile.install.am
+include $(top_srcdir)/Makefile.core-tool.am
 
 
 AM_CPPFLAGS_CORE_COMMON = \

diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
index fe0a3130351b15b0aa46ca9cd94f2553253cb413..6d926a1429943ae03130f25676b1cb7903144fbb 100644 (file)
--- a/none/tests/ppc32/Makefile.am
+++ b/none/tests/ppc32/Makefile.am
@@ -33,6 +33,6 @@ AM_CFLAGS   += @FLAG_M32@
 AM_CXXFLAGS += @FLAG_M32@
 AM_CCASFLAGS = @FLAG_M32@
 
-jm_insns_CFLAGS = -Winline -Wall -O -g -mregnames -maltivec @FLAG_M32@
-testVMX_CFLAGS  = -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M32@
+testVMX_CFLAGS  = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
                        -DGCC_COMPILER @FLAG_M32@

diff --git a/none/tests/ppc64/Makefile.am b/none/tests/ppc64/Makefile.am
index 1f49e4148eac7bea13d988b99563ea5a4e5dd4a2..763d1bf3cb94408d3e47dc9d1d6c077b4a3a9b54 100644 (file)
--- a/none/tests/ppc64/Makefile.am
+++ b/none/tests/ppc64/Makefile.am
@@ -20,4 +20,4 @@ AM_CFLAGS   += @FLAG_M64@
 AM_CXXFLAGS += @FLAG_M64@
 AM_CCASFLAGS = @FLAG_M64@
 
-jm_insns_CFLAGS = -Winline -Wall -O -g -mregnames -maltivec @FLAG_M64@
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M64@

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 85e40fefe956c9fadcc31ac30df40fdc5d05e15d..5ddfeb2bd05414aebf6f213392eb1c82dab51eaa 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -97,7 +97,7 @@ AM_CCASFLAGS = @FLAG_M32@
 # generic C ones
 cpuid_SOURCES          = cpuid_c.c cpuid_s.s
 # fpu_lazy_eflags must use these flags -- the bug only occurred with them
-fpu_lazy_eflags_CFLAGS = @FLAG_M32@ -O2 -march=pentiumpro
+fpu_lazy_eflags_CFLAGS = $(AM_CFLAGS) -O2 -march=pentiumpro
 fxtract_LDADD          = -lm
 insn_basic_SOURCES     = insn_basic.def
 insn_basic_LDADD       = -lm