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

Change-Id: Ie26340141fdbd3256e305ab37f4baa817081bf46
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
index e9f2789..58d4632 100644 (file)
--- 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 6ad70bc..e26c2e7 100644 (file)
--- 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