Require automake-1.10 for proper handling of include file dependencies

in .S files. Also included here is some cleanup, including a reversion
of r10378. Fixes bugzilla #197914.

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

diff --git a/Makefile.all.am b/Makefile.all.am
index fe6fccd20101ac44f801b391c0350faad47620ab..30502798feb2829b0b4331f76d7e194171db816b 100644 (file)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -112,14 +112,6 @@ endif
 #
 # Nb: the AM_CPPFLAGS_* values are suitable for building tools and auxprogs.
 # For building the core, coregrind/Makefile.am files add some extra things.
-#
-# Also: in newer versions of automake (1.10 onwards?) asm files ending with
-# '.S' are considered "pre-processed" (as opposed to those ending in '.s')
-# and so the CPPFLAGS are passed to the assembler.  But this is not true for
-# older automakes (e.g. 1.8.5, 1.9.6), sigh.  So we include
-# AM_CPPFLAGS_<PLATFORM> in each AM_CCASFLAGS_<PLATFORM> variable.  This
-# means some of the flags are duplicated on systems with newer versions of
-# automake, but this does not really matter and seems hard to avoid.
 
 AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ = \
        -I$(top_srcdir) \
@@ -143,25 +135,25 @@ endif
 AM_FLAG_M3264_X86_LINUX   = @FLAG_M32@
 AM_CFLAGS_X86_LINUX       = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
                                $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_X86_LINUX    = $(AM_CPPFLAGS_X86_LINUX) @FLAG_M32@ -g
+AM_CCASFLAGS_X86_LINUX    = @FLAG_M32@ -g
 
 AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@
 AM_CFLAGS_AMD64_LINUX     = @FLAG_M64@ -fomit-frame-pointer \
                                @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_AMD64_LINUX  = $(AM_CPPFLAGS_AMD64_LINUX) @FLAG_M64@ -g
+AM_CCASFLAGS_AMD64_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@
 AM_CFLAGS_PPC32_LINUX     = @FLAG_M32@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC32_LINUX  = $(AM_CPPFLAGS_PPC32_LINUX) @FLAG_M32@ -g
+AM_CCASFLAGS_PPC32_LINUX  = @FLAG_M32@ -g
 
 AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@
 AM_CFLAGS_PPC64_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC64_LINUX  = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
+AM_CCASFLAGS_PPC64_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_ARM_LINUX   = @FLAG_M32@
 AM_CFLAGS_ARM_LINUX       = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
                                $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
-AM_CCASFLAGS_ARM_LINUX    = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
+AM_CCASFLAGS_ARM_LINUX    = @FLAG_M32@ \
                                -marm -mcpu=cortex-a8 -g
 
 AM_FLAG_M3264_X86_DARWIN = -arch i386
@@ -169,17 +161,17 @@ AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
                                -mmacosx-version-min=10.5 \
                                -fno-stack-protector -fno-pic -fno-PIC
 
-AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g
+AM_CCASFLAGS_X86_DARWIN  = -arch i386 -g
 
 AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
 AM_CFLAGS_AMD64_DARWIN     = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
                            -mmacosx-version-min=10.5 -fno-stack-protector
-AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g
+AM_CCASFLAGS_AMD64_DARWIN  = -arch x86_64 -g
 
 AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@
 AM_CFLAGS_S390X_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_S390X_LINUX  = $(AM_CPPFLAGS_S390X_LINUX) -mzarch -march=z900 \
-                            @FLAG_M64@ -g
+AM_CCASFLAGS_S390X_LINUX  = @FLAG_M64@ -g -mzarch -march=z900
+
 
 # Flags for the primary target.  These must be used to build the
 # regtests and performance tests.  In fact, these must be used to

diff --git a/Makefile.am b/Makefile.am
index f91200a23ee19d9bc3c39ec46cf7f1938080a7eb..30507f1688bce0db3d9274751a5c545215ed57ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-AUTOMAKE_OPTIONS = foreign 1.7 dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
 
 include $(top_srcdir)/Makefile.all.am 
 

diff --git a/NEWS b/NEWS
index fdf661e5f4dae2d48b9af924e16c7771c07e1fc7..7fbeddf26a11401992b69bcdd6ba37feb0bc9d61 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,7 @@ To see details of a given bug, visit
 https://bugs.kde.org/show_bug.cgi?id=XXXXXX
 where XXXXXX is the bug number as listed below.
 
+197914  Building valgrind from svn now requires automake-1.10
 247386  make perf does not run all performance tests
 270006  Valgrind scheduler unfair 
 270796  s390x: Removed broken support for the TS insn

diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index 1dafb0a656f6a35cd52a908331bc37e157b75693..e21d52d5c3385ce4e580422cd8283149b480ddae 100644 (file)
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -30,5 +30,4 @@ myprint_so_LDFLAGS    = $(AM_CFLAGS) -dynamic -dynamiclib -all_load -fpic
 else
 myprint_so_LDFLAGS     = $(AM_CFLAGS) -shared -fPIC
 endif
-myprint_so_SOURCES     = myprint.c     # Only needed for automake-1.7.
 myprint_so_CFLAGS      = $(AM_CFLAGS) -fPIC

diff --git a/exp-sgcheck/tests/Makefile.am b/exp-sgcheck/tests/Makefile.am
index 74a0e57edebeea5079edf2c2b571430afd239cb5..30dab91a2f6c30f8a44b1046048af298c2ec060d 100644 (file)
--- a/exp-sgcheck/tests/Makefile.am
+++ b/exp-sgcheck/tests/Makefile.am
@@ -56,7 +56,6 @@ else
                                -Wl,-rpath,$(top_builddir)/memcheck/tests
 endif
 
-preen_invars_so_so_SOURCES      = preen_invars_so.c    # For automake-1.7.
 preen_invars_so_so_CFLAGS       = $(AM_CFLAGS) -fpic
 if VGCONF_OS_IS_DARWIN
  preen_invars_so_so_LDFLAGS     = -fpic $(AM_FLAG_M3264_PRI) -dynamic \