NAT: VPP-1531 api cleanup & update

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 49e464f..d8b347c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,8 @@ DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
+DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
+DEB_DEPENDS += python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev
 ifeq ($(OS_VERSION_ID),14.04)
@@ -86,20 +87,21 @@ RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
+RPM_DEPENDS += mbedtls-devel
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
        RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += compat-openssl10-devel
-       RPM_DEPENDS += python2-devel python34-ply
-       RPM_DEPENDS += python2-virtualenv
-       RPM_DEPENDS += mbedtls-devel
+       RPM_DEPENDS += python3-devel python3-ply
+       RPM_DEPENDS += python3-virtualenv
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
        RPM_DEPENDS += yum-utils
        RPM_DEPENDS += openssl-devel
-       RPM_DEPENDS += python-devel python34-ply
+       RPM_DEPENDS += python-devel python36-ply
+       RPM_DEPENDS += python36-devel python36-pip
        RPM_DEPENDS += python-virtualenv
        RPM_DEPENDS += devtoolset-7
        RPM_DEPENDS += cmake3
@@ -139,7 +141,7 @@ endif
 
 ifeq ($(OS_ID),opensuse-leap)
 ifeq ($(SUSE_ID),15.0)
-       RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+       RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl
        RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
 endif
 endif
@@ -192,6 +194,7 @@ help:
        @echo " test-debug          - build and run (basic) functional tests (debug build)"
        @echo " test-all            - build and run (all) functional tests"
        @echo " test-all-debug      - build and run (all) functional tests (debug build)"
+       @echo " test-gcov           - build and run functional tests (gcov build)"
        @echo " test-shell          - enter shell with test environment"
        @echo " test-shell-debug    - enter shell with test environment (debug build)"
        @echo " test-wipe           - wipe files generated by unit tests"
@@ -200,7 +203,9 @@ help:
        @echo " test-help           - show help on test framework"
        @echo " run-vat             - run vpp-api-test tool"
        @echo " pkg-deb             - build DEB packages"
+       @echo " pkg-deb-debug       - build DEB debug packages"
        @echo " vom-pkg-deb         - build vom DEB packages"
+       @echo " vom-pkg-deb-debug   - build vom DEB debug packages"
        @echo " pkg-rpm             - build RPM packages"
        @echo " install-ext-deps    - install external development dependencies"
        @echo " ctags               - (re)generate ctags database"
@@ -398,6 +403,9 @@ test:
 test-debug:
        $(call test,vpp,vpp_debug,test)
 
+test-gcov:
+       $(call test,vpp,vpp_gcov,test)
+
 test-all:
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,)
        $(eval EXTENDED_TESTS=yes)