ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vpp-api-test and sample-plugin should depend on dpdk conditionally

Browse Source 
Change-Id: Ie26340141fdbd3256e305ab37f4baa817081bf46
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2016-03-25 21:20:03 +01:00
committed by Gerrit Code Review
parent 84eda9de0b
commit 1d49c98f7f
2 changed files with 13 additions and 12 deletions

13
build-data/packages/sample-plugin.mk

@ -1,6 +1,5 @@
sample-plugin_configure_depend = \ sample-plugin_configure_depend = \
vppinfra-install \ vppinfra-install \
dpdk-install \
svm-install \ svm-install \
vlib-api-install \ vlib-api-install \
vlib-install \ vlib-install \
@ -8,12 +7,8 @@ sample-plugin_configure_depend = \
vpp-install \ vpp-install \
vpp-api-test-install vpp-api-test-install
#
sample-plugin_configure_args = --with-dpdk
sample-plugin_CPPFLAGS = $(call installed_includes_fn, \ sample-plugin_CPPFLAGS = $(call installed_includes_fn, \
vppinfra \ vppinfra \
dpdk \
openssl \ openssl \
svm \ svm \
vlib \ vlib \
@ -24,7 +19,6 @@ sample-plugin_CPPFLAGS = $(call installed_includes_fn, \
sample-plugin_LDFLAGS = $(call installed_libs_fn, \ sample-plugin_LDFLAGS = $(call installed_libs_fn, \
vppinfra \ vppinfra \
dpdk \
openssl \ openssl \
svm \ svm \
vlib \ vlib \
@ -39,3 +33,10 @@ sample-plugin_post_install = \
$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
sample-plugin_image_include = echo $(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

12
build-data/packages/vpp-api-test.mk

@ -1,18 +1,13 @@
vpp-api-test_configure_depend = \ vpp-api-test_configure_depend = \
vppinfra-install \ vppinfra-install \
dpdk-install \
svm-install \ svm-install \
vlib-api-install \ vlib-api-install \
vlib-install \ vlib-install \
vnet-install \ vnet-install \
vpp-install vpp-install
#
vpp-api-test_configure_args = --with-dpdk
vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \ vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \
vppinfra \ vppinfra \
dpdk \
svm \ svm \
vlib \ vlib \
vlib-api \ vlib-api \
@ -21,10 +16,15 @@ vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \
vpp-api-test_LDFLAGS = $(call installed_libs_fn, \ vpp-api-test_LDFLAGS = $(call installed_libs_fn, \
vppinfra \ vppinfra \
dpdk \
svm \ svm \
vlib \ vlib \
vlib-api \ vlib-api \
vnet \ vnet \
vpp) 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