Back out r14781, which was unintended.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14782 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 2859abc..d35fd36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,20 +3,18 @@
include $(top_srcdir)/Makefile.all.am
-#TOOLS = memcheck \
-# cachegrind \
-# callgrind \
-# massif \
-# lackey \
-# none \
-# helgrind \
-# drd
-#
-#EXP_TOOLS = exp-sgcheck \
-# exp-bbv \
-# exp-dhat
-TOOLS = none memcheck
-EXP_TOOLS =
+TOOLS = memcheck \
+ cachegrind \
+ callgrind \
+ massif \
+ lackey \
+ none \
+ helgrind \
+ drd
+
+EXP_TOOLS = exp-sgcheck \
+ exp-bbv \
+ exp-dhat
# Put docs last because building the HTML is slow and we want to get
# everything else working before we try it.