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/include/Makefile.am b/include/Makefile.am
index 9119c44..50dffc7 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,4 @@
-SUBDIRS = $(VG_ARCH) $(VG_OS) $(VG_PLATFORM) .
-DIST_SUBDIRS = $(VG_ARCH_ALL) $(VG_OS_ALL) $(VG_PLATFORM_ALL) .
-
EXTRA_DIST = \
valgrind.h.in \
vg_profile.c
@@ -9,18 +6,23 @@
incincdir = $(includedir)/valgrind
incinc_HEADERS = \
- basic_types.h \
- tool.h \
- tool_asm.h \
- pub_tool_errormgr.h \
- pub_tool_execontext.h \
- pub_tool_hashtable.h \
- pub_tool_mallocfree.h \
- pub_tool_replacemalloc.h\
- pub_tool_skiplist.h \
- pub_tool_stacktrace.h \
- pub_tool_tooliface.h \
- valgrind.h
+ basic_types.h \
+ tool.h \
+ tool_asm.h \
+ pub_tool_errormgr.h \
+ pub_tool_execontext.h \
+ pub_tool_hashtable.h \
+ pub_tool_mallocfree.h \
+ pub_tool_replacemalloc.h \
+ pub_tool_skiplist.h \
+ pub_tool_stacktrace.h \
+ pub_tool_tooliface.h \
+ valgrind.h \
+ vki-linux.h \
+ vki-amd64-linux.h \
+ vki-x86-linux.h \
+ vki_posixtypes-amd64-linux.h \
+ vki_posixtypes-x86-linux.h
BUILT_SOURCES = valgrind.h
CLEANFILES = valgrind.h