Arch-abstraction:

- previous Cachegrind rearrangement broke "make distcheck";  this commit
  fixed it again.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2699

diff --git a/Makefile.tool-flags.am b/Makefile.tool-flags.am
index d96294931f582a3f41af59073964174050dbfb08..90de4dc18a99232e58bd34e05f79c28b83e5ceea 100644 (file)
--- a/Makefile.tool-flags.am
+++ b/Makefile.tool-flags.am
@@ -1,8 +1,7 @@
 ## Need $(top_builddir)/include because tool.h is built from tool.h.base;
 ## otherwise it will not work if builddir != srcdir.
 add_includes = -I$(top_builddir)/include -I$(top_srcdir)/include \
-               -I$(top_srcdir)/include/$(VG_ARCH) \
-               -I./$(VG_ARCH)
+               -I$(top_srcdir)/include/$(VG_ARCH)
 
 AM_CPPFLAGS = $(add_includes)
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 69a264390e1d4ff2ff5b5b270584cf7a6ef420d2..9d658d54e2540e8a01d40d61e44245fefc7a9792 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -5,6 +5,8 @@ include $(top_srcdir)/Makefile.tool-inplace.am
 
 SUBDIRS = $(VG_ARCH) . tests docs
 
+AM_CPPFLAGS += -I$(top_srcdir)/cachegrind/$(VG_ARCH)
+
 bin_SCRIPTS = cg_annotate
 
 EXTRA_DIST = cg_sim.c 

diff --git a/cachegrind/x86/Makefile.am b/cachegrind/x86/Makefile.am
index 93a20d280246f212e110e82b30f9bb4e1d828328..5c07f3961208e342aa1a9c95438112f0a819608c 100644 (file)
--- a/cachegrind/x86/Makefile.am
+++ b/cachegrind/x86/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.tool-flags.am
 
-AM_CPPFLAGS += -I..
+AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
 
 noinst_LIBRARIES = libcgarch.a