some workarounds for newer automake
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@70 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/ChangeLog b/ChangeLog
index e690235..7fadf5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-15 Dirk Mueller <dmuell@gmx.net>
+
+ * Makefile.am: use $(EXEEXT) to shut up newer automake versions.
+ Of course this is ugly and unportable, but it works for valgrind..
+ ($(EXEEXT) is always empty on unix platforms)
+
+ * configure.in: Use AM_PROG_AS (required with automake 1.6,
+ works with automake 1.5 and newer) instead of selfhacking.
+
2002-04-04 Frédéric Gobry <frederic.gobry@smartdata.ch>
* configure.in, glibc-*.supp, xfree-*.supp: now, configure
diff --git a/Makefile.am b/Makefile.am
index c31f9dc..89aeffd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index c31f9dc..89aeffd 100644
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index c31f9dc..89aeffd 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/configure.in b/configure.in
index 1c77f23..68e5311 100644
--- a/configure.in
+++ b/configure.in
@@ -18,12 +18,15 @@
AC_MSG_ERROR([Valgrind relies on GCC to be compiled])
fi
+# some older automake's don't have it so try something on our own
+ifdef([AM_PROG_AS],[AM_PROG_AS],
+[
AS="${CC}"
AC_SUBST(AS)
ASFLAGS=""
AC_SUBST(ASFLAGS)
-
+])
# This variable will collect the individual suppression files
# depending on the results of autoconf
diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index c31f9dc..89aeffd 100644
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c31f9dc..89aeffd 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index c31f9dc..89aeffd 100644
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index c31f9dc..89aeffd 100644
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index c31f9dc..89aeffd 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook:
diff --git a/none/Makefile.am b/none/Makefile.am
index c31f9dc..89aeffd 100644
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -81,14 +81,14 @@
vg_clientmalloc.o: vg_clientmalloc.c $(MANUAL_DEPS)
$(COMPILE) -fno-omit-frame-pointer -c $<
-valgrind.so: $(valgrind_so_OBJECTS)
+valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
-valgrinq.so: $(valgrinq_so_OBJECTS)
+valgrinq.so$(EXEEXT): $(valgrinq_so_OBJECTS)
$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)
-libpthread.so: $(libpthread_so_OBJECTS)
+libpthread.so$(EXEEXT): $(libpthread_so_OBJECTS)
$(CC) -Wall -g -O -shared -fpic -o libpthread.so $(libpthread_so_OBJECTS)
install-exec-hook: