From 164e5f8c63652028ecb9c3570e1ea8618b163071 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 25 Apr 2018 19:11:15 +0200 Subject: Move VOM to extras/vom Change-Id: Iea174f03dfba3bd06024db0f0cc373532300dcae Signed-off-by: Damjan Marion --- build-data/packages/vom.mk | 6 ++++++ build-data/platforms/vpp.mk | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 build-data/packages/vom.mk (limited to 'build-data') diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk new file mode 100644 index 00000000000..a156ea8671c --- /dev/null +++ b/build-data/packages/vom.mk @@ -0,0 +1,6 @@ +vom_configure_depend = vpp-install +vom_source = extras +vom_configure_subdir = vom +vom_CPPFLAGS = $(call installed_includes_fn, vpp) +vom_LDFLAGS = $(call installed_libs_fn, vpp) + diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 320609ded2b..57501819c7e 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -26,7 +26,7 @@ vpp_uses_dpdk = yes # Uncoment to enable building unit tests # vpp_enable_tests = yes -vpp_root_packages = vpp +vpp_root_packages = vpp vom # DPDK configuration parameters # vpp_uses_dpdk_mlx5_pmd = yes @@ -42,10 +42,6 @@ ifeq ($(MACHINE),i686) vpp_configure_args_vpp += --disable-lb-plugin endif -# To disable the VPP object model build - and save about half the build time - -# uncomment the following... -# vpp_configure_args_vpp += --disable-vom - vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror vpp_debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -- cgit