Looks like merge conflict was not cleanly fixed moving
includes from Makefile.am to Makefile.inc. Adding
missed.
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
platform/Makefile.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index e6984cc..ed93483 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -32,15 +32,18 @@ odpapiinclude_HEADERS = \
$(top_srcdir)/include/odp/api/debug.h \
$(top_srcdir)/include/odp/api/errno.h \
$(top_srcdir)/include/odp/api/event.h \
+ $(top_srcdir)/include/odp/api/hash.h \
$(top_srcdir)/include/odp/api/hints.h \
$(top_srcdir)/include/odp/api/init.h \
$(top_srcdir)/include/odp/api/packet.h \
$(top_srcdir)/include/odp/api/packet_flags.h \
$(top_srcdir)/include/odp/api/packet_io.h \
+ $(top_srcdir)/include/odp/api/packet_io_stats.h \
$(top_srcdir)/include/odp/api/pool.h \
$(top_srcdir)/include/odp/api/queue.h \
$(top_srcdir)/include/odp/api/random.h \
$(top_srcdir)/include/odp/api/rwlock.h \
+ $(top_srcdir)/include/odp/api/rwlock_recursive.h \
$(top_srcdir)/include/odp/api/schedule.h \
$(top_srcdir)/include/odp/api/schedule_types.h \
$(top_srcdir)/include/odp/api/shared_memory.h \
@@ -48,6 +51,7 @@ odpapiinclude_HEADERS = \
$(top_srcdir)/include/odp/api/std_types.h \
$(top_srcdir)/include/odp/api/sync.h \
$(top_srcdir)/include/odp/api/system_info.h \
+ $(top_srcdir)/include/odp/api/spinlock_recursive.h \
$(top_srcdir)/include/odp/api/thread.h \
$(top_srcdir)/include/odp/api/thrmask.h \
$(top_srcdir)/include/odp/api/ticketlock.h \
--
1.9.1
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
