[v10,09/30] include: install ABI headers without additional ARCH_ABI level

Message ID 20171027125014.27313-10-dmitry.ereminsolenikov@linaro.org
State Accepted
Commit 96874082fe02560068588af59817fa2152982638
Headers show
Series
  • restructure headers for ABI-compat/platform-optimized modes
Related show

Commit Message

Dmitry Eremin-Solenikov Oct. 27, 2017, 12:49 p.m.
Install ABI headers directly to odp/api/abi, removing the need for extra
symlink.

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

---
 include/Makefile.am | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

-- 
2.14.2

Patch

diff --git a/include/Makefile.am b/include/Makefile.am
index 5328133dd4e4..d841e65b8795 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -110,7 +110,7 @@  odpapiabidefaultinclude_HEADERS = \
 	odp/api/abi-default/queue.h \
 	odp/api/abi-default/shared_memory.h
 
-odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi
+odpapiabiarchincludedir= $(includedir)/odp/api/abi
 if ARCH_IS_ARM
 odpapiabiarchinclude_HEADERS = \
 	odp/arch/arm32-linux/odp/api/abi/atomic.h \
@@ -322,16 +322,6 @@  odpapiabiarchinclude_HEADERS = \
 	odp/arch/x86_64-linux/odp/api/abi/version.h
 endif
 
-# Create symlink for ABI header files. Application does not need to use the arch
-# specific include path for installed files.
-install-data-hook:
-	if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \
-		: ; \
-	else \
-		$(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \
-			$(DESTDIR)$(prefix)/include/odp/api/abi; \
-	fi
-
 # Rerefence all nodist_*_HEADERS here
 .PHONY: $(nodist_odpapispecinclude_HEADERS)
 $(nodist_odpapispecinclude_HEADERS):