[API-NEXT,01/15] merge fix: platform/linux-generic/Makefile.am

Message ID 20170127142921.29029-2-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 platform/linux-generic/Makefile.am | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index e791603c..90024bda 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -20,11 +20,6 @@  odpinclude_HEADERS = \
 		  $(srcdir)/include/odp/visibility_begin.h \
 		  $(srcdir)/include/odp/visibility_end.h
 
-odpincludedir= $(includedir)/odp
-odpinclude_HEADERS = \
-		  $(srcdir)/include/odp/visibility_begin.h \
-		  $(srcdir)/include/odp/visibility_end.h
-
 odpapiincludedir= $(includedir)/odp/api
 odpapiinclude_HEADERS = \
 		  $(srcdir)/include/odp/api/align.h \
@@ -110,7 +105,6 @@  odpapiplatinclude_HEADERS = \
 
 odpdrvincludedir = $(includedir)/odp/drv
 odpdrvinclude_HEADERS = \
-<<<<<<< HEAD
 		  $(srcdir)/include/odp/drv/align.h \
 		  $(srcdir)/include/odp/drv/atomic.h \
 		  $(srcdir)/include/odp/drv/barrier.h \
@@ -127,22 +121,17 @@  odpdrvplatinclude_HEADERS = \
 		  $(srcdir)/include/odp/drv/plat/atomic_types.h \
 		  $(srcdir)/include/odp/drv/plat/barrier_types.h \
 		  $(srcdir)/include/odp/drv/plat/byteorder_types.h \
+		  $(srcdir)/include/odp/drv/compiler.h \
 		  $(srcdir)/include/odp/drv/plat/driver_types.h \
 		  $(srcdir)/include/odp/drv/plat/shm_types.h \
 		  $(srcdir)/include/odp/drv/plat/spinlock_types.h \
 		  $(srcdir)/include/odp/drv/plat/strong_types.h
-=======
-		  $(srcdir)/include/odp/drv/compiler.h
->>>>>>> v1.13.0.0
 
 noinst_HEADERS = \
 		  ${srcdir}/include/_fdserver_internal.h \
 		  ${srcdir}/include/_ishm_internal.h \
 		  ${srcdir}/include/_ishmphy_internal.h \
-<<<<<<< HEAD
 		  ${srcdir}/include/_ishmpool_internal.h \
-=======
->>>>>>> v1.13.0.0
 		  ${srcdir}/include/odp_align_internal.h \
 		  ${srcdir}/include/odp_atomic_internal.h \
 		  ${srcdir}/include/odp_buffer_inlines.h \
@@ -188,11 +177,8 @@  __LIB__libodp_linux_la_SOURCES = \
 			   _fdserver.c \
 			   _ishm.c \
 			   _ishmphy.c \
-<<<<<<< HEAD
 			   _ishmpool.c \
 			   _modules.c \
-=======
->>>>>>> v1.13.0.0
 			   odp_atomic.c \
 			   odp_barrier.c \
 			   odp_bitmap.c \