X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fpackages%2Fvpp.mk;h=be10e17d2001fb47261291a03c7748ee05fcaf5a;hb=fef15b4bb88c61248393b93d13b1f79bb628def0;hp=02aca4e6426037394f129672c06cd0d1166002e7;hpb=61efa140b1f44e0c568697fbc31cf3f430131ab2;p=vpp.git

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 02aca4e6426..be10e17d200 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,13 +1,16 @@
 vpp_configure_depend =				\
 	vppinfra-install			\
-	dpdk-install				\
 	svm-install				\
 	vlib-api-install			\
 	vlib-install				\
 	vnet-install				\
 
 # 
-vpp_configure_args = 
+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))
@@ -15,8 +18,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
 
 vpp_CPPFLAGS = $(call installed_includes_fn,	\
 	vppinfra				\
-	dpdk					\
-        openssl					\
 	svm					\
 	vlib					\
 	vlib-api				\
@@ -24,9 +25,24 @@ vpp_CPPFLAGS = $(call installed_includes_fn,	\
 
 vpp_LDFLAGS = $(call installed_libs_fn,		\
 	vppinfra				\
-	dpdk					\
-	openssl					\
 	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
+
+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)
+vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
+endif