aboutsummaryrefslogtreecommitdiffstats
path: root/build-data/packages
diff options
context:
space:
mode:
Diffstat (limited to 'build-data/packages')
-rw-r--r--build-data/packages/vlib.mk13
-rw-r--r--build-data/packages/vnet.mk8
-rw-r--r--build-data/packages/vpp.mk9
3 files changed, 20 insertions, 10 deletions
diff --git a/build-data/packages/vlib.mk b/build-data/packages/vlib.mk
index 11bb1c7a508..8b72b602dfd 100644
--- a/build-data/packages/vlib.mk
+++ b/build-data/packages/vlib.mk
@@ -1,6 +1,11 @@
-vlib_configure_depend = vppinfra-install dpdk-install
+vlib_configure_depend = vppinfra-install
-vlib_configure_args += --with-dpdk
+vlib_CPPFLAGS = $(call installed_includes_fn, vppinfra)
+vlib_LDFLAGS = $(call installed_libs_fn, vppinfra)
-vlib_CPPFLAGS = $(call installed_includes_fn, vppinfra dpdk)
-vlib_LDFLAGS = $(call installed_libs_fn, vppinfra dpdk)
+ifeq ($($(PLATFORM)_uses_dpdk),yes)
+vlib_configure_depend += dpdk-install
+vlib_configure_args += --with-dpdk
+vlib_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vlib_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk
index 4aa29613f7f..ca3523cc526 100644
--- a/build-data/packages/vnet.mk
+++ b/build-data/packages/vnet.mk
@@ -1,13 +1,11 @@
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 \
@@ -15,7 +13,6 @@ vnet_CPPFLAGS = $(call installed_includes_fn, \
vnet_LDFLAGS = $(call installed_libs_fn, \
vppinfra \
- dpdk \
openssl \
svm \
vlib \
@@ -24,3 +21,8 @@ vnet_LDFLAGS = $(call installed_libs_fn, \
# Platform dependent configure flags
vnet_configure_args += $(vnet_configure_args_$(PLATFORM))
+ifeq ($($(PLATFORM)_uses_dpdk),yes)
+vnet_configure_depend += dpdk-install
+vnet_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vnet_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 02aca4e6426..54aa548482c 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -1,6 +1,5 @@
vpp_configure_depend = \
vppinfra-install \
- dpdk-install \
svm-install \
vlib-api-install \
vlib-install \
@@ -15,7 +14,6 @@ vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
vpp_CPPFLAGS = $(call installed_includes_fn, \
vppinfra \
- dpdk \
openssl \
svm \
vlib \
@@ -24,9 +22,14 @@ vpp_CPPFLAGS = $(call installed_includes_fn, \
vpp_LDFLAGS = $(call installed_libs_fn, \
vppinfra \
- dpdk \
openssl \
svm \
vlib \
vlib-api \
vnet)
+
+ifeq ($($(PLATFORM)_uses_dpdk),yes)
+vpp_configure_depend += dpdk-install
+vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)
+vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif