X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk.am;h=15195a219ce4c61c3dafa7bae3bcfeee0804a3f3;hb=95524c3a2ed435bf05781a8c052305a6327c90b0;hp=212bbb737f554a79238bc104fe06c396f311f8f3;hpb=c3a814be9dc769be942ff8029c7b6eccd4b3af05;p=vpp.git

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 212bbb737f5..15195a219ce 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -14,17 +14,40 @@
 vppapitestplugins_LTLIBRARIES += dpdk_test_plugin.la
 vppplugins_LTLIBRARIES += dpdk_plugin.la
 
-dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive,-lm,-ldl
+if ENABLE_DPDK_SHARED
+dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
+else
+dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+endif
+if WITH_AESNI_MB_LIB
+dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
+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_LDFLAGS += -Wl,-lnuma
+endif
+
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
 
 dpdk_plugin_la_SOURCES =					\
-  dpdk/init.c							\
   dpdk/main.c							\
   dpdk/buffer.c							\
   dpdk/thread.c							\
+  dpdk/api/dpdk_api.c						\
   dpdk/device/cli.c						\
+  dpdk/device/common.c						\
   dpdk/device/dpdk_priv.h					\
   dpdk/device/device.c						\
   dpdk/device/format.c						\
+  dpdk/device/init.c						\
   dpdk/device/node.c						\
   dpdk/hqos/hqos.c						\
   dpdk/ipsec/esp_encrypt.c					\