Applied patch from Simon Hausmann <hausmann@kde.org> to enable automake1.5

compilation, except for the use of $(EXEEXT) which generates annoying warnings.

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

diff --git a/ChangeLog b/ChangeLog
index 68e75b3f5fdf12947d82f5cb3ad024704ccf728d..ba6f2616f2f1bd739ec8919ef385ae936f67bf1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-26  Simon Hausmann <hausmann@kde.org>
+
+       * configure.in: Substitute AS and ASFLAGS.
+       * demangle/Makefile.am: Don't use INCLUDES += when it's the first
+       assignment to it.
+       * Makefile.am: Don't use INCLUDES += when it's the first assignment to
+       it. Use $(EXEEXT) for the explicit valgrin[d,q].so targets.
+
 2002-03-24  Frederic Gobry  <gobry@puck.ch>
 
        * Makefile.am: added a bzdist target that creates a bzip2 archive

diff --git a/Makefile.am b/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/configure.in b/configure.in
index 270e856ed84828734105fde7b5077d0b6a091bcb..b8cd6cb8e30015f3b61cf417bcbf29e033d1cfff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,11 @@ if test "${GCC}" != "yes" ; then
    AC_MSG_ERROR([Valgrind relies on GCC to be compiled])
 fi
 
+AS="${CC}"
+AC_SUBST(AS)
+ASFLAGS=""
+AC_SUBST(ASFLAGS)
+
 # We don't want gcc 2.7
 AC_MSG_CHECKING([for a supported version of gcc])
 

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index b0bf9021ad26cd190d57a5646ef86b761a04f50e..070eacddab004218a2a6023ac92eccf56fa0e8f7 100644 (file)
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES += -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = \
        ansidecl.h     \
-        dyn-string.h   \
-        demangle.h     \
-        safe-ctype.h 
+       dyn-string.h   \
+       demangle.h     \
+       safe-ctype.h 
 
 noinst_LIBRARIES = libdemangle.a
 

diff --git a/demangle/Makefile.am b/demangle/Makefile.am
index b0bf9021ad26cd190d57a5646ef86b761a04f50e..070eacddab004218a2a6023ac92eccf56fa0e8f7 100644 (file)
--- a/demangle/Makefile.am
+++ b/demangle/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES += -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = \
        ansidecl.h     \
-        dyn-string.h   \
-        demangle.h     \
-        safe-ctype.h 
+       dyn-string.h   \
+       demangle.h     \
+       safe-ctype.h 
 
 noinst_LIBRARIES = libdemangle.a
 

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind
 

diff --git a/none/Makefile.am b/none/Makefile.am
index 0bdc471f30326f7343a51eb9b6139ece1f936641..95255d7a3718eb629a170bb3c9454f5cf99ef3f6 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -4,7 +4,7 @@ valdir = $(libdir)/valgrind
 
 LDFLAGS = -Wl,-z -Wl,initfirst
 
-INCLUDES += -I$(srcdir)/demangle
+INCLUDES = -I$(srcdir)/demangle
 
 bin_SCRIPTS = valgrind