Merge r6086:

Makefile.am changes for AIX5.  Almost all boilerplate stuff fitting in
with the existing factorisation scheme.  The only change of interest
is that configure.in now generates automake symbols of name
VGP_platform and VGO_os, whereas previously it just made VG_platform
which was a bit inconsistent with the VGP/VGO/VGA scheme used in C
code.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6242 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/Makefile.am b/include/Makefile.am
index eaa615e..ff430ae 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -28,19 +28,22 @@
 	pub_tool_stacktrace.h 		\
 	pub_tool_threadstate.h 		\
 	pub_tool_tooliface.h 		\
+	pub_tool_vki.h			\
 	pub_tool_vkiscnums.h		\
 	valgrind.h 			\
-	vki/vki-linux.h			\
-	vki/vki-amd64-linux.h		\
-	vki/vki-ppc32-linux.h		\
-	vki/vki-ppc64-linux.h		\
-	vki/vki-x86-linux.h			\
 	vki/vki-linux.h				\
 	vki/vki-posixtypes-amd64-linux.h	\
 	vki/vki-posixtypes-ppc32-linux.h	\
 	vki/vki-posixtypes-ppc64-linux.h	\
 	vki/vki-posixtypes-x86-linux.h		\
+	vki/vki-amd64-linux.h			\
+	vki/vki-ppc32-aix5.h			\
+	vki/vki-ppc64-aix5.h			\
+	vki/vki-ppc32-linux.h			\
+	vki/vki-ppc64-linux.h			\
+	vki/vki-x86-linux.h			\
 	vki/vki-scnums-amd64-linux.h		\
 	vki/vki-scnums-ppc32-linux.h		\
 	vki/vki-scnums-ppc64-linux.h		\
-	vki/vki-scnums-x86-linux.h
+	vki/vki-scnums-x86-linux.h		\
+	vki/vki-scnums-aix5.h