Build vg_replace_malloc.c into a library, because it makes the Makefiles a bit
neater. Also remove some dodgy CFLAGS+= lines.
I had to change the expected output of pth_once.c, because the change has
altered the order of the (non-deterministic) output.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2825 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/massif/Makefile.am b/massif/Makefile.am
index 620c4f1..3dcf96f 100644
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -8,7 +8,10 @@
vgskin_massif_so_LDFLAGS = -shared
vgpreload_massif_so_SOURCES =
-vgpreload_massif_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
+vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
+vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
+ -Wl,--whole-archive \
+ $(top_builddir)/coregrind/lib_replace_malloc.a \
+ -Wl,--no-whole-archive
+