X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk.am;h=6c15d0abd8e2c477dbe109ee71d03794c336c3ab;hb=f91080c01104a5999fe6c08e699b3426fea62dad;hp=99abded7cd253b4ca686362c1ef11b53024ce550;hpb=04f3db3847d242857b9d9d858bcdca538a1be7d7;p=vpp.git

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 99abded7cd2..6c15d0abd8e 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -25,13 +25,8 @@ 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
 
@@ -45,6 +40,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 +57,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 +66,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 +78,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