ONE-15: Fix duplicate locator, refactoring locator

[vpp.git] / build-data / packages / vpp-api-test.mk

diff --git a/build-data/packages/vpp-api-test.mk b/build-data/packages/vpp-api-test.mk
index eb7f466..38edb5b 100644 (file)
--- a/build-data/packages/vpp-api-test.mk
+++ b/build-data/packages/vpp-api-test.mk
@@ -1,31 +1,35 @@
 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-q-platform=$(PLATFORM) --with-dpdk \
-       --with-q-plugin-prefix=$(MU_BUILD_ROOT_DIR)/packages-$(PLATFORM)
-
 vpp-api-test_CPPFLAGS = $(call installed_includes_fn,  \
-       vppinfra                                \
-       dpdk                                    \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet                                    \
+       vppinfra                                        \
+       svm                                             \
+       vlib                                            \
+       vlib-api                                        \
+       vnet                                            \
        vpp)
 
 vpp-api-test_LDFLAGS = $(call installed_libs_fn,       \
-       vppinfra                                \
-       dpdk                                    \
-       svm                                     \
-       vlib                                    \
-       vlib-api                                \
-       vnet                                    \
+       vppinfra                                        \
+       svm                                             \
+       vlib                                            \
+       vlib-api                                        \
+       vnet                                            \
        vpp)
 
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+vpp-api-test_configure_args = --with-dpdk
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+vpp-api-test_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+vpp-api-test_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
+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
+endif