API:replaced all REPLY_MACRO's with api_helper_macros.h

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f0173cc..f47c98a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf nasm
+DEB_DEPENDS += lcov chrpath autoconf nasm
+DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -49,7 +50,8 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
+RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -230,18 +232,18 @@ define test
 endef
 
 test: bootstrap
-       $(call test,vpp_lite,vpp_lite,test)
+       $(call test,vpp,vpp,test)
 
 test-debug: bootstrap
-       $(call test,vpp_lite,vpp_lite_debug,test)
+       $(call test,vpp,vpp_debug,test)
 
 test-all: bootstrap
        $(eval EXTENDED_TESTS=yes)
-       $(call test,vpp_lite,vpp_lite,test)
+       $(call test,vpp,vpp,test)
 
 test-all-debug: bootstrap
        $(eval EXTENDED_TESTS=yes)
-       $(call test,vpp_lite,vpp_lite_debug,test)
+       $(call test,vpp,vpp_debug,test)
 
 test-help:
        @make -C test help
@@ -262,7 +264,7 @@ test-wipe-doc:
        @make -C test wipe-doc
 
 test-cov: bootstrap
-       $(call test,vpp_lite,vpp_lite_gcov,cov)
+       $(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov:
        @make -C test wipe-cov
@@ -271,10 +273,10 @@ test-checkstyle:
        @make -C test checkstyle
 
 retest:
-       $(call test,vpp_lite,vpp_lite,retest)
+       $(call test,vpp,vpp,retest)
 
 retest-debug:
-       $(call test,vpp_lite,vpp_lite_debug,retest)
+       $(call test,vpp,vpp_debug,retest)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
@@ -376,8 +378,6 @@ endef
 verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
        $(call banner,"Building for PLATFORM=vpp using gcc")
        @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-       $(call banner,"Building for PLATFORM=vpp_lite using gcc")
-       @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
        $(call banner,"Installing dependencies")
        @sudo -E apt-get update