diff options
| author | Petri Savolainen <petri.savolainen@linaro.org> | 2018-05-14 16:12:05 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-05-15 16:54:34 +0300 |
| commit | c484446b4930b5398e958f855917d54a97e6f2c7 (patch) | |
| tree | e7ae88da5eed03264fa40422ecaef5a4e2bf8790 /platform/linux-dpdk/Makefile.am | |
| parent | d295255c83cea92e93b1f4e9aa977fa36cfe2d98 (diff) | |
Port 49c671e8, 11207ff1, 3abbe8b7, f49289a7v1.19.0.1_DPDK_17.1
Fix build issues from the latest merge. These commits needed
porting:
49c671e8 odp: pktio: add pcapng capture capabilities
11207ff1 linux-gen: use inlined event type function
3abbe8b7 linux-gen: event: inline event_type function
f49289a7 linux-gen: buffer: remove buffer_inlines header file
Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>i
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'platform/linux-dpdk/Makefile.am')
| -rw-r--r-- | platform/linux-dpdk/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 02c4af66c..6c9c4affe 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -22,8 +22,10 @@ if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ + include/odp/api/plat/buffer_inline_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_inlines_api.h \ + include/odp/api/plat/event_inlines.h \ include/odp/api/plat/packet_flag_inlines.h \ include/odp/api/plat/packet_flag_inlines_api.h \ include/odp/api/plat/packet_inline_types.h \ @@ -82,7 +84,6 @@ noinst_HEADERS = \ arch/odp_arch_time_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_align_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_atomic_internal.h \ - include/odp_buffer_inlines.h \ include/odp_buffer_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_bitmap_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_bitset.h \ @@ -106,6 +107,7 @@ noinst_HEADERS = \ ${top_srcdir}/platform/linux-generic/include/odp_packet_io_ring_internal.h \ ${top_srcdir}/platform/linux-generic/include/odp_packet_socket.h \ ${top_srcdir}/platform/linux-generic/include/odp_packet_null.h \ + ${top_srcdir}/platform/linux-generic/include/odp_pcapng.h \ ${top_srcdir}/platform/linux-generic/include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ @@ -175,6 +177,7 @@ __LIB__libodp_linux_la_SOURCES = \ ../linux-generic/odp_spinlock.c \ ../linux-generic/odp_spinlock_recursive.c \ ../linux-generic/odp_system_info.c \ + ../linux-generic/odp_pcapng.c \ odp_thread.c \ ../linux-generic/odp_thrmask.c \ odp_time.c \ @@ -188,6 +191,7 @@ if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ ../linux-generic/odp_atomic_api.c \ ../linux-generic/odp_byteorder.c \ + ../linux-generic/odp_event_api.c \ ../linux-generic/odp_packet_api.c \ ../linux-generic/odp_packet_flags_api.c \ ../linux-generic/odp_pktio_api.c \ |