dpdk: rework cryptodev ipsec build and setup

[vpp.git] / build-data / packages / vpp.mk

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index be10e17..64eb0d8 100644 (file)
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,11 +1,5 @@
-vpp_configure_depend =                         \
-       vppinfra-install                        \
-       svm-install                             \
-       vlib-api-install                        \
-       vlib-install                            \
-       vnet-install                            \
+vpp_source = src
 
-# 
 ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
 vpp_configure_args = --enable-dpdk-shared
 else
@@ -16,25 +10,8 @@ endif
 vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 
-vpp_CPPFLAGS = $(call installed_includes_fn,   \
-       vppinfra                                \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet)
-
-vpp_LDFLAGS = $(call installed_libs_fn,                \
-       vppinfra                                \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet)
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vpp_CPPFLAGS += $(call installed_includes_fn, openssl)
-vpp_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
+vpp_CPPFLAGS =
+vpp_LDFLAGS =
 
 ifneq ($($(PLATFORM)_uses_dpdk),no)
 ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
@@ -42,7 +19,14 @@ vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
 vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
 else
 vpp_configure_depend += dpdk-install
-vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk
 vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
+vpp_CPPFLAGS += -I/usr/include/dpdk
+endif
+ifeq ($($(PLATFORM)_uses_dpdk_cryptodev_sw),yes)
+vpp_configure_args += --with-dpdk-crypto-sw
+endif
+ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
+vpp_configure_args += --with-dpdk-mlx5-pmd
 endif
 endif