linux-gen, include: switch version.h to api+abi

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

11 files changed, 72 insertions, 15 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 8348f019e..360154914 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -68,7 +68,8 @@ odpapiabidefaultinclude_HEADERS = \
 	odp/api/abi-default/packet_io.h \
 	odp/api/abi-default/pool.h \
 	odp/api/abi-default/queue.h \
-	odp/api/abi-default/shared_memory.h
+	odp/api/abi-default/shared_memory.h \
+	odp/api/abi-default/version.h
 
 # Insall ABI headers only if required
 if ODP_ABI_COMPAT
@@ -88,7 +89,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/arm32-linux/odp/api/abi/packet_io.h \
 	odp/arch/arm32-linux/odp/api/abi/pool.h \
 	odp/arch/arm32-linux/odp/api/abi/queue.h \
-	odp/arch/arm32-linux/odp/api/abi/shared_memory.h
+	odp/arch/arm32-linux/odp/api/abi/shared_memory.h \
+	odp/arch/arm32-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_AARCH64
 odpapiabiarchinclude_HEADERS = \
@@ -104,7 +106,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/arm64-linux/odp/api/abi/packet_io.h \
 	odp/arch/arm64-linux/odp/api/abi/pool.h \
 	odp/arch/arm64-linux/odp/api/abi/queue.h \
-	odp/arch/arm64-linux/odp/api/abi/shared_memory.h
+	odp/arch/arm64-linux/odp/api/abi/shared_memory.h \
+	odp/arch/arm64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_MIPS64
 odpapiabiarchinclude_HEADERS = \
@@ -120,7 +123,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/mips64-linux/odp/api/abi/packet_io.h \
 	odp/arch/mips64-linux/odp/api/abi/pool.h \
 	odp/arch/mips64-linux/odp/api/abi/queue.h \
-	odp/arch/mips64-linux/odp/api/abi/shared_memory.h
+	odp/arch/mips64-linux/odp/api/abi/shared_memory.h \
+	odp/arch/mips64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_POWERPC
 odpapiabiarchinclude_HEADERS = \
@@ -136,7 +140,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/power64-linux/odp/api/abi/packet_io.h \
 	odp/arch/power64-linux/odp/api/abi/pool.h \
 	odp/arch/power64-linux/odp/api/abi/queue.h \
-	odp/arch/power64-linux/odp/api/abi/shared_memory.h
+	odp/arch/power64-linux/odp/api/abi/shared_memory.h \
+	odp/arch/power64-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_X86_32
 odpapiabiarchinclude_HEADERS = \
@@ -152,7 +157,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_32-linux/odp/api/abi/packet_io.h \
 	odp/arch/x86_32-linux/odp/api/abi/pool.h \
 	odp/arch/x86_32-linux/odp/api/abi/queue.h \
-	odp/arch/x86_32-linux/odp/api/abi/shared_memory.h
+	odp/arch/x86_32-linux/odp/api/abi/shared_memory.h \
+	odp/arch/x86_32-linux/odp/api/abi/version.h
 endif
 if ARCH_IS_X86_64
 odpapiabiarchinclude_HEADERS = \
@@ -168,7 +174,8 @@ odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_64-linux/odp/api/abi/packet_io.h \
 	odp/arch/x86_64-linux/odp/api/abi/pool.h \
 	odp/arch/x86_64-linux/odp/api/abi/queue.h \
-	odp/arch/x86_64-linux/odp/api/abi/shared_memory.h
+	odp/arch/x86_64-linux/odp/api/abi/shared_memory.h \
+	odp/arch/x86_64-linux/odp/api/abi/version.h
 endif
 endif # ODP_ABI_COMPAT
 
diff --git a/platform/linux-generic/include/odp/api/plat/version_types.h b/include/odp/api/abi-default/version.h
index e3327eb33..0f48ecc16 100644
--- a/platform/linux-generic/include/odp/api/plat/version_types.h
+++ b/include/odp/api/abi-default/version.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#ifndef ODP_VERSION_TYPESH_
-#define ODP_VERSION_TYPESH_
+#ifndef ODP_ABI_VERSION_H_
+#define ODP_ABI_VERSION_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 6bed8d9d4..646436055 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -99,8 +99,7 @@ odpapiplatinclude_HEADERS = \
 		  include/odp/api/plat/ticketlock_types.h \
 		  include/odp/api/plat/time_types.h \
 		  include/odp/api/plat/timer_types.h \
-		  include/odp/api/plat/traffic_mngr_types.h \
-		  include/odp/api/plat/version_types.h
+		  include/odp/api/plat/traffic_mngr_types.h
 
 nodist_odpapiplatinclude_HEADERS = \
 		  include/odp/api/plat/static_inline.h
@@ -118,7 +117,8 @@ odpapiabiarchinclude_HEADERS = \
 		  include-abi/odp/api/abi/ipsec.h \
 		  include-abi/odp/api/abi/packet_io.h \
 		  include-abi/odp/api/abi/queue.h \
-		  include-abi/odp/api/abi/shared_memory.h
+		  include-abi/odp/api/abi/shared_memory.h \
+		  include-abi/odp/api/abi/version.h
 endif
 
 noinst_HEADERS = \
diff --git a/platform/linux-generic/include-abi/odp/api/abi/version.h b/platform/linux-generic/include-abi/odp/api/abi/version.h
new file mode 100644
index 000000000..b36d53958
--- /dev/null
+++ b/platform/linux-generic/include-abi/odp/api/abi/version.h
@@ -0,0 +1,7 @@
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/platform/linux-generic/include/odp/api/version.h b/platform/linux-generic/include/odp/api/version.h
index fc4ea5865..35c844e70 100644
--- a/platform/linux-generic/include/odp/api/version.h
+++ b/platform/linux-generic/include/odp/api/version.h
@@ -10,14 +10,15 @@
  * ODP version
  */
 
-#ifndef ODP_PLAT_VERSION_H_
-#define ODP_PLAT_VERSION_H_
+#ifndef ODP_API_VERSION_H_
+#define ODP_API_VERSION_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <odp/api/plat/version_types.h>
+#include <odp/api/abi/version.h>
+
 #include <odp/api/spec/version.h>
 
 #ifdef __cplusplus