From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Sat, 11 Sep 2004 18:27:43 +0000 (+0000)
Subject: Arch-abstraction:
X-Git-Tag: svn/VALGRIND_3_0_0~1586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bfdfff36c24c651190160569f71b5140f221c5e;p=thirdparty%2Fvalgrind.git

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 d96294931f..90de4dc18a 100644
--- 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 69a264390e..9d658d54e2 100644
--- 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 93a20d2802..5c07f39612 100644
--- 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