X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=64eb0d89dc17d70373ca884b7ac94cac016be262;hb=d04b60bfa940e21ab4676a1cb3c15989748be40a;hp=ff2c551965adbebe83779f6a5dc6f613684deef1;hpb=cb9cadad578297ffd78fa8a33670bdf1ab669e7e;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index ff2c551965a..64eb0d89dc1 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,33 +1,32 @@
-vpp_configure_depend =				\
-	vppinfra-install			\
-	dpdk-install				\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
+vpp_source = src
 
-# 
-vpp_configure_args = --with-q-platform=$(PLATFORM) \
-       --with-q-plugin-prefix=$(MU_BUILD_ROOT_DIR)/packages-$(PLATFORM)
+ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
+vpp_configure_args = --enable-dpdk-shared
+else
+vpp_configure_args =
+endif
 
 # Platform dependent configure flags
 vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 
-vpp_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra				\
-	dpdk					\
-        openssl					\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
+vpp_CPPFLAGS =
+vpp_LDFLAGS =
 
-vpp_LDFLAGS = $(call installed_libs_fn,		\
-	vppinfra				\
-	dpdk					\
-	openssl					\
-	svm					\
-	vlib					\
-	vlib-api				\
-	vnet)
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+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)/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