Merge in changes from the 2.4.0 line. This basically brings in the
overhaul of the thread support. Many things are now probably broken,
but at least with --tool=none, simple and not-so-simple threaded and
non-thread programs work.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3265 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 48f0475..9a0ea4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,15 +5,17 @@
## include must be first for tool.h
## addrcheck must come after memcheck, for mac_*.o
-SUBDIRS = include coregrind . docs tests auxprogs \
- memcheck \
- addrcheck \
- cachegrind \
- corecheck \
- helgrind \
- massif \
- lackey \
- none
+#TOOLS = memcheck \
+# addrcheck \
+# cachegrind \
+# corecheck \
+# massif \
+# lackey \
+# none
+TOOLS = none
+
+SUBDIRS = include coregrind . docs tests auxprogs $(TOOLS)
+DIST_SUBDIRS = $(SUBDIRS) helgrind
SUPP_FILES = \
glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
@@ -32,7 +34,7 @@
## Preprend @PERL@ because tests/vg_regtest isn't executable
regtest: check
- @PERL@ tests/vg_regtest --all
+ @PERL@ tests/vg_regtest $(TOOLS)
EXTRA_DIST = \
FAQ.txt \
@@ -40,14 +42,12 @@
README_DEVELOPERS \
README_PACKAGERS \
README_MISSING_SYSCALL_OR_IOCTL TODO \
- valgrind.spec.in valgrind.pc.in \
+ valgrind.spec valgrind.spec.in valgrind.pc.in \
Makefile.all.am Makefile.tool.am Makefile.core-AM_CPPFLAGS.am \
Makefile.tool-inplace.am
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(valdir)
- rm -f $(DESTDIR)$(valdir)/libpthread.so.0
- $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
all-local:
mkdir -p $(inplacedir)