From e91540cc5817403fd18ca398e65f21b67b17ce1a Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Fri, 24 Apr 2009 04:12:28 +0000 Subject: [PATCH] Merged r9596 (build system tweaks, minus the Darwin bits) from the DARWIN branch. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9598 --- Makefile.am | 2 +- Makefile.install.am => Makefile.core-tool.am | 3 +++ Makefile.tool.am | 2 +- coregrind/Makefile.am | 2 +- none/tests/ppc32/Makefile.am | 4 ++-- none/tests/ppc64/Makefile.am | 2 +- none/tests/x86/Makefile.am | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) rename Makefile.install.am => Makefile.core-tool.am (90%) diff --git a/Makefile.am b/Makefile.am index e794adff7d..8164177883 100644 --- 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 c797ee7139..e5ba118097 100644 --- 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 e65586bad3..08127286a6 100644 --- 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 1daeae2bce..d1b1b09604 100644 --- 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 fe0a313035..6d926a1429 100644 --- 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 1f49e4148e..763d1bf3cb 100644 --- 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 85e40fefe9..5ddfeb2bd0 100644 --- 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 -- 2.47.3