Complete restructuring of include/ directory -- I forgot about the ARM
stuff.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3734 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/Makefile.am b/include/Makefile.am
index 50dffc7..a2a059c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -20,8 +20,10 @@
valgrind.h \
vki-linux.h \
vki-amd64-linux.h \
+ vki-arm-linux.h \
vki-x86-linux.h \
vki_posixtypes-amd64-linux.h \
+ vki_posixtypes-arm-linux.h \
vki_posixtypes-x86-linux.h
BUILT_SOURCES = valgrind.h
diff --git a/include/arm-linux/Makefile.am b/include/arm-linux/Makefile.am
deleted file mode 100644
index ccd9861..0000000
--- a/include/arm-linux/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-incincdir = $(includedir)/valgrind/arm-linux
-
-incinc_HEADERS = \
- vki_arch.h \
- vki_arch_posixtypes.h
diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore
deleted file mode 100644
index 3dda729..0000000
--- a/include/linux/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
deleted file mode 100644
index 4db7837..0000000
--- a/include/linux/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-incincdir = $(includedir)/valgrind/linux
-
-incinc_HEADERS = vki.h
-
diff --git a/include/arm-linux/vki_arch.h b/include/vki-arm-linux.h
similarity index 98%
rename from include/arm-linux/vki_arch.h
rename to include/vki-arm-linux.h
index c477efd..a820a17 100644
--- a/include/arm-linux/vki_arch.h
+++ b/include/vki-arm-linux.h
@@ -1,6 +1,6 @@
/*--------------------------------------------------------------------*/
-/*--- ARM/Linux-specific kernel interface. arm-linux/vki_arch.h ---*/
+/*--- ARM/Linux-specific kernel interface. vki-arm-linux.h ---*/
/*--------------------------------------------------------------------*/
/*
@@ -28,8 +28,8 @@
The GNU General Public License is contained in the file COPYING.
*/
-#ifndef __ARM_LINUX_VKI_ARCH_H
-#define __ARM_LINUX_VKI_ARCH_H
+#ifndef __VKI_ARM_LINUX_H
+#define __VKI_ARM_LINUX_H
// ARM can be big or little endian; we're only supporting little endian.
#define VKI_LITTLE_ENDIAN 1
@@ -613,7 +613,7 @@
// And that's it!
//----------------------------------------------------------------------
-#endif // __ARM_LINUX_VKI_ARCH_H
+#endif // __VKI_ARM_LINUX_H
/*--------------------------------------------------------------------*/
/*--- end ---*/
diff --git a/include/arm-linux/vki_arch_posixtypes.h b/include/vki_posixtypes-arm-linux.h
similarity index 91%
rename from include/arm-linux/vki_arch_posixtypes.h
rename to include/vki_posixtypes-arm-linux.h
index 5218152..de445f8 100644
--- a/include/arm-linux/vki_arch_posixtypes.h
+++ b/include/vki_posixtypes-arm-linux.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------*/
/*--- ARM/Linux-specific kernel interface: posix types. ---*/
-/*--- arm-linux/vki_arch_posixtypes.h ---*/
+/*--- vki_posixtypes-arm-linux.h ---*/
/*--------------------------------------------------------------------*/
/*
@@ -29,8 +29,8 @@
The GNU General Public License is contained in the file COPYING.
*/
-#ifndef __ARM_LINUX_VKI_ARCH_POSIXTYPES_H
-#define __ARM_LINUX_VKI_ARCH_POSIXTYPES_H
+#ifndef __VKI_POSIXTYPES_ARM_LINUX_H
+#define __VKI_POSIXTYPES_ARM_LINUX_H
//----------------------------------------------------------------------
// From linux-2.6.8.1/include/asm-i386/posix_types.h
@@ -61,7 +61,7 @@
int val[2];
} __vki_kernel_fsid_t;
-#endif // __ARM_LINUX_VKI_ARCH_POSIXTYPES_H
+#endif // __VKI_POSIXTYPES_ARM_LINUX_H
/*--------------------------------------------------------------------*/
/*--- end ---*/