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/tests/Makefile.am b/tests/Makefile.am
index c498095..8897d82 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,8 +5,10 @@
 	vg_regtest \
 	filter_addresses \
 	filter_discards \
+	filter_libc \
 	filter_numbers \
 	filter_stderr_basic \
+	filter_sink \
 	filter_test_paths
 
 EXTRA_DIST = $(noinst_SCRIPTS)
@@ -22,6 +24,7 @@
 # generic C ones
 cputest_SOURCES 	= cputest.c
 cputest_CFLAGS  	= $(AM_CFLAGS) -D__$(VG_ARCH)__
+cputest_DEPENDENCIES	= 
+cputest_LDADD		= 
 toobig_allocs_SOURCES	= toobig-allocs.c
 true_SOURCES 		= true.c
-