dpdk/ipsec: rework plus improved cli commands

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

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 75bfb96..905ba20 100644 (file)
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -19,14 +19,23 @@ 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_DPDK_CRYPTO_SW
+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
-dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-if WITH_DPDK_MLX5_PMD
+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/main.c                                                  \
@@ -52,11 +61,8 @@ API_FILES += dpdk/api/dpdk.api
 
 nobase_include_HEADERS +=                                      \
   dpdk/device/dpdk.h                                           \
-  dpdk/api/dpdk_all_api_h.h
-
-nobase_include_HEADERS +=                      \
- dpdk/ipsec/ipsec.h            \
- dpdk/ipsec/esp.h
+  dpdk/api/dpdk_all_api_h.h                                    \
+  dpdk/ipsec/ipsec.h
 
 dpdk_test_plugin_la_SOURCES =                                  \
   dpdk/api/dpdk_test.c dpdk/api/dpdk_plugin.api.h