diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-03-25 21:20:03 +0100 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-03-25 20:34:59 +0000 |
| commit | 1d49c98f7f8f97fff0d638e439af2246f34fc2b9 (patch) | |
| tree | 11d435fefa15a01fd70b35a96e061ab2513dcd29 | |
| parent | 84eda9de0bb3798a86c2c1dac11dd861916a1615 (diff) | |
vpp-api-test and sample-plugin should depend on dpdk conditionally
Change-Id: Ie26340141fdbd3256e305ab37f4baa817081bf46
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | build-data/packages/sample-plugin.mk | 13 | ||||
| -rw-r--r-- | build-data/packages/vpp-api-test.mk | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk index e9f2789aa49..58d46325441 100644 --- a/build-data/packages/sample-plugin.mk +++ b/build-data/packages/sample-plugin.mk @@ -1,6 +1,5 @@ sample-plugin_configure_depend = \ vppinfra-install \ - dpdk-install \ svm-install \ vlib-api-install \ vlib-install \ @@ -8,12 +7,8 @@ sample-plugin_configure_depend = \ vpp-install \ vpp-api-test-install -# -sample-plugin_configure_args = --with-dpdk - sample-plugin_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - dpdk \ openssl \ svm \ vlib \ @@ -24,7 +19,6 @@ sample-plugin_CPPFLAGS = $(call installed_includes_fn, \ sample-plugin_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - dpdk \ openssl \ svm \ vlib \ @@ -39,3 +33,10 @@ sample-plugin_post_install = \ $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins + +ifneq ($($(PLATFORM)_uses_dpdk),no) +sample-plugin_configure_args = --with-dpdk +sample-plugin_configure_depend += dpdk-install +sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk) +sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk) +endif diff --git a/build-data/packages/vpp-api-test.mk b/build-data/packages/vpp-api-test.mk index 6ad70bc527d..e26c2e76461 100644 --- a/build-data/packages/vpp-api-test.mk +++ b/build-data/packages/vpp-api-test.mk @@ -1,18 +1,13 @@ vpp-api-test_configure_depend = \ vppinfra-install \ - dpdk-install \ svm-install \ vlib-api-install \ vlib-install \ vnet-install \ vpp-install -# -vpp-api-test_configure_args = --with-dpdk - vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \ vppinfra \ - dpdk \ svm \ vlib \ vlib-api \ @@ -21,10 +16,15 @@ vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \ vpp-api-test_LDFLAGS = $(call installed_libs_fn, \ vppinfra \ - dpdk \ svm \ vlib \ vlib-api \ vnet \ vpp) +ifneq ($($(PLATFORM)_uses_dpdk),no) +vpp-api-test_configure_args = --with-dpdk +vpp-api-test_configure_depend += dpdk-install +vpp-api-test_CPPFLAGS += $(call installed_includes_fn, dpdk) +vpp-api-test_LDFLAGS += $(call installed_libs_fn, dpdk) +endif |