Restructured the include/ directory.
- All the subdirectories have gone: arm/, x86/, amd64/, linux/,
x86-linux/, amd64-linux/, arm-linux/.
- The following files were moved out of those directories into include/:
amd64-linux/vki_arch.h --> vki-amd64-linux.h
x86-linux/vki_arch.h --> vki-x86-linux.h
x86-linux/vki_arch_posixtypes.h --> vki_posixtypes-x86-linux.h
linux/vki.h --> vki-linux.h
amd64-linux/vki_arch_posixtypes.h --> vki_posixtypes-amd64-linux.h
- The following very small files were inlined into tool.h using the "#if
defined(VGP_x86)..." technique:
x86/tool_arch.h
arm/tool_arch.h
amd64/tool_arch.h
The same technique was used twice to include the appropriate
vki-$PLATFORM and vki-$OS files into tool.h.
- The other files in those directories were removed.
- The build is much simpler, since we have 7(!) fewer Makefile.am files.
Far fewer -I options are needed when compiling, too.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3733 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.core-AM_CPPFLAGS.am b/Makefile.core-AM_CPPFLAGS.am
index a0b4578..fe9d406 100644
--- a/Makefile.core-AM_CPPFLAGS.am
+++ b/Makefile.core-AM_CPPFLAGS.am
@@ -1,13 +1,12 @@
-add_includes = -I$(top_builddir)/coregrind -I$(top_srcdir)/coregrind \
+# we need $(top_builddir)/include for when builddir != srcdir, because
+# valgrind.h is generated from valgrind.h.in.
+add_includes = -I$(top_srcdir)/coregrind \
-I$(top_srcdir) \
-I$(top_srcdir)/coregrind/$(VG_ARCH) \
- -I$(top_builddir)/coregrind/$(VG_ARCH) \
-I$(top_srcdir)/coregrind/$(VG_OS) \
-I$(top_srcdir)/coregrind/$(VG_PLATFORM) \
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)/include/$(VG_ARCH) \
- -I$(top_srcdir)/include/$(VG_OS) \
- -I$(top_srcdir)/include/$(VG_PLATFORM) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
-I@VEX_DIR@/pub \
-DVGA_$(VG_ARCH)=1 \
-DVGO_$(VG_OS)=1 \