Reinstate lackey, corecheck, massif.  They all start and run, but
massif gets a segfault for some reason.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3285 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 9a0ea4a..315e219 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,15 @@
 
 ## include must be first for tool.h
 ## addrcheck must come after memcheck, for mac_*.o
-#TOOLS =		memcheck \
+TOOLS =		none \
+		lackey \
+		corecheck \
+		massif
+
+#		memcheck \
 #		addrcheck \
-#		cachegrind \
-#		corecheck \
-#		massif \
-#		lackey \
-#		none
-TOOLS =		none
+#		cachegrind
+
 
 SUBDIRS = 	include coregrind . docs tests auxprogs $(TOOLS)
 DIST_SUBDIRS =	$(SUBDIRS) helgrind