X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvnet.mk;h=57c444e8318f5632025f4b986eb45d324631132a;hb=fdc62abdc113ea63dc867375bd49ef3043dcd290;hp=4aa29613f7f6aac5541a394c1d13fe69a5eab5e0;hpb=cb9cadad578297ffd78fa8a33670bdf1ab669e7e;p=vpp.git

diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk
index 4aa29613f7f..57c444e8318 100644
--- a/build-data/packages/vnet.mk
+++ b/build-data/packages/vnet.mk
@@ -1,26 +1,47 @@
 vnet_configure_depend = 			\
     vppinfra-install 				\
-    dpdk-install				\
     svm-install					\
     vlib-api-install 				\
     vlib-install 
 
 vnet_CPPFLAGS = $(call installed_includes_fn, 	\
     vppinfra 					\
-    dpdk 					\
-    openssl					\
     svm						\
     vlib 					\
     vlib-api)
 
 vnet_LDFLAGS = $(call installed_libs_fn, 	\
     vppinfra					\
-    dpdk					\
-    openssl					\
     svm						\
     vlib					\
     vlib-api)
 
+ifeq ($($(PLATFORM)_enable_tests),yes)
+vnet_configure_args += --enable-tests
+endif
+
 # Platform dependent configure flags
 vnet_configure_args += $(vnet_configure_args_$(PLATFORM))
 
+# include & link with openssl only if needed
+ifneq ($($(PLATFORM)_uses_openssl),no)
+vnet_CPPFLAGS += $(call installed_includes_fn, openssl)
+vnet_LDFLAGS += $(call installed_libs_fn, openssl)
+endif
+
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+vnet_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
+vnet_configure_depend += dpdk-install
+vnet_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vnet_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
+ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
+vnet_configure_args += --with-dpdk-crypto
+endif
+ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
+vnet_configure_args += --with-dpdk-mlx5-pmd
+endif
+endif