From 855e26868ff8b9e6d00ca4d69ce6c9fdc0f2e121 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 24 Aug 2018 13:37:45 +0200
Subject: Switch to cmake

Change-Id: I982b69390c55b5ffbd744f355efc0aaf425b360c
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 build-data/packages/vpp.mk  | 40 ----------------------------------------
 build-data/platforms.mk     |  4 ----
 build-data/platforms/vpp.mk |  3 ---
 3 files changed, 47 deletions(-)

(limited to 'build-data')

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 4002cbcf57f..ae26e6dd244 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -12,46 +12,7 @@
 # limitations under the License.
 
 vpp_source = src
-ifneq ($(vpp_uses_cmake),yes)
 
-ifeq ($($(PLATFORM)_dpdk_shared_lib),yes)
-vpp_configure_args = --enable-dpdk-shared
-else
-vpp_configure_args =
-endif
-
-# Platform dependent configure flags
-vpp_configure_args += $(vpp_configure_args_$(PLATFORM))
-
-
-vpp_CPPFLAGS =
-vpp_LDFLAGS =
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vpp_configure_depend += dpdk-install
-vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk
-vpp_LDFLAGS += $(call installed_libs_fn, dpdk)
-vpp_CPPFLAGS += -I/usr/include/dpdk
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
-vpp_configure_args += --with-dpdk-mlx5-pmd
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx4_pmd),yes)
-vpp_configure_args += --with-dpdk-mlx4-pmd
-endif
-else
-vpp_configure_args += --disable-dpdk-plugin
-endif
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vpp_configure_args += --enable-tests
-endif
-
-else
 ifneq ($(shell which cmake3),)
 CMAKE?=cmake3
 else
@@ -77,4 +38,3 @@ vpp_configure = \
 #vpp_make_args = --no-print-directory
 vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR)
 vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'
-endif
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index a8bd44ee15b..fafddc64a0d 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -71,10 +71,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	echo ../../src/scripts/vppctl_completion /etc/bash_completion.d	\
 	   >> deb/debian/vpp.install ;					\
 									\
-	: move dictionary of vppctl commands ;				\
-	echo ../../src/scripts/vppctl-cmd-list /usr/share/vpp		\
-	   >> deb/debian/vpp.install ;					\
-									\
 	: add log directory ;						\
 	echo /var/log/vpp/						\
 	   >> deb/debian/vpp.dirs ;					\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 8da8c5eed3f..0687946dbb9 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -23,9 +23,6 @@ vpp_native_tools = vppapigen
 
 vpp_uses_dpdk = yes
 
-# use cmake as an alternative to autotools
-# vpp_uses_cmake = yes
-
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-- 
cgit 1.2.3-korg