[v4,16/20] include: include all ABI files into distribution

Message ID	1507316415-2144-17-git-send-email-odpbot@yandex.ru
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; From: Github ODP bot <odpbot@yandex.ru> To: lng-odp@lists.linaro.org Date: Fri, 6 Oct 2017 22:00:11 +0300 Message-Id: <1507316415-2144-17-git-send-email-odpbot@yandex.ru> In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v4 16/20] include: include all ABI files into distribution Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>
Series	[v4,1/20] .gitignore: ignore only libtool m4 files \| expand [v4,1/20] .gitignore: ignore only libtool m4 files [v4,2/20] m4: move openssl check to common place [v4,3/20] m4: move timer_create check to common place [v4,4/20] m4: move -fvisibility=hidden check to separate file [v4,5/20] m4: move atomic checks to separate file [v4,6/20] example: switch odp_l3fwd from test_debug.h to example_debug.h [v4,8/20] test: move run-test script to test_common dir [v4,9/20] test: move common validation tests handling to theirs own Makefile.am [v4,10/20] test: linux-gen: move platform-specific tests to platform directory [v4,11/20] test: move test_debug.h to test_common [v4,12/20] test: drop now-unused common_plat directory [v4,13/20] linux-gen: move libodp-linux.pc.in to platform directory [v4,14/20] helper: move libodphelper.pc.in to helper directory [v4,15/20] build: move handling of include files to include dir [v4,16/20] include: include all ABI files into distribution [v4,17/20] linux-gen: drop unnecessary srcdir from Makefile.am [v4,18/20] linux-gen: stop including autogenerated header into distribution [v4,19/20] example: simplify Makefile.am's [v4,20/20] helper: simplify Makefile.am's

Message ID

1507316415-2144-17-git-send-email-odpbot@yandex.ru

State

New

Headers

Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org
	designates 54.225.227.206 as permitted sender)
	client-ip=54.225.227.206; 
From: Github ODP bot <odpbot@yandex.ru>
To: lng-odp@lists.linaro.org
Date: Fri,  6 Oct 2017 22:00:11 +0300
Message-Id: <1507316415-2144-17-git-send-email-odpbot@yandex.ru>
In-Reply-To: <1507316415-2144-1-git-send-email-odpbot@yandex.ru>
References: <1507316415-2144-1-git-send-email-odpbot@yandex.ru>
Github-pr-num: 213
Subject: [lng-odp] [PATCH v4 16/20] include: include all ABI files into
	distribution
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Series

[v4,1/20] .gitignore: ignore only libtool m4 files | expand

Commit Message

Github ODP bot Oct. 6, 2017, 7 p.m. UTC

From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Due to the way Automake interacts with autoconf substitutions, ODP
tarballs included ABI headers only for the current directory. Include
all ABI headers into tarball.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 213 (lumag:plat-def)
 ** https://github.com/Linaro/odp/pull/213
 ** Patch: https://github.com/Linaro/odp/pull/213.patch
 ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68
 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383
 **/
 configure.ac        |  2 ++
 include/Makefile.am | 73 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3209ade8b..e5bbccb31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,8 @@  AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"])
 AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"])
 AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"])
 AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"])
+AM_CONDITIONAL([ARCH_IS_X86_32], [test "x${ARCH_ABI}" = "xx86_32-linux"])
+AM_CONDITIONAL([ARCH_IS_X86_64], [test "x${ARCH_ABI}" = "xx86_64-linux"])
 
 ##########################################################################
 # Setup doxygen documentation
diff --git a/include/Makefile.am b/include/Makefile.am
index 236c4c375..a3a7e1658 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -61,15 +61,72 @@  odpapiabidefaultinclude_HEADERS = \
 	odp/arch/default/api/abi/shared_memory.h
 
 odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi
+if ARCH_IS_ARM
 odpapiabiarchinclude_HEADERS = \
-	odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/event.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \
-	odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h
+	odp/arch/arm32-linux/odp/api/abi/buffer.h \
+	odp/arch/arm32-linux/odp/api/abi/classification.h \
+	odp/arch/arm32-linux/odp/api/abi/crypto.h \
+	odp/arch/arm32-linux/odp/api/abi/event.h \
+	odp/arch/arm32-linux/odp/api/abi/packet.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
+endif
+if ARCH_IS_AARCH64
+odpapiabiarchinclude_HEADERS = \
+	odp/arch/arm64-linux/odp/api/abi/buffer.h \
+	odp/arch/arm64-linux/odp/api/abi/classification.h \
+	odp/arch/arm64-linux/odp/api/abi/crypto.h \
+	odp/arch/arm64-linux/odp/api/abi/event.h \
+	odp/arch/arm64-linux/odp/api/abi/packet.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
+endif
+if ARCH_IS_MIPS64
+odpapiabiarchinclude_HEADERS = \
+	odp/arch/mips64-linux/odp/api/abi/buffer.h \
+	odp/arch/mips64-linux/odp/api/abi/classification.h \
+	odp/arch/mips64-linux/odp/api/abi/crypto.h \
+	odp/arch/mips64-linux/odp/api/abi/event.h \
+	odp/arch/mips64-linux/odp/api/abi/packet.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
+endif
+if ARCH_IS_POWERPC
+odpapiabiarchinclude_HEADERS = \
+	odp/arch/power64-linux/odp/api/abi/buffer.h \
+	odp/arch/power64-linux/odp/api/abi/classification.h \
+	odp/arch/power64-linux/odp/api/abi/crypto.h \
+	odp/arch/power64-linux/odp/api/abi/event.h \
+	odp/arch/power64-linux/odp/api/abi/packet.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
+endif
+if ARCH_IS_X86_32
+odpapiabiarchinclude_HEADERS = \
+	odp/arch/x86_32-linux/odp/api/abi/buffer.h \
+	odp/arch/x86_32-linux/odp/api/abi/classification.h \
+	odp/arch/x86_32-linux/odp/api/abi/crypto.h \
+	odp/arch/x86_32-linux/odp/api/abi/event.h \
+	odp/arch/x86_32-linux/odp/api/abi/packet.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
+endif
+if ARCH_IS_X86_64
+odpapiabiarchinclude_HEADERS = \
+	odp/arch/x86_64-linux/odp/api/abi/buffer.h \
+	odp/arch/x86_64-linux/odp/api/abi/classification.h \
+	odp/arch/x86_64-linux/odp/api/abi/crypto.h \
+	odp/arch/x86_64-linux/odp/api/abi/event.h \
+	odp/arch/x86_64-linux/odp/api/abi/packet.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
+endif
 
 # Create symlink for ABI header files. Application does not need to use the arch
 # specific include path for installed files.