Reinstated Cachegrind.  Seems to be working ok -- numbers compare pretty
well with those for the CVS version... the I1 accesses are noticeably
higher, but everything else is nearly the same.

There's some ugliness in spots, partly due to shortcomings with Vex.  And
CPUID auto-detection is currently disabled, because cpuid is disabled in
general.




git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3389 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 3fcc289..67684ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,15 +7,11 @@
 ## addrcheck must come after memcheck, for mac_*.o
 TOOLS =		memcheck \
 		addrcheck \
-		none \
-		lackey \
+		cachegrind \
 		corecheck \
-		massif
-
-#		memcheck \
-#		addrcheck \
-#		cachegrind
-
+		massif \
+		lackey \
+		none
 
 SUBDIRS = 	include coregrind . docs tests auxprogs $(TOOLS)
 DIST_SUBDIRS =	$(SUBDIRS) helgrind