[10/29] include: install and use ABI headers only in ABI-compat mode

Message ID 20171023111057.6328-11-dmitry.ereminsolenikov@linaro.org
State Superseded
Headers show
Series
  • restructure headers for ABI-compat/platform-optimized modes
Related show

Commit Message

Dmitry Eremin-Solenikov Oct. 23, 2017, 11:10 a.m.
There is no need to install ABI headers (or to have them in include
path) in non-ABI-compat mode, they should not be used at all. Still
provide default ABI headers, because platform may depend on them.

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

---
 Makefile.inc        | 6 +++++-
 include/Makefile.am | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

-- 
2.14.2

Patch

diff --git a/Makefile.inc b/Makefile.inc
index 10e4041fe662..11fc7c759c85 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,9 +3,13 @@  ODP_INCLUDES = \
 	-I$(top_srcdir)/platform/@with_platform@/include \
 	-I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \
 	-I$(top_builddir)/include \
-	-I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \
 	-I$(top_srcdir)/include
 
+if ODP_ABI_COMPAT
+ODP_INCLUDES += \
+	-I$(top_srcdir)/include/odp/arch/@ARCH_ABI@
+endif
+
 HELPER_INCLUDES = \
 	-I$(top_srcdir)/helper/include
 
diff --git a/include/Makefile.am b/include/Makefile.am
index d841e65b8795..9437f5f68d5a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -110,6 +110,9 @@  odpapiabidefaultinclude_HEADERS = \
 	odp/api/abi-default/queue.h \
 	odp/api/abi-default/shared_memory.h
 
+# Insall ABI headers only if required
+if ODP_ABI_COMPAT
+
 odpapiabiarchincludedir= $(includedir)/odp/api/abi
 if ARCH_IS_ARM
 odpapiabiarchinclude_HEADERS = \
@@ -321,6 +324,7 @@  odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \
 	odp/arch/x86_64-linux/odp/api/abi/version.h
 endif
+endif # ODP_ABI_COMPAT
 
 # Rerefence all nodist_*_HEADERS here
 .PHONY: $(nodist_odpapispecinclude_HEADERS)