Reuse (shared) cachegrind source files in callgrind directly.
The callgrind Makefile.am had a common sources list that included
../cachegrind/cg_arch.c. This doesn't play well with automake and
subdir-objects. Especially make distclean was broken because some
.deps files were removed multiple times.
Just include the shared source file directly into the callgrind
source file that needs it (cg_arch.c in sim.c).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13528 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/Makefile.am b/callgrind/Makefile.am
index 2953aa0..56e8a04 100644
--- a/callgrind/Makefile.am
+++ b/callgrind/Makefile.am
@@ -44,9 +44,9 @@
jumps.c \
main.c \
sim.c \
- threads.c \
- ../cachegrind/cg_arch.c
+ threads.c
+# We sneakily include "cg_branchpred.c" and "cg_arch.c" from cachegrind
CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \