cmake: Fix plugins .h includes

[vpp.git] / src / plugins / dpdk.am

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 99abded..0165566 100644 (file)
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -25,17 +25,16 @@ endif
 if WITH_ISA_L_CRYPTO_LIB
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a
 endif
-if WITH_IBVERBS_LIB
-dpdk_plugin_la_LDFLAGS += -Wl,-libverbs
-endif
-if DPDK_IS_1702_OR_1705
-dpdk_plugin_la_CFLAGS = $(AM_CFLAGS) -DDPDK_VOID_CALLBACK=1 -DDPDK_NO_AEAD=1
-else
-dpdk_plugin_la_CFLAGS = $(AM_CFLAGS) -DDPDK_VOID_CALLBACK=0 -DDPDK_NO_AEAD=0
+dpdk_plugin_la_CFLAGS = $(AM_CFLAGS)
+if WITH_LIBNUMA
 dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
 endif
 
+if WITH_DPDK_MLX5_PMD
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl,-lmnl
+else
 dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
+endif
 dpdk_plugin_la_LIBADD =
 
 dpdk_plugin_la_SOURCES =                                       \
@@ -45,6 +44,7 @@ dpdk_plugin_la_SOURCES =                                      \
   dpdk/api/dpdk_api.c                                          \
   dpdk/device/cli.c                                            \
   dpdk/device/common.c                                         \
+  dpdk/device/flow.c                                           \
   dpdk/device/dpdk_priv.h                                      \
   dpdk/device/device.c                                         \
   dpdk/device/format.c                                         \
@@ -61,7 +61,7 @@ dpdk_plugin_la_SOURCES =                                      \
 API_FILES += dpdk/api/dpdk.api
 
 if CPU_X86_64
-dpdk_multiversioning_files =                                   \
+dpdk_multiversioning_sources =                                         \
        dpdk/buffer.c                                           \
        dpdk/device/node.c                                      \
        dpdk/device/device.c
@@ -70,10 +70,10 @@ if CC_SUPPORTS_AVX2
 ###############################################################
 # AVX2
 ###############################################################
-libdpdk_plugin_avx2_la_SOURCES = $(dpdk_multiversioning_files)
+libdpdk_plugin_avx2_la_SOURCES = $(dpdk_multiversioning_sources)
 libdpdk_plugin_avx2_la_CFLAGS =                                        \
        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
-       -DCLIB_MULTIARCH_VARIANT=avx2
+       -DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libdpdk_plugin_avx2.la
 dpdk_plugin_la_LIBADD += libdpdk_plugin_avx2.la
 endif
@@ -82,10 +82,10 @@ if CC_SUPPORTS_AVX512
 ###############################################################
 # AVX512
 ###############################################################
-libdpdk_plugin_avx512_la_SOURCES = $(dpdk_multiversioning_files)
+libdpdk_plugin_avx512_la_SOURCES = $(dpdk_multiversioning_sources)
 libdpdk_plugin_avx512_la_CFLAGS =                              \
        $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
-       -DCLIB_MULTIARCH_VARIANT=avx512
+       -DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libdpdk_plugin_avx512.la
 dpdk_plugin_la_LIBADD += libdpdk_plugin_avx512.la
 endif