Switch to cmake

Change-Id: I982b69390c55b5ffbd744f355efc0aaf425b360c
Signed-off-by: Damjan Marion <damarion@cisco.com>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5dfca2..11f2be9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -110,3 +110,4 @@
 pr("Target processor" "${CMAKE_SYSTEM_PROCESSOR}")
 pr("Build type" "${CMAKE_BUILD_TYPE}")
 pr("Install prefix" "${CMAKE_INSTALL_PREFIX}")
+
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index f5fa339..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-###############################################################################
-# Global Defines
-###############################################################################
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-ACLOCAL_AMFLAGS = -I m4
-AM_LIBTOOLFLAGS = --quiet
-
-AM_CFLAGS = @CPU_FLAGS@ -Wall
-AM_CXXFLAGS = -Wall -std=gnu++11
-
-SUBDIRS = .
-SUFFIXES = .api.h .api .api.json
-API_FILES =
-noinst_HEADERS =
-dist_bin_SCRIPTS =
-lib_LTLIBRARIES =
-BUILT_SOURCES =
-CLEANFILES =
-install-data-local:
-	@echo "Building vppctl command list..."
-	@DIR_SEARCH="$(srcdir)" ; \
-	DIR_EXCLUDE="examples" ; \
-	GREP_TIME=`time (grep -wIr "\.path = " $$DIR_SEARCH --exclude-dir=$$DIR_EXCLUDE \
-	| cut -d '"' -f2 | sort -u > $(srcdir)/scripts/vppctl-cmd-list) 2>&1` ; \
-	GREP_TIME=`echo $$GREP_TIME | awk '{print $$2}'` ; \
-	echo "Command list built, Time taken: $$GREP_TIME"
-
-###############################################################################
-# Components
-###############################################################################
-
-include vppinfra.am
-include vppapigen.am
-
-if ENABLE_PERFTOOL
-include perftool.am
-endif
-
-if ENABLE_G2
-include g2.am
-endif
-
-if ENABLE_SVM
-include svm.am
-endif
-
-if ENABLE_VLIB
-include vlib.am
-endif
-
-if ENABLE_SVM
-if ENABLE_VLIB
-include vlib-api.am
-include vnet.am
-include vpp.am
-include vpp-api-test.am
-include vcl.am
-
-SUBDIRS += plugins
-SUBDIRS += vpp-api/vapi
-
-if ENABLE_PAPI
-include vpp-api.am
-SUBDIRS += vpp-api/python
-endif
-
-###############################################################################
-# API
-###############################################################################
-
-include suffix-rules.mk
-
-# Set the suffix list
-apidir = $(prefix)/share/vpp/api/core
-
-api_DATA = \
-	$(patsubst %.api,%.api.json,$(API_FILES))
-
-BUILT_SOURCES += \
-	$(patsubst %.api,%.api.h,$(API_FILES))
-
-endif # if ENABLE_VLIB
-endif # if ENABLE_SVM
-
-CLEANFILES += $(BUILT_SOURCES) $(api_DATA)
diff --git a/src/configure.ac b/src/configure.ac
deleted file mode 100644
index 4c9c25d..0000000
--- a/src/configure.ac
+++ /dev/null
@@ -1,464 +0,0 @@
-AC_INIT([vpp], [18.10], [vpp-dev@fd.io])
-LT_INIT
-AC_CONFIG_AUX_DIR([.])
-AM_INIT_AUTOMAKE([subdir-objects])
-AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([ \
-  Makefile \
-  plugins/Makefile \
-  vpp-api/python/Makefile \
-  vpp-api/vapi/Makefile \
-  vlib/config.h \
-  vppinfra/config.h \
-])
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_AS
-AM_PROG_LIBTOOL
-AM_PATH_PYTHON
-
-AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"])
-
-###############################################################################
-# Macros
-###############################################################################
-
-AC_DEFUN([ENABLE_ARG],
-[
-  AC_ARG_ENABLE($1,
-    AC_HELP_STRING(patsubst([--enable-$1],[_],[-]), $2),
-    [enable_$1=yes n_enable_$1=1],
-    [enable_$1=no n_enable_$1=0])
-  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
-  m4_append([list_of_enabled], [$1], [, ])
-])
-
-AC_DEFUN([DISABLE_ARG],
-[
-  AC_ARG_ENABLE($1,
-    AC_HELP_STRING(patsubst([--disable-$1],[_],[-]), $2),
-    [enable_$1=no n_enable_$1=0],
-    [enable_$1=yes n_enable_$1=1])
-  AM_CONDITIONAL(m4_toupper(ENABLE_$1), test "$enable_$1" = "yes")
-  m4_append([list_of_enabled], [$1], [, ])
-])
-
-AC_DEFUN([WITH_ARG],
-[
-  AC_ARG_WITH($1,
-    AC_HELP_STRING(patsubst([--with-$1],[_],[-]), $2),
-    [with_$1=yes n_with_$1=1],
-    [with_$1=no n_with_$1=0])
-  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
-  m4_append([list_of_with], [$1], [, ])
-])
-
-AC_DEFUN([WITHOUT_ARG],
-[
-  AC_ARG_WITH($1,
-    AC_HELP_STRING(patsubst([--without-$1],[_],[-]), $2),
-    [with_$1=no n_with_$1=0],
-    [with_$1=yes n_with_$1=1])
-  AM_CONDITIONAL(m4_toupper(WITH_$1), test "$with_$1" = "yes")
-  m4_append([list_of_with], [$1], [, ])
-])
-
-AC_DEFUN([PLUGIN_ENABLED],
-[
-   AC_ARG_ENABLE($1_plugin,
-     AC_HELP_STRING([--disable-$1-plugin], [Do not build $1 plugin]),
-       [enable_$1_plugin=no],
-       [enable_$1_plugin=yes ])
-  AM_CONDITIONAL(m4_toupper(ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
-  m4_append([list_of_plugins], [$1], [, ])
-])
-
-AC_DEFUN([PLUGIN_DISABLED],
-[
-   AC_ARG_ENABLE($1_plugin,
-     AC_HELP_STRING([--enable-$1-plugin], [Build $1 plugin]),
-       [enable_$1_plugin=yes ],
-       [enable_$1_plugin=no])
-  AM_CONDITIONAL(m4_toupper(ENABLE_$1_PLUGIN), test "$enable_$1_plugin" = "yes")
-  m4_append([list_of_plugins], [$1], [, ])
-])
-
-AC_DEFUN([PRINT_VAL], [ AC_MSG_RESULT(AC_HELP_STRING($1,$2)) ])
-
-AC_DEFUN([DPDK_IS_PMD_ENABLED],
-[
-  AC_MSG_CHECKING([for $1 in rte_config.h])
-  AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-      [[#include <rte_config.h>]],
-      [[return RTE_$1;]],
-    )],
-    [with_$2=yes]
-    [AC_MSG_RESULT([yes])],
-    [with_$2=no]
-    [AC_MSG_RESULT([no])]
-  )
-  AM_CONDITIONAL(m4_toupper(WITH_$2), test "$with_$2" = "yes")
-  m4_append_uniq([list_of_with], [$2], [, ])
-])
-
-# Check if compiler supports specific flag
-AC_DEFUN([CC_CHECK_FLAG],
-[
-  AC_MSG_CHECKING([if $CC supports $1])
-  AC_LANG_PUSH([C])
-  ac_saved_cflags="$CFLAGS"
-  CFLAGS="-Werror $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-  [cc_flag_check=yes],
-  [cc_flag_check=no]
-)
-  AC_MSG_RESULT([$cc_flag_check])
-  CFLAGS="$ac_saved_cflags"
-  AC_LANG_POP([C])
-])
-
-# This function deduces the BUILD HOST cache-line size by
-# inspecting /sys and/or /proc depending on the kernel / arch in use
-as_fn_log2_cache_line_size_p()
-{
-  sysfs_cache_path="/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
-  m4_define([read_cache_line_size_from_sysfs], [`head -n 1 $1`])
-  m4_define([read_midr_implementer],
-            [`awk '/implementer/ {print $[]4;exit}' /proc/cpuinfo`])
-  m4_define([read_midr_cpuid],
-            [`awk '/part/ {print $[]4;exit}' /proc/cpuinfo`])
-
-  #Check if sysfs path exists,to ignore warning, else do manual mapping
-  AC_CHECK_FILE($sysfs_cache_path,
-    [
-      cache_line_size=read_cache_line_size_from_sysfs($sysfs_cache_path);
-      if test $cache_line_size = "32"  ; then
-          log2_cache_line_size="5";
-      elif test $cache_line_size = "64"  ; then
-          log2_cache_line_size="6";
-      elif test $cache_line_size = "128"  ; then
-          log2_cache_line_size="7";
-      fi
-      AC_MSG_NOTICE([cache_line_size/log2_cache_line_size deduced as $cache_line_size/$log2_cache_line_size])
-    ],
-    [
-        #Define Implementer Ids here
-        implementer_id_cavium=0x43
-
-        #Define CPU Ids here
-        cpu_id_cavium_thunderx_cn88xx=0x0a1
-        cpu_id_cavium_thunderx2_cn99xx=0x0af
-
-        implementer=read_midr_implementer()
-        cpuid=read_midr_cpuid()
-
-        AC_MSG_CHECKING([for implementerid/cpuid to set log2_cache_line_size])
-
-        # Switch case to map log2_cache_line_size for implementer/cpuid combination.
-        # Default case of Switch sets log2_cache_line_size to 6
-        AS_CASE($implementer,
-              #Switch Case for Cavium SoC's
-              [$implementer_id_cavium],
-                  [AS_CASE($cpuid,
-                      #Only ThunderX2 is 64B. Remaining chips are 128B
-                      [$cpu_id_cavium_thunderx2_cn99xx],
-                            [AC_MSG_RESULT([Cavium/ThunderX2]);log2_cache_line_size=6],
-                      [$cpu_id_cavium_thunderx_cn88xx],
-                            [AC_MSG_RESULT([Cavium/ThunderX]);log2_cache_line_size=7],
-                      [log2_cache_line_size=7;AC_MSG_RESULT([Cavium/OCTEONTx($cpuid)])]
-                   )],
-              #Add implementer specific case here:
-
-              #Default case: 64B for all SoC's
-              [log2_cache_line_size=6;AC_MSG_RESULT([$implementer/$cpuid])]
-        )
-      AC_MSG_NOTICE([log2_cache_line_size deduced as $log2_cache_line_size])
-    ]
-  )
-  echo $log2_cache_line_size
-}
-
-###############################################################################
-# configure arguments
-###############################################################################
-
-# --enable-X
-ENABLE_ARG(tests,	[Enable unit tests])
-ENABLE_ARG(dpdk_shared,	[Enable unit tests])
-ENABLE_ARG(perftool,	[Enable perftool])
-ENABLE_ARG(g2,		[Enable g2])
-ENABLE_ARG(dlmalloc,    [Enable dlmalloc])
-
-# --disable-X
-DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
-DISABLE_ARG(svm,	[Disable svm and dependant libs and binaries])
-DISABLE_ARG(papi,	[Disable Python API bindings])
-
-# --with-X
-WITH_ARG(dpdk_mlx5_pmd, [Enable Mellanox DPDK PMD driver])
-
-# --without-X
-WITHOUT_ARG(libssl,	[Disable libssl])
-WITHOUT_ARG(apicli,	[Disable binary api CLI])
-WITHOUT_ARG(mbedtls,	[Disable mbedtls])
-WITHOUT_ARG(libnuma,	[for non numa architectures])
-
-AC_ARG_WITH(log2-cache-line-bytes,
-            AC_HELP_STRING([--with-log2-cache-line-bytes],[Set the cache line size, --with-log2-cache-line-bytes=5|6|7|auto]),
-	    [case $with_log2_cache_line_bytes in
-	      5 | 6 | 7);;
-	      auto) with_log2_cache_line_bytes=`as_fn_log2_cache_line_size_p`;;
-              *) with_log2_cache_line_bytes="CONFIG_ERROR";;
-	      esac],
-              [with_log2_cache_line_bytes=`as_fn_log2_cache_line_size_p`])
-
-AC_ARG_WITH(unix,
-            AC_HELP_STRING([--with-unix],[Compile unix version of clib]),
-	    [],
-	    [case $host_os in
-	      darwin* | linux*) with_unix=yes;;
-	      *) with_unix=no;;
-	      esac])
-
-AM_CONDITIONAL(WITH_UNIX, test "$with_unix" = "yes")
-
-AC_ARG_WITH(pre-data,
-            AC_HELP_STRING([--with-pre-data],[Set buffer rewrite space]),
-	    [case $with_pre_data in
-	       128) ;;
-	       256) ;;
-               *) with_pre_data="pre-data-not-set" ;;
-	     esac], [with_pre_data=128])
-
-AM_CONDITIONAL(ENABLE_DLMALLOC, test "$enable_dlmalloc" = "yes")
-
-###############################################################################
-# Target CPU flags
-###############################################################################
-
-# Check if compiler supports march=core-avx2
-CC_CHECK_FLAG("-march=core-avx2")
-AS_IF([test "$cc_flag_check" = yes],
-      [march_core_avx2=yes],
-      [march_core_avx2=no])
-AM_CONDITIONAL([CC_SUPPORTS_AVX2], [test "$march_core_avx2" = "yes"])
-
-# Check if compiler supports march=skylake-avx512
-CC_CHECK_FLAG("-march=skylake-avx512")
-AS_IF([test "$cc_flag_check" = yes],
-  [march_skylake_avx512=yes],
-  [march_skylake_avx512=no])
-AM_CONDITIONAL([CC_SUPPORTS_AVX512], [test "$march_skylake_avx512" = "yes"])
-
-AS_CASE([$host_cpu],
-	[x86_64], [CPU_FLAGS="-march=corei7 -mtune=corei7-avx"],
-	[aarch64], [CPU_FLAGS="-march=armv8-a+crc"],
-	[CPU_FLAGS=""],
-)
-AC_SUBST([CPU_FLAGS])
-
-AC_SUBST([CPU_AVX2_FLAGS],"-march=core-avx2 -mtune=core-avx2")
-AC_SUBST([CPU_AVX512_FLAGS],"-march=skylake-avx512 -mtune=skylake-avx512")
-
-AM_CONDITIONAL([CPU_X86_64], [test "$host_cpu" = "x86_64"])
-AM_CONDITIONAL([CPU_AARCH64], [test "$host_cpu" = "aarch64"])
-
-###############################################################################
-# misc compiler flags
-###############################################################################
-
-CC_CHECK_FLAG("-Wno-address-of-packed-member")
-AS_IF([test "$cc_flag_check" = yes],
-	[CFLAGS="${CFLAGS} -Wno-address-of-packed-member"], [])
-
-###############################################################################
-# Substitutions and defines
-###############################################################################
-
-AC_SUBST(PRE_DATA_SIZE,		[$with_pre_data])
-AC_SUBST(LOG2_CACHE_LINE_BYTES, [$with_log2_cache_line_bytes])
-AC_SUBST(APICLI,		[-DVPP_API_TEST_BUILTIN=${n_with_apicli}])
-AC_SUBST(DLMALLOC,              [${n_enable_dlmalloc}])
-
-AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB,	[${n_enable_dpdk_shared}])
-AC_DEFINE_UNQUOTED(WITH_LIBSSL,		[${n_with_libssl}])
-AC_DEFINE_UNQUOTED(WITH_MBEDTLS,	[${n_with_mbedtls}])
-AC_DEFINE_UNQUOTED(WITH_LIBNUMA,	[${n_with_libnuma}])
-
-
-# Silence following noise:
-# ar: `u' modifier ignored since `D' is the default (see `U')
-AR_FLAGS=cr
-AC_SUBST(AR_FLAGS)
-
-###############################################################################
-# Plugins
-###############################################################################
-
-# Please keep alphabetical order
-PLUGIN_ENABLED(abf)
-PLUGIN_ENABLED(acl)
-PLUGIN_ENABLED(avf)
-PLUGIN_ENABLED(cdp)
-PLUGIN_ENABLED(dpdk)
-PLUGIN_ENABLED(flowprobe)
-PLUGIN_ENABLED(gbp)
-PLUGIN_ENABLED(gtpu)
-PLUGIN_ENABLED(igmp)
-PLUGIN_ENABLED(ila)
-PLUGIN_ENABLED(ioam)
-PLUGIN_ENABLED(ixge)
-PLUGIN_ENABLED(l2e)
-PLUGIN_ENABLED(lacp)
-PLUGIN_ENABLED(lb)
-PLUGIN_ENABLED(mactime)
-PLUGIN_ENABLED(map)
-PLUGIN_ENABLED(marvell)
-PLUGIN_ENABLED(memif)
-PLUGIN_ENABLED(nat)
-PLUGIN_ENABLED(nsh)
-PLUGIN_ENABLED(pppoe)
-PLUGIN_ENABLED(srv6ad)
-PLUGIN_ENABLED(srv6am)
-PLUGIN_ENABLED(srv6as)
-PLUGIN_ENABLED(stn)
-PLUGIN_ENABLED(tlsmbedtls)
-PLUGIN_ENABLED(tlsopenssl)
-PLUGIN_ENABLED(unittest)
-
-###############################################################################
-# Dependency checks
-###############################################################################
-AC_CHECK_FUNC([memfd_create], [AC_DEFINE([HAVE_MEMFD_CREATE], [1], [Define if memfd exists])])
-
-AM_COND_IF([ENABLE_DPDK_SHARED],
-[
-  AC_CHECK_HEADERS([rte_config.h],
-    [],
-    [AC_MSG_ERROR([DPDK header files not found])],)
-  AC_CHECK_LIB( [dpdk], [rte_eal_init],
-    [],
-    [AC_MSG_ERROR([DPDK shared library not found])],)
-])
-
-with_aesni_mb_lib=no
-with_isa_l_crypto_lib=no
-
-DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_MB, dpdk_aesni_mb_pmd)
-DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_GCM, dpdk_aesni_gcm_pmd)
-
-AM_COND_IF([WITH_DPDK_AESNI_MB_PMD],
-[
-  AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
-	       [with_aesni_mb_lib=yes],
-	       [AC_MSG_ERROR([IPSec_MB library not found])])
-])
-
-AM_COND_IF([WITH_DPDK_AESNI_GCM_PMD],
-[
-  AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
-    [with_aesni_mb_lib=yes],
-    [AC_MSG_ERROR([IPSec_MB library not found])])
-])
-
-m4_append([list_of_with], [aesni_mb_lib], [, ])
-AM_CONDITIONAL(WITH_AESNI_MB_LIB, test "$with_aesni_mb_lib" = "yes")
-
-m4_append([list_of_with], [isa_l_crypto_lib], [, ])
-AM_CONDITIONAL(WITH_ISA_L_CRYPTO_LIB, test "$with_isa_l_crypto_lib" = "yes")
-
-AM_COND_IF([ENABLE_G2],
-[
-  PKG_CHECK_MODULES(g2, gtk+-2.0)
-])
-
-AM_COND_IF([ENABLE_MARVELL_PLUGIN],
-[
-  AC_CHECK_LIB( [musdk], [pp2_init],
-    [],
-    [
-      AC_MSG_WARN([Marvell MUSDK library with PP2 support not found. Plugin disabled.])
-      enable_marvell_plugin=no
-      AM_CONDITIONAL(ENABLE_MARVELL_PLUGIN, false)
-    ])
-])
-
-AM_COND_IF([WITH_MBEDTLS], [],
-[
-  AC_MSG_WARN([mbedtls not enabled. Disabling tlsmbedtls plugin])
-  enable_tlsmbedtls_plugin=no
-  AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
-])
-
-AM_COND_IF([ENABLE_TLSMBEDTLS_PLUGIN],
-[
-  AC_CHECK_HEADERS([mbedtls/ssl.h], [],
-    [
-      AC_MSG_WARN([mbedtls headers not found. TLS engine implementation disabled])
-      enable_tlsmbedtls_plugin=no
-      AM_CONDITIONAL(ENABLE_TLSMBEDTLS_PLUGIN, false)
-    ], [])
-])
-
-AM_COND_IF([WITH_LIBSSL],
-[
-  AC_CHECK_LIB([ssl -lcrypto], [SSL_set_async_callback],
-    [
-      AC_DEFINE([HAVE_OPENSSL_ASYNC], [1], [Define if new openssl interface exists])
-    ])
-],
-[
-  AC_MSG_WARN([openssl not enabled. Disabling tlsopenssl plugin])
-  enable_tlsopenssl_plugin=no
-  AM_CONDITIONAL(ENABLE_TLSOPENSSL_PLUGIN, false)
-])
-
-###############################################################################
-# PYTHON
-###############################################################################
-
-AM_COND_IF([ENABLE_PAPI],
-[
-  AM_PATH_PYTHON
-])
-
-###############################################################################
-# Output
-###############################################################################
-
-AC_OUTPUT
-
-AC_MSG_RESULT([==============================================================================])
-PRINT_VAL([version], $PACKAGE $VERSION)
-PRINT_VAL([prefix], ${prefix})
-PRINT_VAL([libdir], ${libdir})
-PRINT_VAL([includedir], ${includedir})
-PRINT_VAL([CFLAGS], ${CFLAGS})
-PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
-PRINT_VAL([LDFLAGS], ${LDFLAGS})
-PRINT_VAL([LOG2_CACHE_LINE_BYTES], ${with_log2_cache_line_bytes})
-PRINT_VAL([DLMALLOC], ${enable_dlmalloc})
-
-AC_MSG_RESULT([])
-AC_MSG_RESULT([with:])
-m4_foreach([x], m4_dquote(list_of_with), [
-  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${with_], x, [}])))
-])
-
-AC_MSG_RESULT([])
-AC_MSG_RESULT([enabled:])
-m4_foreach([x], m4_dquote(list_of_enabled), [
-  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [}])))
-])
-
-AC_MSG_RESULT([])
-AC_MSG_RESULT([plugins:])
-m4_foreach([x], m4_dquote(list_of_plugins), [
-  AC_MSG_RESULT(AC_HELP_STRING(x, m4_join([], [${enable_], x, [_plugin}])))
-])
-AC_MSG_RESULT([==============================================================================])
-
-
diff --git a/src/g2.am b/src/g2.am
deleted file mode 100644
index e796573..0000000
--- a/src/g2.am
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-bin_PROGRAMS += g2
-
-g2_SOURCES =					\
-  tools/g2/clib.c				\
-  tools/g2/cpel.c				\
-  tools/g2/cpel.h				\
-  tools/g2/events.c				\
-  tools/g2/g2.h					\
-  tools/g2/main.c				\
-  tools/g2/menu1.c				\
-  tools/g2/pointsel.c				\
-  tools/g2/props.c				\
-  tools/g2/props.h				\
-  tools/g2/g2version.c				\
-  tools/g2/view1.c
-
-g2_LDADD = $(g2_LIBS) libvppinfra.la -lpthread -lm
-
-# vi:syntax=automake
diff --git a/src/perftool.am b/src/perftool.am
deleted file mode 100644
index 23e4503..0000000
--- a/src/perftool.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-bin_PROGRAMS += c2cpel cpelatency cpeldump cpelinreg cpelstate elog_merge
-
-lib_LTLIBRARIES += libcperf.la
-
-libcperf_la_SOURCES = \
-  tools/perftool/delsvec.c	\
-  tools/perftool/linreg.c	\
-  tools/perftool/props.c	\
-  tools/perftool/cpel_util.c
-
-PERFTOOL_LIBS = libcperf.la libvppinfra.la -lm
-
-c2cpel_SOURCES = tools/perftool/c2cpel.c
-c2cpel_LDADD = $(PERFTOOL_LIBS)
-
-cpelatency_SOURCES = tools/perftool/cpelatency.c
-cpelatency_LDADD = $(PERFTOOL_LIBS)
-
-cpeldump_SOURCES = tools/perftool/cpeldump.c
-cpeldump_LDADD = $(PERFTOOL_LIBS)
-
-cpelinreg_SOURCES = tools/perftool/cpelinreg.c
-cpelinreg_LDADD = $(PERFTOOL_LIBS)
-
-cpelstate_SOURCES = tools/perftool/cpelstate.c
-cpelstate_LDADD = $(PERFTOOL_LIBS)
-
-elog_merge_SOURCES = tools/perftool/elog_merge.c
-elog_merge_LDADD = $(PERFTOOL_LIBS)
-
-# vi:syntax=automake
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
deleted file mode 100644
index 1000ee8..0000000
--- a/src/plugins/Makefile.am
+++ /dev/null
@@ -1,170 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign subdir-objects
-
-AM_CFLAGS = @CPU_FLAGS@ -Wall -I${top_srcdir} -I${top_builddir}
-AM_LDFLAGS = -module -shared -avoid-version
-AM_LIBTOOLFLAGS = --quiet
-SUFFIXES = .api.h .api .api.json
-API_FILES =
-BUILT_SOURCES =
-vppplugins_LTLIBRARIES =
-vppapitestplugins_LTLIBRARIES =
-noinst_HEADERS =
-noinst_LTLIBRARIES =
-nobase_apiinclude_HEADERS =
-nobase_include_HEADERS =
-
-vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins
-vpppluginsdir = ${libdir}/vpp_plugins
-
-if ENABLE_ABF_PLUGIN
-include abf.am
-endif
-
-if ENABLE_ACL_PLUGIN
-include acl.am
-endif
-
-if ENABLE_AVF_PLUGIN
-include avf.am
-endif
-
-if ENABLE_CDP_PLUGIN
-include cdp.am
-endif
-
-if ENABLE_DPDK_PLUGIN
-include dpdk.am
-endif
-
-if ENABLE_FLOWPROBE_PLUGIN
-include flowprobe.am
-endif
-
-
-if ENABLE_GTPU_PLUGIN
-include gtpu.am
-endif
-
-if ENABLE_IGMP_PLUGIN
-include igmp.am
-endif
-
-if ENABLE_ILA_PLUGIN
-include ila.am
-endif
-
-if ENABLE_IOAM_PLUGIN
-include ioam.am
-endif
-
-if ENABLE_IXGE_PLUGIN
-include ixge.am
-endif
-
-if ENABLE_LACP_PLUGIN
-include lacp.am
-endif
-
-if ENABLE_LB_PLUGIN
-include lb.am
-endif
-
-if ENABLE_MACTIME_PLUGIN
-include mactime.am
-endif
-
-if ENABLE_MAP_PLUGIN
-include map.am
-endif
-
-if ENABLE_MARVELL_PLUGIN
-include marvell.am
-endif
-
-if ENABLE_MEMIF_PLUGIN
-include memif.am
-endif
-
-if ENABLE_NAT_PLUGIN
-include nat.am
-endif
-
-if ENABLE_NSH_PLUGIN
-include nsh.am
-endif
-
-if ENABLE_PPPOE_PLUGIN
-include pppoe.am
-endif
-
-if ENABLE_SRV6AD_PLUGIN
-include srv6_ad.am
-endif
-
-if ENABLE_SRV6AM_PLUGIN
-include srv6_am.am
-endif
-
-if ENABLE_SRV6AS_PLUGIN
-include srv6_as.am
-endif
-
-if ENABLE_STN_PLUGIN
-include stn.am
-endif
-
-if ENABLE_L2E_PLUGIN
-include l2e.am
-endif
-
-if ENABLE_GBP_PLUGIN
-include gbp.am
-endif
-
-if ENABLE_TLSMBEDTLS_PLUGIN
-include tlsmbedtls.am
-endif
-
-if ENABLE_TLSOPENSSL_PLUGIN
-include tlsopenssl.am
-endif
-
-if ENABLE_UNITTEST_PLUGIN
-include unittest.am
-endif
-
-include ../suffix-rules.mk
-
-# Remove *.la files
-install-data-hook:
-	@-(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-	@-(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
-
-###############################################################################
-# API
-###############################################################################
-
-apidir = $(prefix)/share/vpp/api/plugins
-apiincludedir = ${includedir}/vpp_plugins
-
-api_DATA = \
-	$(patsubst %.api,%.api.json,$(API_FILES))
-
-BUILT_SOURCES += \
-	$(patsubst %.api,%.api.h,$(API_FILES))
-
-CLEANFILES = $(BUILT_SOURCES) $(api_DATA)
diff --git a/src/plugins/abf.am b/src/plugins/abf.am
deleted file mode 100644
index 6aef714..0000000
--- a/src/plugins/abf.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += abf_plugin.la
-
-abf_plugin_la_SOURCES =				\
-	abf/abf_policy.c			\
-	abf/abf_api.c				\
-	abf/abf_itf_attach.c
-
-API_FILES += abf/abf.api
-
-nobase_apiinclude_HEADERS +=			\
-  abf/abf_all_api_h.h				\
-  abf/abf_msg_enum.h				\
-  abf/abf.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/acl.am b/src/plugins/acl.am
deleted file mode 100644
index f73fda6..0000000
--- a/src/plugins/acl.am
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += acl_test_plugin.la
-vppplugins_LTLIBRARIES += acl_plugin.la
-
-acl_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-acl_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-
-
-
-acl_plugin_la_LIBADD =
-
-acl_plugin_la_SOURCES =				\
-	acl/acl.c				\
-	acl/hash_lookup.c			\
-	acl/lookup_context.c                    \
-	acl/sess_mgmt_node.c			\
-	acl/dataplane_node.c			\
-	acl/public_inlines.h			\
-	acl/exported_types.h			\
-	acl/manual_fns.h			\
-	acl/acl_plugin.api.h
-
-API_FILES += acl/acl.api
-
-if CPU_X86_64
-acl_multiversioning_sources =                                    \
-        acl/dataplane_node.c
-
-
-if CC_SUPPORTS_AVX2
-###############################################################
-# AVX2
-###############################################################
-libacl_plugin_avx2_la_SOURCES = $(acl_multiversioning_sources)
-libacl_plugin_avx2_la_CFLAGS =                                 \
-        $(AM_CFLAGS)  @CPU_AVX2_FLAGS@                          \
-        -DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += libacl_plugin_avx2.la
-acl_plugin_la_LIBADD += libacl_plugin_avx2.la
-endif
-
-if CC_SUPPORTS_AVX512
-###############################################################
-# AVX512
-###############################################################
-libacl_plugin_avx512_la_SOURCES = $(acl_multiversioning_sources)
-libacl_plugin_avx512_la_CFLAGS =                               \
-        $(AM_CFLAGS) @CPU_AVX512_FLAGS@                         \
-        -DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += libacl_plugin_avx512.la
-acl_plugin_la_LIBADD += libacl_plugin_avx512.la
-endif
-endif
-
-nobase_apiinclude_HEADERS +=			\
-  acl/acl_all_api_h.h				\
-  acl/acl_msg_enum.h				\
-  acl/manual_fns.h				\
-  acl/acl.api.h
-
-acl_test_plugin_la_SOURCES = acl/acl_test.c acl/acl_plugin.api.h acl/acl_all_api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/avf.am b/src/plugins/avf.am
deleted file mode 100644
index 3a1ce8e..0000000
--- a/src/plugins/avf.am
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += avf_plugin.la
-vppapitestplugins_LTLIBRARIES += avf_test_plugin.la
-
-avf_plugin_la_LIBADD =
-avf_plugin_la_SOURCES = \
-	avf/cli.c			\
-	avf/device.c			\
-	avf/format.c			\
-	avf/input.c			\
-	avf/output.c			\
-	avf/plugin.c			\
-	avf/avf_api.c			\
-	avf/avf_plugin.api.h
-
-avf_test_plugin_la_SOURCES = \
-	avf/avf_test.c avf/avf_plugin.api.h
-
-noinst_HEADERS += avf/avf.h
-
-nobase_apiinclude_HEADERS +=		\
-		  avf/avf_all_api_h.h	\
-		  avf/avf_msg_enum.h	\
-		  avf/avf.api.h
-
-API_FILES += avf/avf.api
-
-if CPU_X86_64
-avf_multiversioning_sources = 					\
-	avf/input.c						\
-	avf/output.c
-
-if CC_SUPPORTS_AVX2
-###############################################################
-# AVX2
-###############################################################
-libavf_plugin_avx2_la_SOURCES = $(avf_multiversioning_sources)
-libavf_plugin_avx2_la_CFLAGS =				\
-	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += libavf_plugin_avx2.la
-avf_plugin_la_LIBADD += libavf_plugin_avx2.la
-endif
-
-if CC_SUPPORTS_AVX512
-###############################################################
-# AVX512
-###############################################################
-libavf_plugin_avx512_la_SOURCES = $(avf_multiversioning_sources)
-libavf_plugin_avx512_la_CFLAGS =				\
-	$(AM_CFLAGS) @CPU_AVX512_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += libavf_plugin_avx512.la
-avf_plugin_la_LIBADD += libavf_plugin_avx512.la
-endif
-endif
-
-# vi:syntax=automake
diff --git a/src/plugins/cdp.am b/src/plugins/cdp.am
deleted file mode 100644
index 1d9d77e..0000000
--- a/src/plugins/cdp.am
+++ /dev/null
@@ -1,40 +0,0 @@
-
-# Copyright (c) 2011-2018 Cisco and/or its affiliates
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += cdp_test_plugin.la
-vppplugins_LTLIBRARIES += cdp_plugin.la
-
-cdp_plugin_la_SOURCES =				\
-  cdp/cdp_all_api_h.h				\
-  cdp/cdp.c					\
-  cdp/cdp.h					\
-  cdp/cdp_input.c				\
-  cdp/cdp_msg_enum.h				\
-  cdp/cdp_node.c				\
-  cdp/cdp_periodic.c
-
-API_FILES += cdp/cdp.api
-
-nobase_apiinclude_HEADERS +=			\
-  cdp/cdp_all_api_h.h				\
-  cdp/cdp.api.h 				\
-  cdp/cdp.h					\
-  cdp/cdp_msg_enum.h				\
-  cdp/cdp_protocol.h
-
-cdp_test_plugin_la_SOURCES =			\
-  cdp/cdp_test.c				\
-  cdp/cdp.api.h 
-
-# vi:syntax=automake
diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
deleted file mode 100644
index 0165566..0000000
--- a/src/plugins/dpdk.am
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += dpdk_test_plugin.la
-vppplugins_LTLIBRARIES += dpdk_plugin.la
-
-if ENABLE_DPDK_SHARED
-dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
-else
-dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
-endif
-if WITH_AESNI_MB_LIB
-dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
-endif
-if WITH_ISA_L_CRYPTO_LIB
-dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a
-endif
-dpdk_plugin_la_CFLAGS = $(AM_CFLAGS)
-if WITH_LIBNUMA
-dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
-endif
-
-if WITH_DPDK_MLX5_PMD
-dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl,-lmnl
-else
-dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
-endif
-dpdk_plugin_la_LIBADD =
-
-dpdk_plugin_la_SOURCES =					\
-  dpdk/main.c							\
-  dpdk/buffer.c							\
-  dpdk/thread.c							\
-  dpdk/api/dpdk_api.c						\
-  dpdk/device/cli.c						\
-  dpdk/device/common.c						\
-  dpdk/device/flow.c						\
-  dpdk/device/dpdk_priv.h					\
-  dpdk/device/device.c						\
-  dpdk/device/format.c						\
-  dpdk/device/init.c						\
-  dpdk/device/node.c						\
-  dpdk/hqos/hqos.c						\
-  dpdk/ipsec/esp_encrypt.c					\
-  dpdk/ipsec/esp_decrypt.c					\
-  dpdk/ipsec/crypto_node.c					\
-  dpdk/ipsec/cli.c						\
-  dpdk/ipsec/ipsec.c						\
-  dpdk/api/dpdk_plugin.api.h
-
-API_FILES += dpdk/api/dpdk.api
-
-if CPU_X86_64
-dpdk_multiversioning_sources = 					\
-	dpdk/buffer.c						\
-	dpdk/device/node.c					\
-	dpdk/device/device.c
-
-if CC_SUPPORTS_AVX2
-###############################################################
-# AVX2
-###############################################################
-libdpdk_plugin_avx2_la_SOURCES = $(dpdk_multiversioning_sources)
-libdpdk_plugin_avx2_la_CFLAGS =					\
-	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += libdpdk_plugin_avx2.la
-dpdk_plugin_la_LIBADD += libdpdk_plugin_avx2.la
-endif
-
-if CC_SUPPORTS_AVX512
-###############################################################
-# AVX512
-###############################################################
-libdpdk_plugin_avx512_la_SOURCES = $(dpdk_multiversioning_sources)
-libdpdk_plugin_avx512_la_CFLAGS =				\
-	$(AM_CFLAGS) @CPU_AVX512_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += libdpdk_plugin_avx512.la
-dpdk_plugin_la_LIBADD += libdpdk_plugin_avx512.la
-endif
-endif
-
-nobase_include_HEADERS +=					\
-  dpdk/device/dpdk.h						\
-  dpdk/api/dpdk_all_api_h.h					\
-  dpdk/ipsec/ipsec.h
-
-dpdk_test_plugin_la_SOURCES = 					\
-  dpdk/api/dpdk_test.c dpdk/api/dpdk_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/flowprobe.am b/src/plugins/flowprobe.am
deleted file mode 100644
index c56e246..0000000
--- a/src/plugins/flowprobe.am
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += flowprobe_plugin.la
-vppapitestplugins_LTLIBRARIES += flowprobe_test_plugin.la
-
-flowprobe_plugin_la_SOURCES = flowprobe/flowprobe.c	\
-        flowprobe/node.c				\
-	flowprobe/flowprobe_plugin.api.h
-
-BUILT_SOURCES +=				\
-	flowprobe/flowprobe.api.h		\
-	flowprobe/flowprobe.api.json
-
-noinst_HEADERS +=				\
-  flowprobe/flowprobe_all_api_h.h		\
-  flowprobe/flowprobe_msg_enum.h		\
-  flowprobe/flowprobe.api.h
-
-flowprobe_test_plugin_la_SOURCES = \
-  flowprobe/flowprobe_test.c			\
-  flowprobe/flowprobe_plugin.api.h
-
-API_FILES += flowprobe/flowprobe.api
-
-# vi:syntax=automake
diff --git a/src/plugins/gbp.am b/src/plugins/gbp.am
deleted file mode 100644
index 7271a0d..0000000
--- a/src/plugins/gbp.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += gbp_plugin.la
-
-gbp_plugin_la_SOURCES = 		\
-	gbp/gbp_subnet.c		\
-	gbp/gbp_contract.c		\
-	gbp/gbp_endpoint.c		\
-	gbp/gbp_endpoint_group.c	\
-	gbp/gbp_classify.c  		\
-	gbp/gbp_recirc.c  		\
-	gbp/gbp_policy.c		\
-	gbp/gbp_policy_dpo.c		\
-	gbp/gbp_fwd.c			\
-	gbp/gbp_fwd_dpo.c		\
-	gbp/gbp_api.c
-
-API_FILES += gbp/gbp.api
-
-noinst_HEADERS += 		\
-	gbp/gbp.h		\
-	gbp/gbp_all_api_h.h	\
-	gbp/gbp_msg_enum.h	\
-	gbp/gbp.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/gtpu.am b/src/plugins/gtpu.am
deleted file mode 100644
index f4cca09..0000000
--- a/src/plugins/gtpu.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2016 Intel and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += gtpu_test_plugin.la
-vppplugins_LTLIBRARIES += gtpu_plugin.la
-
-gtpu_plugin_la_SOURCES =		\
-	gtpu/gtpu_decap.c		    \
-    gtpu/gtpu_encap.c		    \
-	gtpu/gtpu.c				    \
-	gtpu/gtpu_api.c
-
-BUILT_SOURCES +=			\
-	gtpu/gtpu.api.h		    \
-	gtpu/gtpu.api.json
-
-API_FILES += gtpu/gtpu.api
-
-nobase_apiinclude_HEADERS +=			\
-  gtpu/gtpu_all_api_h.h		\
-  gtpu/gtpu_msg_enum.h		\
-  gtpu/gtpu.api.h
-
-gtpu_test_plugin_la_SOURCES = \
-  gtpu/gtpu_test.c            \
-  gtpu/gtpu_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/igmp.am b/src/plugins/igmp.am
deleted file mode 100644
index 503d4cb..0000000
--- a/src/plugins/igmp.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += igmp_plugin.la
-
-igmp_plugin_la_SOURCES =		\
-	igmp/igmp.c			\
-	igmp/igmp_query.c		\
-	igmp/igmp_report.c		\
-	igmp/igmp_group.c		\
-	igmp/igmp_src.c			\
-	igmp/igmp_config.c		\
-	igmp/igmp_cli.c			\
-	igmp/igmp_api.c			\
-	igmp/igmp_input.c		\
-	igmp/igmp_plugin.api.h		\
-	igmp/igmp_timer.c		\
-	igmp/igmp_pkt.c			\
-	igmp/igmp_ssm_range.c		\
-	igmp/igmp_format.c
-
-nobase_apiinclude_HEADERS += 		\
-	igmp/igmp_all_api_h.h		\
-	igmp/igmp_msg_enum.h		\
-	igmp/igmp.api.h
-
-API_FILES += igmp/igmp.api
-
-# vi:syntax=automake
diff --git a/src/plugins/ila.am b/src/plugins/ila.am
deleted file mode 100644
index d900f3e..0000000
--- a/src/plugins/ila.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += ila_plugin.la
-
-ila_plugin_la_SOURCES = ila/ila.c
-
-noinst_HEADERS += ila/ila.h
-
-# vi:syntax=automake
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
deleted file mode 100644
index 6210958..0000000
--- a/src/plugins/ioam.am
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-########################################
-# iOAM Proof of Transit
-########################################
-
-IOAM_POT_SRC =					\
-	ioam/lib-pot/pot_util.c			\
-	ioam/encap/ip6_ioam_pot.c		\
-	ioam/lib-pot/pot_util.h			\
-	ioam/lib-pot/math64.h			\
-	ioam/lib-pot/pot_api.c
-
-IOAM_POT_NOINST_HDR =				\
-  ioam/lib-pot/pot_all_api_h.h			\
-  ioam/lib-pot/pot_msg_enum.h			\
-  ioam/lib-pot/pot.api.h			\
-  ioam/lib-pot/pot_util.h			\
-  ioam/lib-pot/math64.h
-
-IOAM_POT_API = ioam/lib-pot/pot.api
-
-########################################
-# iOAM trace export for IPv6
-########################################
-
-IOAM_EXPORT_SRC =		  \
-ioam/export/ioam_export.c         \
-ioam/export/node.c                \
-ioam/export/ioam_export.api.h     \
-ioam/export/ioam_export_thread.c
-
-IOAM_EXPORT_NOINST_HDR =                \
-  ioam/export/ioam_export_all_api_h.h   \
-  ioam/export/ioam_export_msg_enum.h    \
-  ioam/export/ioam_export.api.h
-
-IOAM_EXPORT_API = ioam/export/ioam_export.api
-
-########################################
-# iOAM Trace
-########################################
-IOAM_TRACE_SRC =				\
-	ioam/lib-trace/trace_util.c		\
-	ioam/encap/ip6_ioam_trace.c		\
-	ioam/lib-trace/trace_api.c
-
-IOAM_TRACE_NOINST_HDR =                 \
-  ioam/lib-trace/trace_all_api_h.h	\
-  ioam/lib-trace/trace_msg_enum.h	\
-  ioam/lib-trace/trace.api.h		\
-  ioam/lib-trace/trace_util.h		\
-  ioam/encap/ip6_ioam_trace.h		\
-  ioam/lib-trace/trace_config.h
-
-IOAM_TRACE_API = ioam/lib-trace/trace.api
-
-nobase_include_HEADERS +=                       \
-       ioam/lib-trace/trace_util.h		\
-       ioam/export-common/ioam_export.h
-
-########################################
-# VxLAN-GPE
-########################################
-IOAM_VXLAN_GPE_SRC =					\
-	ioam/lib-vxlan-gpe/ioam_encap.c			\
-	ioam/lib-vxlan-gpe/ioam_decap.c			\
-	ioam/lib-vxlan-gpe/ioam_transit.c		\
-	ioam/lib-vxlan-gpe/ioam_pop.c			\
-	ioam/lib-vxlan-gpe/vxlan_gpe_api.c		\
-	ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c	\
-	ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c	\
-	ioam/export-vxlan-gpe/vxlan_gpe_node.c		\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h\
-	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
-
-IOAM_VXLAN_GPE_NOINST_HDR =                       		\
-  ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h			\
-  ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h			\
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h                    \
-  ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h				\
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h       \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h        \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h
-
-IOAM_VXLAN_GPE_API  = ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
-IOAM_VXLAN_GPE_API += ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
-
-########################################
-# iOAM E2E
-########################################
-
-IOAM_E2E_SRC =                			\
-	ioam/encap/ip6_ioam_e2e.c               \
-	ioam/encap/ip6_ioam_seqno.c		\
-	ioam/lib-e2e/ioam_seqno_lib.c
-
-IOAM_E2E_NOINST_HDR =                    \
-	ioam/encap/ip6_ioam_e2e.h        \
-	ioam/encap/ip6_ioam_seqno.h	 \
-	ioam/lib-e2e/ioam_seqno_lib.h
-
-########################################
-# ipfix collector
-########################################
-
-IPFIX_COLLECTOR_SRC =				\
-	ioam/ipfixcollector/ipfixcollector.c	\
-	ioam/ipfixcollector/node.c		\
-	ioam/ipfixcollector/ipfixcollector.h
-
-########################################
-# iOAM Analyse
-########################################
-
-IOAM_ANALYSE_SRC = 				\
-	ioam/analyse/ip6/ip6_ioam_analyse.c	\
-	ioam/analyse/ip6/node.c			\
-	ioam/analyse/ip6/ip6_ioam_analyse.h	\
-	ioam/analyse/ioam_summary_export.c	\
-	ioam/analyse/ioam_analyse.h		\
-	ioam/analyse/ioam_summary_export.h
-
-########################################
-# iOAM record cache and rewrite
-########################################
-
-IOAM_IP6_MANYCAST_SRC =        \
-ioam/ip6/ioam_cache.c                     \
-ioam/ip6/ioam_cache_node.c                \
-ioam/ip6/ioam_cache_tunnel_select_node.c  \
-ioam/ip6/ioam_cache.api.h
-
-IOAM_IP6_MANYCAST_API = ioam/ip6/ioam_cache.api
-
-IOAM_IP6_MANYCAST_NOINST_HDR =      \
-  ioam/ip6/ioam_cache_all_api_h.h   \
-  ioam/ip6/ioam_cache_msg_enum.h    \
-  ioam/ip6/ioam_cache.api.h
-
-# udp ping
-########################################
-
-UDP_PING_SRC = 					        \
-	ioam/udp-ping/udp_ping_node.c	    \
-	ioam/udp-ping/udp_ping_util.c		\
-	ioam/udp-ping/udp_ping_export.c		\
-	ioam/udp-ping/udp_ping_api.c
-
-UDP_PING_NOINST_HDR = 				    \
-	ioam/udp-ping/udp_ping_packet.h		\
-	ioam/udp-ping/udp_ping.h		    \
-	ioam/udp-ping/udp_ping_util.h		\
-	ioam/udp-ping/udp_ping_all_api_h.h	\
-	ioam/udp-ping/udp_ping_msg_enum.h	\
-	ioam/udp-ping/udp_ping.api.h
-
-UDP_PING_API = ioam/udp-ping/udp_ping.api
-########################################
-# iOAM plugins
-########################################
-
-ioam_plugin_la_SOURCES =		    \
-        $(IOAM_POT_SRC)             \
-        $(IOAM_EXPORT_SRC)          \
-        $(IOAM_TRACE_SRC)           \
-        $(IOAM_VXLAN_GPE_SRC)   	\
-        $(IOAM_E2E_SRC)			    \
-		$(IPFIX_COLLECTOR_SRC)		\
-		$(IOAM_ANALYSE_SRC)		    \
-        $(IOAM_IP6_MANYCAST_SRC)    \
-		$(UDP_PING_SRC)
-
-API_FILES +=				            \
-        $(IOAM_POT_API)                 \
-        $(IOAM_EXPORT_API)              \
-        $(IOAM_TRACE_API)               \
-        $(IOAM_VXLAN_GPE_API)		    \
-        $(IOAM_IP6_MANYCAST_API)        \
-		$(UDP_PING_API)
-
-nobase_apiinclude_HEADERS +=                               \
-        $(IOAM_POT_NOINST_HDR)                  \
-        $(IOAM_EXPORT_NOINST_HDR)               \
-        $(IOAM_TRACE_NOINST_HDR)                \
-        $(IOAM_VXLAN_GPE_NOINST_HDR)            \
-        $(IOAM_E2E_NOINST_HDR)			        \
-        $(IOAM_IP6_MANYCAST_NOINST_HDR)         \
-		$(UDP_PING_NOINST_HDR)
-
-vppplugins_LTLIBRARIES += ioam_plugin.la
-
-########################################
-# iOAM plugins
-########################################
-
-ioam_test_plugin_la_SOURCES = \
-  ioam/ioam_test.c						\
-  ioam/lib-pot/pot_test.c					\
-  ioam/lib-pot/pot_plugin.api.h					\
-  ioam/lib-trace/trace_test.c		  \
-  ioam/lib-trace/trace_plugin.api.h   \
-  ioam/export/ioam_export_test.c				\
-  ioam/export/ioam_export_plugin.api.h				\
-  ioam/lib-vxlan-gpe/vxlan_gpe_test.c				\
-  ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h			\
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c		\
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h	\
-  ioam/udp-ping/udp_ping_test.c					\
-  ioam/udp-ping/udp_ping_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_test_plugin.la
-
-# vi:syntax=automake
diff --git a/src/plugins/ixge.am b/src/plugins/ixge.am
deleted file mode 100644
index 7e61344..0000000
--- a/src/plugins/ixge.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += ixge_plugin.la
-
-ixge_plugin_la_SOURCES = ixge/ixge.c
-
-noinst_HEADERS += ixge/ixge.h
-
-# vi:syntax=automake
diff --git a/src/plugins/l2e.am b/src/plugins/l2e.am
deleted file mode 100644
index da2c456..0000000
--- a/src/plugins/l2e.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += l2e_plugin.la
-
-l2e_plugin_la_SOURCES = 	\
-	l2e/l2e.c		\
-	l2e/l2e_api.c
-
-API_FILES += l2e/l2e.api
-
-noinst_HEADERS += 		\
-	l2e/l2e.h		\
-	l2e/l2e_all_api_h.h	\
-	l2e/l2e_msg_enum.h	\
-	l2e/l2e.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/lacp.am b/src/plugins/lacp.am
deleted file mode 100644
index c7e571d..0000000
--- a/src/plugins/lacp.am
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2017 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += lacp_plugin.la
-vppapitestplugins_LTLIBRARIES += lacp_test_plugin.la
-
-lacp_plugin_la_LIBADD =
-lacp_plugin_la_SOURCES = lacp/lacp.c   \
-  lacp/lacp_api.c                  \
-  lacp/selection.c                 \
-  lacp/rx_machine.c                \
-  lacp/tx_machine.c                \
-  lacp/mux_machine.c               \
-  lacp/ptx_machine.c               \
-  lacp/cli.c			   \
-  lacp/input.c			   \
-  lacp/node.c
-
-lacp_test_plugin_la_SOURCES = \
-  lacp/lacp_test.c
-
-noinst_HEADERS += lacp/protocol.h  \
-  lacp/machine.h                   \
-  lacp/rx_machine.h                \
-  lacp/tx_machine.h                \
-  lacp/mux_machine.h               \
-  lacp/ptx_machine.h               \
-  lacp/node.h
-
-nobase_apiinclude_HEADERS +=       \
-  lacp/lacp_all_api_h.h            \
-  lacp/lacp_msg_enum.h             \
-  lacp/lacp.api.h
-
-API_FILES += lacp/lacp.api
-
-# vi:syntax=automake
diff --git a/src/plugins/lb.am b/src/plugins/lb.am
deleted file mode 100644
index f0ff626..0000000
--- a/src/plugins/lb.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += lb_test_plugin.la
-vppplugins_LTLIBRARIES += lb_plugin.la
-
-lb_plugin_la_SOURCES =			\
-	lb/lb.c				\
-	lb/node.c			\
-	lb/cli.c			\
-	lb/util.c			\
-	lb/api.c
-
-BUILT_SOURCES +=			\
-	lb/lb.api.h			\
-	lb/lb.api.json
-
-API_FILES += lb/lb.api
-
-noinst_HEADERS +=			\
-	lb/lb.h				\
-	lb/util.h			\
-	lb/lbhash.h			\
-	lb/lb.api.h
-
-lb_test_plugin_la_SOURCES =		\
-	lb/lb_test.c			\
-	lb/lb_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/mactime.am b/src/plugins/mactime.am
deleted file mode 100644
index 46225f6..0000000
--- a/src/plugins/mactime.am
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += mactime_test_plugin.la
-vppplugins_LTLIBRARIES += mactime_plugin.la
-
-mactime_plugin_la_SOURCES = \
-  mactime/node.c \
-  mactime/mactime.c \
-  mactime/mactime.h \
-  mactime/mactime_all_api_h.h \
-  mactime/mactime_msg_enum.h
-
-API_FILES += mactime/mactime.api
-
-nobase_apiinclude_HEADERS +=		\
-  mactime/mactime_all_api_h.h \
-  mactime/mactime_msg_enum.h \
-  mactime/mactime.api.h 
-
-mactime_test_plugin_la_SOURCES = \
-  mactime/mactime_test.c \
-  mactime/mactime.api.h 
-
-# vi:syntax=automake
diff --git a/src/plugins/map.am b/src/plugins/map.am
deleted file mode 100644
index 555d700..0000000
--- a/src/plugins/map.am
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += map_test_plugin.la
-vppplugins_LTLIBRARIES += map_plugin.la
-
-map_plugin_la_SOURCES =				\
-	map/ip4_map.c				\
-	map/ip4_map_t.c				\
-	map/ip6_map.c				\
-	map/ip6_map_t.c				\
-	map/map_api.c				\
-	map/map.c				\
-	map/map_dpo.c
-
-API_FILES += map/map.api
-
-nobase_apiinclude_HEADERS +=			\
-	map/map_all_api_h.h			\
-	map/map_msg_enum.h			\
-	map/map.api.h				\
-	map/map_dpo.h				\
-	map/map.h
-
-map_test_plugin_la_SOURCES =			\
-	map/map_test.c
-
-# vi:syntax=automake
diff --git a/src/plugins/marvell.am b/src/plugins/marvell.am
deleted file mode 100644
index 2204c79..0000000
--- a/src/plugins/marvell.am
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += marvell_plugin.la
-
-marvell_plugin_la_SOURCES = \
-	marvell/plugin.c			\
-	marvell/pp2/cli.c			\
-	marvell/pp2/format.c			\
-	marvell/pp2/input.c			\
-	marvell/pp2/output.c			\
-	marvell/pp2/pp2.c
-
-marvell_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-l:libmusdk.a
-
-noinst_HEADERS += marvell/pp2/pp2.h
-
-#AUTOMAKE_OPTIONS = foreign subdir-objects
-
-#AM_CFLAGS = -Wall
-#AM_LDFLAGS = -module -shared -avoid-version
-
-#vpppluginsdir = ${libdir}/vpp_plugins
-
-#vppplugins_LTLIBRARIES = mrvl_device_plugin.la
-
-
-#mrvl_device_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-lmusdk
-#-Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
-
-# Remove *.la files
-#install-data-hook:
-#	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
-
-#CLEANFILES = $(BUILT_SOURCES)
-
-# vi:syntax=automake
diff --git a/src/plugins/memif.am b/src/plugins/memif.am
deleted file mode 100644
index e7deb7d..0000000
--- a/src/plugins/memif.am
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2017 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += memif_plugin.la
-vppapitestplugins_LTLIBRARIES += memif_test_plugin.la
-
-memif_plugin_la_LIBADD =
-memif_plugin_la_SOURCES = memif/memif.c   \
-	memif/memif_api.c                 \
-	memif/cli.c                       \
-	memif/node.c                      \
-	memif/device.c                    \
-	memif/socket.c                    \
-	memif/memif_plugin.api.h
-
-memif_test_plugin_la_SOURCES = \
-  memif/memif_test.c memif/memif_plugin.api.h
-
-noinst_HEADERS += memif/memif.h
-
-nobase_apiinclude_HEADERS +=              \
-		  memif/memif_all_api_h.h \
-		  memif/memif_msg_enum.h  \
-		  memif/memif.api.h
-
-API_FILES += memif/memif.api
-
-if CPU_X86_64
-memif_multiversioning_sources = 					\
-	memif/node.c						\
-	memif/device.c
-
-if CC_SUPPORTS_AVX2
-###############################################################
-# AVX2
-###############################################################
-memif_plugin_avx2_la_SOURCES = $(memif_multiversioning_sources)
-memif_plugin_avx2_la_CFLAGS =					\
-	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += memif_plugin_avx2.la
-memif_plugin_la_LIBADD += memif_plugin_avx2.la
-endif
-
-if CC_SUPPORTS_AVX512
-###############################################################
-# AVX512
-###############################################################
-memif_plugin_avx512_la_SOURCES = $(memif_multiversioning_sources)
-memif_plugin_avx512_la_CFLAGS =					\
-	$(AM_CFLAGS) @CPU_AVX512_FLAGS@				\
-	-DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += memif_plugin_avx512.la
-memif_plugin_la_LIBADD += memif_plugin_avx512.la
-endif
-endif
-
-# vi:syntax=automake
diff --git a/src/plugins/nat.am b/src/plugins/nat.am
deleted file mode 100644
index ce3e5a2..0000000
--- a/src/plugins/nat.am
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += nat_test_plugin.la
-vppplugins_LTLIBRARIES += nat_plugin.la
-
-nat_plugin_la_SOURCES = nat/nat.c		\
-        nat/nat_api.c				\
-        nat/in2out.c				\
-        nat/out2in.c				\
-	nat/nat_plugin.api.h			\
-        nat/nat_ipfix_logging.c	        	\
-        nat/nat_det.c               		\
-        nat/nat_reass.c             		\
-        nat/nat_dpo.c                           \
-        nat/nat44_cli.c                         \
-        nat/nat64.c                  		\
-        nat/nat64_cli.c              		\
-        nat/nat64_in2out.c           		\
-        nat/nat64_out2in.c           		\
-        nat/nat64_db.c                       	\
-        nat/dslite_dpo.c                     	\
-        nat/dslite.c                         	\
-        nat/dslite_in2out.c                  	\
-        nat/dslite_out2in.c                  	\
-        nat/dslite_cli.c                        \
-        nat/dslite_ce_encap.c                   \
-        nat/dslite_ce_decap.c                   \
-        nat/nat66.c                           	\
-        nat/nat66_cli.c                       	\
-        nat/nat66_in2out.c                    	\
-        nat/nat66_out2in.c
-
-API_FILES += nat/nat.api
-
-nobase_apiinclude_HEADERS +=		\
-  nat/nat_all_api_h.h			\
-  nat/nat_msg_enum.h			\
-  nat/nat.api.h
-
-nat_test_plugin_la_SOURCES = \
-  nat/nat_test.c nat/nat_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/nsh.am b/src/plugins/nsh.am
deleted file mode 100644
index fb1d558..0000000
--- a/src/plugins/nsh.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2016 Intel and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += nsh_test_plugin.la
-vppplugins_LTLIBRARIES += nsh_plugin.la
-
-nsh_plugin_la_SOURCES =	    \
-    nsh/nsh.c               \
-	nsh/nsh_pop.c           \
-	nsh/nsh_output.c        \
-	nsh/nsh-md2-ioam/nsh_md2_ioam.c       \
-	nsh/nsh-md2-ioam/nsh_md2_ioam_api.c   \
-	nsh/nsh-md2-ioam/md2_ioam_transit.c   \
-	nsh/nsh-md2-ioam/nsh_md2_ioam_trace.c \
-	nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c   \
-	nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export_thread.c   \
-	nsh/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_node.c
-
-BUILT_SOURCES +=            \
-	nsh/nsh_packet.h        \
-	nsh/nsh.api.h           \
-	nsh/nsh.api.json        \
-	nsh/nsh-md2-ioam/nsh_md2_ioam.h   \
-	nsh/nsh-md2-ioam/nsh_md2_ioam_util.h
-
-API_FILES += nsh/nsh.api
-
-nobase_apiinclude_HEADERS +=   \
-  nsh/nsh.api.h
-
-nsh_test_plugin_la_SOURCES = \
-  nsh/nsh_test.c            \
-  nsh/nsh_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/pppoe.am b/src/plugins/pppoe.am
deleted file mode 100644
index 5db9b7a..0000000
--- a/src/plugins/pppoe.am
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017 Intel and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppapitestplugins_LTLIBRARIES += pppoe_test_plugin.la
-vppplugins_LTLIBRARIES += pppoe_plugin.la
-
-pppoe_plugin_la_SOURCES =	\
-    pppoe/pppoe_decap.c		\
-    pppoe/pppoe_cp.c		\
-    pppoe/pppoe_cp_node.c	\
-    pppoe/pppoe.c		\
-    pppoe/pppoe_api.c
-
-BUILT_SOURCES +=		\
-    pppoe/pppoe.api.h		\
-    pppoe/pppoe.api.json
-
-API_FILES += pppoe/pppoe.api
-
-nobase_apiinclude_HEADERS +=	\
-    pppoe/pppoe_all_api_h.h	\
-    pppoe/pppoe_msg_enum.h	\
-    pppoe/pppoe.api.h
-
-pppoe_test_plugin_la_SOURCES =	\
-    pppoe/pppoe_test.c		\
-    pppoe/pppoe_plugin.api.h
-
-# vi:syntax=automake
diff --git a/src/plugins/srv6_ad.am b/src/plugins/srv6_ad.am
deleted file mode 100644
index ea1297b..0000000
--- a/src/plugins/srv6_ad.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += srv6ad_plugin.la
-
-srv6ad_plugin_la_SOURCES =			\
-	srv6-ad/ad.c	\
-	srv6-ad/node.c
-
-noinst_HEADERS += srv6-ad/ad.h
-
-# vi:syntax=automake
diff --git a/src/plugins/srv6_am.am b/src/plugins/srv6_am.am
deleted file mode 100644
index 5ae7dac..0000000
--- a/src/plugins/srv6_am.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += srv6am_plugin.la
-
-srv6am_plugin_la_SOURCES =			\
-	srv6-am/am.c	\
-	srv6-am/node.c
-
-noinst_HEADERS += srv6-am/am.h
-
-# vi:syntax=automake
diff --git a/src/plugins/srv6_as.am b/src/plugins/srv6_as.am
deleted file mode 100644
index 09a41b9..0000000
--- a/src/plugins/srv6_as.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += srv6as_plugin.la
-
-srv6as_plugin_la_SOURCES =			\
-	srv6-as/as.c	\
-	srv6-as/node.c
-
-noinst_HEADERS += srv6-as/as.h
-
-# vi:syntax=automake
-
diff --git a/src/plugins/stn.am b/src/plugins/stn.am
deleted file mode 100644
index 5e755e2..0000000
--- a/src/plugins/stn.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2016 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += stn_plugin.la
-vppapitestplugins_LTLIBRARIES += stn_test_plugin.la
-
-stn_plugin_la_SOURCES =				\
-	stn/stn.c				\
-	stn/stn_api.c				\
-	stn/stn_plugin.api.h
-
-stn_test_plugin_la_SOURCES =			\
-	stn/stn_test.c				\
-	stn/stn_plugin.api.h
-
-noinst_HEADERS += stn/stn.h
-
-nobase_apiinclude_HEADERS +=			\
-	stn/stn_all_api_h.h			\
-	stn/stn_msg_enum.h			\
-	stn/stn.api.h
-
-API_FILES += stn/stn.api
-
-# vi:syntax=automake
diff --git a/src/plugins/tlsmbedtls.am b/src/plugins/tlsmbedtls.am
deleted file mode 100644
index 5d1cf2b..0000000
--- a/src/plugins/tlsmbedtls.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-vppplugins_LTLIBRARIES += tlsmbedtls_plugin.la
-
-tlsmbedtls_plugin_la_SOURCES = tlsmbedtls/tls_mbedtls.c
-tlsmbedtls_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lmbedtls -lmbedx509 -lmbedcrypto
-tlsmbedtls_plugin_la_CFLAGS = $(AM_CFLAGS)
-
-# vi:syntax=automake
diff --git a/src/plugins/tlsopenssl.am b/src/plugins/tlsopenssl.am
deleted file mode 100644
index 88a2092..0000000
--- a/src/plugins/tlsopenssl.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-vppplugins_LTLIBRARIES += tlsopenssl_plugin.la
-
-tlsopenssl_plugin_la_SOURCES = \
-                    tlsopenssl/tls_openssl.c      \
-                    tlsopenssl/tls_async.c        \
-                    tlsopenssl/tls_openssl.h
-tlsopenssl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lssl -lcrypto
-tlsopenssl_plugin_la_CFLAGS = $(AM_CFLAGS)
-
-# vi:syntax=automake
diff --git a/src/plugins/unittest.am b/src/plugins/unittest.am
deleted file mode 100644
index 3fba00f..0000000
--- a/src/plugins/unittest.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Copyright (c) <current-year> <your-organization>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vppplugins_LTLIBRARIES += unittest_plugin.la
-
-unittest_plugin_la_SOURCES = \
-  unittest/unittest.c \
-  unittest/tcp_test.c \
-  unittest/bihash_test.c
-
-# vi:syntax=automake
diff --git a/src/suffix-rules.mk b/src/suffix-rules.mk
deleted file mode 100644
index 8b1ab83..0000000
--- a/src/suffix-rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Shared suffix rules
-# Please do not set "SUFFIXES = .api.h .api" here
-
-VPPAPIGEN = $(top_srcdir)/tools/vppapigen/vppapigen
-%.api.h: %.api
-	@echo "  APIGEN  " $@ ;				                     \
-	mkdir -p `dirname $@` ;						     \
-	$(VPPAPIGEN) --includedir $(top_srcdir) --input $< --output $@
-
-%.api.json: %.api
-	@echo "  JSON API" $@ ;						     \
-	mkdir -p `dirname $@` ;						     \
-	$(VPPAPIGEN) --includedir $(top_srcdir) --input $< JSON --output $@
diff --git a/src/svm.am b/src/svm.am
deleted file mode 100644
index 7413e67..0000000
--- a/src/svm.am
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-bin_PROGRAMS += svmtool svmdbtool
-
-nobase_include_HEADERS += 		\
-  svm/ssvm.h 					\
-  svm/svm_common.h 				\
-  svm/svmdb.h 					\
-  svm/svm_fifo.h 				\
-  svm/svm_fifo_segment.h		\
-  svm/queue.h					\
-  svm/message_queue.h			\
-  svm/svm.h
-
-lib_LTLIBRARIES += libsvm.la libsvmdb.la
-
-libsvm_la_SOURCES =				\
-  svm/svm.c 					\
-  svm/ssvm.c 					\
-  svm/svm_fifo.c 				\
-  svm/svm_fifo_segment.c		\
-  svm/queue.c					\
-  svm/message_queue.c
-
-libsvm_la_LIBADD = libvppinfra.la -lrt -lpthread
-libsvm_la_DEPENDENCIES = libvppinfra.la
-
-svmtool_SOURCES = svm/svmtool.c
-svmtool_LDADD = libsvm.la libvppinfra.la -lpthread -lrt
-
-libsvmdb_la_LIBADD = libvppinfra.la libsvm.la
-libsvmdb_la_DEPENDENCIES = libvppinfra.la libsvm.la
-libsvmdb_la_SOURCES = svm/svmdb.c
-
-svmdbtool_SOURCES = svm/svmdbtool.c
-svmdbtool_LDADD = libsvmdb.la libsvm.la libvppinfra.la -lpthread -lrt
-
-noinst_PROGRAMS += 				\
-  test_svm_fifo1				\
-  test_svm_message_queue
-
-test_svm_fifo1_SOURCES = svm/test_svm_fifo1.c
-test_svm_fifo1_LDADD = libsvm.la libvppinfra.la -lpthread -lrt
-test_svm_fifo1_LDFLAGS = -static
-
-test_svm_message_queue_SOURCES = svm/test_svm_message_queue.c
-test_svm_message_queue_LDADD = libsvm.la libvppinfra.la -lpthread -lrt
-test_svm_message_queue_LDFLAGS = -static
-
-# vi:syntax=automake
diff --git a/src/vcl.am b/src/vcl.am
deleted file mode 100644
index 45cf80c..0000000
--- a/src/vcl.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-lib_LTLIBRARIES += libvppcom.la libvcl_ldpreload.la
-
-libvppcom_la_SOURCES =
-libvcl_ldpreload_la_SOURCES =
-libvppcom_la_DEPENDENCIES =			\
-	libsvm.la				\
-	libvlibmemoryclient.la
-
-libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
-
-libvppcom_la_SOURCES +=				\
-  vcl/vppcom.c					\
-  vcl/vcl_bapi.c				\
-  vcl/vcl_cfg.c					\
-  vcl/vcl_debug.h				\
-  vcl/vcl_event.c				\
-  vcl/vcl_private.h				\
-  vcl/vcl_private.c				\
-  $(libvppinfra_la_SOURCES)			\
-  $(libsvm_la_SOURCES)				\
-  $(libvlibmemoryclient_la_SOURCES)
-
-nobase_include_HEADERS +=			\
-  vcl/vcl_event.h				\
-  vcl/vppcom.h
-
-libvcl_ldpreload_la_LIBADD =  $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
-
-libvcl_ldpreload_la_SOURCES +=			\
-  vcl/ldp_socket_wrapper.c			\
-  vcl/ldp.c					\
-  $(libvppcom_la_SOURCES)
-
-nobase_include_HEADERS +=			\
-  vcl/ldp_socket_wrapper.h			\
-  vcl/ldp_glibc_socket.h			\
-  vcl/ldp.h
-
-noinst_PROGRAMS +=				\
-	vcl_test_server				\
-	vcl_test_client				\
-	sock_test_server			\
-	sock_test_client			\
-	test_vcl_listener_server		\
-	test_vcl_listener_client
-
-
-test_vcl_listener_server_SOURCES = vcl/test_vcl_listener_server.c
-test_vcl_listener_server_LDADD = libvppcom.la
-
-test_vcl_listener_client_SOURCES = vcl/test_vcl_listener_client.c
-test_vcl_listener_client_LDADD = libvppcom.la
-
-vcl_test_server_SOURCES = vcl/vcl_test_server.c
-vcl_test_server_LDADD = libvppcom.la
-
-
-vcl_test_client_SOURCES = vcl/vcl_test_client.c
-vcl_test_client_LDADD = libvppcom.la
-
-sock_test_server_SOURCES = vcl/sock_test_server.c
-sock_test_client_SOURCES = vcl/sock_test_client.c
-
-nobase_include_HEADERS +=			\
-  vcl/sock_test_common.h			\
-  vcl/sock_test.h				\
-  vcl/vcl_test.h
-
-# vi:syntax=automake
diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
index b6d4964..b0a283c 100644
--- a/src/vcl/CMakeLists.txt
+++ b/src/vcl/CMakeLists.txt
@@ -26,6 +26,15 @@
   vppinfra svm vlibmemoryclient rt pthread
 )
 
+add_vpp_library(vcl_ldpreload
+  SOURCES
+  ldp_socket_wrapper.c
+  ldp.c
+
+  LINK_LIBRARIES
+  vppinfra svm vlibmemoryclient rt pthread vppcom
+)
+
 add_vpp_headers(vcl
   ldp.h
   vcl_event.h
diff --git a/src/vlib-api.am b/src/vlib-api.am
deleted file mode 100644
index 4c732b0..0000000
--- a/src/vlib-api.am
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-lib_LTLIBRARIES += libvlibmemory.la libvlibmemoryclient.la
-
-libvlibmemory_la_DEPENDENCIES = libvppinfra.la libsvm.la libvlib.la
-libvlibmemory_la_LIBADD = $(libvlibmemory_la_DEPENDENCIES) -lpthread
-libvlibmemory_la_SOURCES =			\
-	vlibapi/api.h				\
-        vlibapi/api_helper_macros.h		\
-	vlibapi/api_shared.c			\
-	vlibapi/node_serialize.c		\
-	vlibmemory/api.h			\
-	vlibmemory/memclnt.api			\
-	vlibmemory/memory_api.c			\
-	vlibmemory/memory_shared.c		\
-	vlibmemory/socket_api.c			\
-	vlibmemory/vlib_api.c			\
-	vlibmemory/vlib_api_cli.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h
-
-nobase_include_HEADERS += 			\
-	vlibapi/api.h				\
-	vlibapi/api_common.h			\
-	vlibapi/api_helper_macros.h		\
-	vlibapi/vat_helper_macros.h
-
-libvlibmemoryclient_la_DEPENDENCIES = libvppinfra.la libsvm.la
-libvlibmemoryclient_la_LIBADD = $(libvlibmemoryclient_la_DEPENDENCIES) -lpthread
-libvlibmemoryclient_la_SOURCES = 		\
-        vlibapi/api_helper_macros.h		\
-	vlibapi/api_shared.c			\
-	vlibapi/node_serialize.c		\
-	vlibmemory/memclnt.api			\
-	vlibmemory/memory_client.c		\
-	vlibmemory/memory_shared.c		\
-	vlibmemory/socket_client.c		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h
-
-nobase_include_HEADERS +=			\
-	vlibmemory/api.h			\
-	vlibmemory/memory_api.h			\
-	vlibmemory/memory_shared.h		\
-	vlibmemory/memory_client.h		\
-	vlibmemory/socket_api.h			\
-	vlibmemory/socket_client.h		\
-	vlibmemory/vl_memory_api_h.h		\
-	vlibmemory/vl_memory_msg_enum.h		\
-	vlibmemory/memclnt.api.h
-
-BUILT_SOURCES +=				\
-	vlibmemory/memclnt.api.h		\
-	vlibmemory/memclnt.api.json
-
-API_FILES += vlibmemory/memclnt.api 
-
-# vi:syntax=automake
diff --git a/src/vlib.am b/src/vlib.am
deleted file mode 100644
index 8756f9b..0000000
--- a/src/vlib.am
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-lib_LTLIBRARIES += libvlib.la
-libvlib_la_LIBADD = libvppinfra.la -ldl -lpthread
-libvlib_la_DEPENDENCIES = libvppinfra.la
-
-libvlib_la_SOURCES =				\
-  vlib/buffer.c					\
-  vlib/buffer_serialize.c			\
-  vlib/cli.c					\
-  vlib/cli.h					\
-  vlib/config.h					\
-  vlib/counter.c				\
-  vlib/error.c					\
-  vlib/format.c					\
-  vlib/i2c.c					\
-  vlib/init.c					\
-  vlib/linux/pci.c				\
-  vlib/linux/physmem.c				\
-  vlib/linux/vfio.c				\
-  vlib/log.c					\
-  vlib/main.c					\
-  vlib/mc.c					\
-  vlib/node.c					\
-  vlib/node_cli.c				\
-  vlib/node_format.c				\
-  vlib/pci/pci.c				\
-  vlib/threads.c				\
-  vlib/threads_cli.c				\
-  vlib/trace.c
-
-nobase_include_HEADERS +=			\
-  vlib/buffer_funcs.h				\
-  vlib/buffer_node.h				\
-  vlib/buffer.h					\
-  vlib/cli.h					\
-  vlib/cli_funcs.h				\
-  vlib/config.h					\
-  vlib/counter.h				\
-  vlib/defs.h					\
-  vlib/error_funcs.h				\
-  vlib/error.h					\
-  vlib/format_funcs.h				\
-  vlib/global_funcs.h				\
-  vlib/i2c.h					\
-  vlib/init.h					\
-  vlib/linux/vfio.h				\
-  vlib/log.h					\
-  vlib/main.h					\
-  vlib/mc.h					\
-  vlib/node_funcs.h				\
-  vlib/node.h					\
-  vlib/physmem.h				\
-  vlib/pci/pci.h				\
-  vlib/pci/pci_config.h				\
-  vlib/physmem_funcs.h				\
-  vlib/threads.h				\
-  vlib/trace_funcs.h				\
-  vlib/trace.h					\
-  vlib/vlib.h
-
-libvlib_la_SOURCES +=				\
-  vlib/unix/cj.c				\
-  vlib/unix/cli.c				\
-  vlib/unix/input.c				\
-  vlib/unix/main.c				\
-  vlib/unix/mc_socket.c				\
-  vlib/unix/plugin.c				\
-  vlib/unix/plugin.h				\
-  vlib/unix/util.c
-
-nobase_include_HEADERS +=			\
-  vlib/unix/cj.h				\
-  vlib/unix/mc_socket.h				\
-  vlib/unix/plugin.h				\
-  vlib/unix/unix.h
-
-# vi:syntax=automake
diff --git a/src/vnet.am b/src/vnet.am
deleted file mode 100644
index 8235d9b..0000000
--- a/src/vnet.am
+++ /dev/null
@@ -1,1370 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-lib_LTLIBRARIES += libvnet.la
-noinst_LTLIBRARIES =
-
-libvnet_la_SOURCES =
-libvnet_la_DEPENDENCIES = \
-	libvppinfra.la		\
-	libvlib.la		\
-	libsvmdb.la		\
-	libsvm.la 		\
-	libvlibmemory.la
-libvnet_multiversioning_sources =
-
-libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
-
-if WITH_LIBSSL
-libvnet_la_LIBADD += -lcrypto
-endif
-
-########################################
-# Generic stuff
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/buffer.c					\
-  vnet/config.c					\
-  vnet/devices/devices.c			\
-  vnet/devices/netlink.c			\
-  vnet/flow/flow.c				\
-  vnet/flow/flow_cli.c				\
-  vnet/handoff.c				\
-  vnet/interface.c				\
-  vnet/interface_api.c				\
-  vnet/interface_cli.c				\
-  vnet/interface_format.c			\
-  vnet/interface_output.c			\
-  vnet/interface_stats.c			\
-  vnet/misc.c					\
-  vnet/replication.c
-
-nobase_include_HEADERS +=			\
-  vnet/api_errno.h				\
-  vnet/buffer.h					\
-  vnet/config.h					\
-  vnet/devices/devices.h			\
-  vnet/devices/netlink.h			\
-  vnet/flow/flow.h				\
-  vnet/global_funcs.h				\
-  vnet/handoff.h				\
-  vnet/interface.h				\
-  vnet/interface.api.h				\
-  vnet/interface_funcs.h			\
-  vnet/ip/ip4_to_ip6.h   			\
-  vnet/ip/ip6_to_ip4.h   			\
-  vnet/l3_types.h				\
-  vnet/pipeline.h				\
-  vnet/replication.h				\
-  vnet/vnet.h					\
-  vnet/vnet_all_api_h.h				\
-  vnet/vnet_msg_enum.h				\
-  vnet/util/radix.h                 \
-  vnet/util/refcount.h
-
-API_FILES += vnet/interface.api
-
-########################################
-# Policer infra
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/policer/node_funcs.c			\
-  vnet/policer/policer.c			\
-  vnet/policer/xlate.c				\
-  vnet/policer/policer_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/policer/police.h				\
-  vnet/policer/policer.h			\
-  vnet/policer/xlate.h				\
-  vnet/policer/policer.api.h
-
-API_FILES += vnet/policer/policer.api
-
-########################################
-# Cop - junk filter
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/cop/cop.c				\
-  vnet/cop/node1.c				\
-  vnet/cop/ip4_whitelist.c			\
-  vnet/cop/ip6_whitelist.c			\
-  vnet/cop/cop_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/cop/cop.h					\
-  vnet/cop/cop.api.h
-
-API_FILES += vnet/cop/cop.api
-
-########################################
-# Layer 2 protocols go here
-########################################
-
-########################################
-# Layer 2 protocol: Ethernet
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ethernet/format.c				\
- vnet/ethernet/init.c				\
- vnet/ethernet/interface.c			\
- vnet/ethernet/mac_address.c			\
- vnet/ethernet/node.c				\
- vnet/ethernet/pg.c				\
- vnet/ethernet/sfp.c				\
- vnet/ethernet/p2p_ethernet.c			\
- vnet/ethernet/p2p_ethernet_input.c		\
- vnet/ethernet/p2p_ethernet_api.c
-
-libvnet_multiversioning_sources +=		\
- vnet/l2/l2_output.c
-
-nobase_include_HEADERS +=			\
- vnet/ethernet/error.def			\
- vnet/ethernet/ethernet.h			\
- vnet/ethernet/packet.h				\
- vnet/ethernet/types.def			\
- vnet/ethernet/sfp.h				\
- vnet/ethernet/p2p_ethernet.api.h		\
- vnet/ethernet/p2p_ethernet.h
-
-API_FILES += \
- vnet/ethernet/p2p_ethernet.api			\
- vnet/ethernet/ethernet_types.api
-
-########################################
-# Layer 2 protocol: Ethernet bridging
-########################################
-libvnet_la_SOURCES +=				\
- vnet/l2/feat_bitmap.c				\
- vnet/l2/l2_api.c				\
- vnet/l2/l2_bd.c				\
- vnet/l2/l2_bvi.c				\
- vnet/l2/l2_input_classify.c			\
- vnet/l2/l2_output_classify.c			\
- vnet/l2/l2_efp_filter.c			\
- vnet/l2/l2_fib.c				\
- vnet/l2/l2_flood.c				\
- vnet/l2/l2_fwd.c				\
- vnet/l2/l2_input.c				\
- vnet/l2/l2_input_vtr.c				\
- vnet/l2/l2_learn.c				\
- vnet/l2/l2_output.c				\
- vnet/l2/l2_in_out_acl.c			\
- vnet/l2/l2_patch.c				\
- vnet/l2/l2_rw.c				\
- vnet/l2/l2_vtr.c				\
- vnet/l2/l2_xcrw.c
-
-nobase_include_HEADERS +=			\
- vnet/l2/feat_bitmap.h				\
- vnet/l2/l2_input.h				\
- vnet/l2/l2_output.h				\
- vnet/l2/l2_vtr.h				\
- vnet/l2/l2_input_vtr.h				\
- vnet/l2/l2_efp_filter.h			\
- vnet/l2/l2_fwd.h				\
- vnet/l2/l2_bd.h				\
- vnet/l2/l2_bvi.h				\
- vnet/l2/l2_flood.h				\
- vnet/l2/l2_fib.h				\
- vnet/l2/l2_rw.h				\
- vnet/l2/l2_xcrw.h				\
- vnet/l2/l2_classify.h				\
- vnet/l2/l2.api.h
-
-API_FILES += vnet/l2/l2.api
-
-########################################
-# Layer 2 protocol: SRP
-########################################
-libvnet_la_SOURCES +=				\
- vnet/srp/format.c				\
- vnet/srp/interface.c				\
- vnet/srp/node.c				\
- vnet/srp/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/srp/packet.h				\
- vnet/srp/srp.h
-
-########################################
-# Layer 2 protocol: PPP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/ppp/node.c				\
-  vnet/ppp/pg.c					\
-  vnet/ppp/ppp.c
-
-nobase_include_HEADERS +=			\
- vnet/ppp/error.def				\
- vnet/ppp/ppp.h					\
- vnet/ppp/packet.h
-
-########################################
-# Layer 2 protocol: HDLC
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/hdlc/node.c				\
-  vnet/hdlc/pg.c				\
-  vnet/hdlc/hdlc.c
-
-nobase_include_HEADERS +=			\
- vnet/hdlc/error.def				\
- vnet/hdlc/hdlc.h				\
- vnet/hdlc/packet.h
-
-########################################
-# Layer 2 protocol: LLC
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/llc/llc.c				\
-  vnet/llc/node.c				\
-  vnet/llc/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/llc/llc.h
-
-########################################
-# Layer 2 protocol: SNAP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/snap/snap.c				\
-  vnet/snap/node.c				\
-  vnet/snap/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/snap/snap.h
-
-########################################
-# Layer 2 / vxlan
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/vxlan/vxlan.c				\
-  vnet/vxlan/encap.c				\
-  vnet/vxlan/decap.c				\
-  vnet/vxlan/vxlan_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/vxlan/vxlan.h				\
-  vnet/vxlan/vxlan_packet.h			\
-  vnet/vxlan/vxlan_error.def			\
-  vnet/vxlan/vxlan.api.h
-
-libvnet_multiversioning_sources +=		\
-  vnet/vxlan/decap.c
-
-API_FILES += vnet/vxlan/vxlan.api
-
-########################################
-# Layer 2 / Geneve
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/geneve/geneve.c				\
-  vnet/geneve/encap.c				\
-  vnet/geneve/decap.c				\
-  vnet/geneve/geneve_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/geneve/geneve.h				\
-  vnet/geneve/geneve_packet.h			\
-  vnet/geneve/geneve_error.def			\
-  vnet/geneve/geneve.api.h
-
-API_FILES += vnet/geneve/geneve.api
-
-########################################
-# Layer 2 / Bonding
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/bonding/cli.c    			\
-  vnet/bonding/node.c    			\
-  vnet/bonding/device.c    			\
-  vnet/bonding/bond_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/bonding/node.h                           \
-  vnet/bonding/bond.api.h
-
-libvnet_multiversioning_sources +=		\
-  vnet/bonding/node.c
-
-API_FILES += vnet/bonding/bond.api
-
-########################################
-# Layer 2 / LLDP
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/lldp/lldp_input.c			\
-  vnet/lldp/lldp_node.c				\
-  vnet/lldp/lldp_output.c			\
-  vnet/lldp/lldp_cli.c                          \
-  vnet/lldp/lldp_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/lldp/lldp_protocol.h                     \
-  vnet/lldp/lldp.h                              \
-  vnet/lldp/lldp.api.h
-
-API_FILES += vnet/lldp/lldp.api
-
-########################################
-# Layer 2/3 "classify"
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/classify/vnet_classify.c			\
-  vnet/classify/ip_classify.c			\
-  vnet/classify/in_out_acl.c			\
-  vnet/classify/policer_classify.c		\
-  vnet/classify/flow_classify.c                 \
-  vnet/classify/flow_classify_node.c            \
-  vnet/classify/vnet_classify.h			\
-  vnet/classify/classify_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/classify/vnet_classify.h	                \
-  vnet/classify/in_out_acl.h                     \
-  vnet/classify/policer_classify.h              \
-  vnet/classify/flow_classify.h					\
-  vnet/classify/classify.api.h
-
-API_FILES += vnet/classify/classify.api
-
-########################################
-# Layer 3 protocols go here
-########################################
-
-########################################
-# Layer 3 protocol: IP v4/v6
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ip/format.c				\
- vnet/ip/icmp4.c				\
- vnet/ip/icmp6.c				\
- vnet/ip/ip46_cli.c				\
- vnet/ip/ip_types_api.c				\
- vnet/ip/ip4_format.c				\
- vnet/ip/ip4_forward.c				\
- vnet/ip/ip4_punt_drop.c			\
- vnet/ip/ip4_input.c				\
- vnet/ip/ip4_options.c				\
- vnet/ip/ip4_mtrie.c				\
- vnet/ip/ip4_pg.c				\
- vnet/ip/ip4_source_and_port_range_check.c	\
- vnet/ip/ip4_source_check.c			\
- vnet/ip/ip4_reassembly.c                       \
- vnet/ip/ip6_format.c				\
- vnet/ip/ip6_forward.c				\
- vnet/ip/ip6_ll_table.c				\
- vnet/ip/ip6_ll_types.c				\
- vnet/ip/ip6_punt_drop.c			\
- vnet/ip/ip6_hop_by_hop.c			\
- vnet/ip/ip6_input.c				\
- vnet/ip/ip6_neighbor.c				\
- vnet/ip/ip6_pg.c				\
- vnet/ip/ip6_reassembly.c                       \
- vnet/ip/rd_cp.c                                \
- vnet/ip/ip_neighbor.c				\
- vnet/ip/ip_api.c				\
- vnet/ip/ip_checksum.c				\
- vnet/ip/ip_frag.c				\
- vnet/ip/ip.c					\
- vnet/ip/ip_init.c				\
- vnet/ip/ip_in_out_acl.c			\
- vnet/ip/lookup.c				\
- vnet/ip/ping.c					\
- vnet/ip/punt_api.c				\
- vnet/ip/punt.c
-
-nobase_include_HEADERS +=			\
- vnet/ip/format.h				\
- vnet/ip/icmp46_packet.h			\
- vnet/ip/icmp4.h				\
- vnet/ip/icmp6.h				\
- vnet/ip/igmp_packet.h				\
- vnet/ip/ip.api.h				\
- vnet/ip/rd_cp.api.h                            \
- vnet/ip/ip4_error.h				\
- vnet/ip/ip4.h					\
- vnet/ip/ip4_mtrie.h				\
- vnet/ip/ip4_packet.h				\
- vnet/ip/ip6_error.h				\
- vnet/ip/ip6.h					\
- vnet/ip/ip6_hop_by_hop.h			\
- vnet/ip/ip6_hop_by_hop_packet.h		\
- vnet/ip/ip6_packet.h				\
- vnet/ip/ip6_neighbor.h				\
- vnet/ip/ip.h					\
- vnet/ip/ip_packet.h				\
- vnet/ip/ip_source_and_port_range_check.h	\
- vnet/ip/ip_neighbor.h				\
- vnet/ip/lookup.h				\
- vnet/ip/ports.def				\
- vnet/ip/protocols.def				\
- vnet/ip/punt_error.def				\
- vnet/ip/punt.api.h				\
- vnet/ip/punt.h
-
-API_FILES += 					\
- vnet/ip/ip.api 				\
- vnet/ip/rd_cp.api                              \
- vnet/ip/punt.api
-
-libvnet_multiversioning_sources +=		\
- vnet/ip/ip4_forward.c				\
- vnet/ip/ip4_input.c
-
-########################################
-# Layer 2/3 ARP
-########################################
-libvnet_la_SOURCES +=               \
- vnet/ethernet/arp.c
-
-nobase_include_HEADERS +=           \
- vnet/ethernet/arp_packet.h         \
- vnet/ethernet/arp.h
-
-########################################
-# Bidirectional Forwarding Detection
-########################################
-
-nobase_include_HEADERS +=			\
- vnet/bfd/bfd_protocol.h			\
- vnet/bfd/bfd_main.h				\
- vnet/bfd/bfd_api.h				\
- vnet/bfd/bfd_udp.h				\
- vnet/bfd/bfd.api.h
-
-libvnet_la_SOURCES +=				\
- vnet/bfd/bfd_api.h				\
- vnet/bfd/bfd_udp.c				\
- vnet/bfd/bfd_main.c				\
- vnet/bfd/bfd_protocol.c			\
- vnet/bfd/bfd_cli.c                             \
- vnet/bfd/bfd_api.c
-
-API_FILES += vnet/bfd/bfd.api
-
-########################################
-# Layer 3 protocol: IPSec
-########################################
-if WITH_LIBSSL
-libvnet_la_SOURCES +=				\
- vnet/ipsec/ipsec.c				\
- vnet/ipsec/ipsec_cli.c				\
- vnet/ipsec/ipsec_format.c			\
- vnet/ipsec/ipsec_input.c			\
- vnet/ipsec/ipsec_if.c				\
- vnet/ipsec/ipsec_if_in.c			\
- vnet/ipsec/esp_format.c			\
- vnet/ipsec/esp_encrypt.c			\
- vnet/ipsec/esp_decrypt.c			\
- vnet/ipsec/ah_decrypt.c			\
- vnet/ipsec/ah_encrypt.c			\
- vnet/ipsec/ikev2.c				\
- vnet/ipsec/ikev2_crypto.c			\
- vnet/ipsec/ikev2_cli.c				\
- vnet/ipsec/ikev2_payload.c			\
- vnet/ipsec/ikev2_format.c			\
- vnet/ipsec/ipsec_api.c
-
-API_FILES += vnet/ipsec/ipsec.api
-endif
-
-libvnet_la_SOURCES +=				\
- vnet/ipsec/ipsec_output.c
-
-nobase_include_HEADERS +=			\
- vnet/ipsec/ipsec.h				\
- vnet/ipsec/esp.h				\
- vnet/ipsec/ah.h				\
- vnet/ipsec/ikev2.h				\
- vnet/ipsec/ikev2_priv.h			\
- vnet/ipsec/ipsec.api.h
-
-########################################
-# Layer 3 protocol: osi
-########################################
-libvnet_la_SOURCES +=				\
- vnet/osi/node.c				\
- vnet/osi/osi.c					\
- vnet/osi/pg.c
-
-nobase_include_HEADERS +=			\
- vnet/osi/osi.h
-
-########################################
-# Layer 4 protocol: tcp
-########################################
-libvnet_la_SOURCES +=				\
- vnet/tcp/tcp_api.c				\
- vnet/tcp/tcp_format.c				\
- vnet/tcp/tcp_pg.c				\
- vnet/tcp/tcp_syn_filter4.c			\
- vnet/tcp/tcp_output.c				\
- vnet/tcp/tcp_input.c				\
- vnet/tcp/tcp_newreno.c				\
- vnet/tcp/tcp.c
-
-nobase_include_HEADERS +=			\
- vnet/tcp/tcp_packet.h				\
- vnet/tcp/tcp_timer.h				\
- vnet/tcp/tcp_debug.h				\
- vnet/tcp/tcp.h					\
- vnet/tcp/tcp_error.def				\
- vnet/tcp/tcp.api.h
-
-API_FILES += vnet/tcp/tcp.api
-
-########################################
-# Layer 4 protocol: udp
-########################################
-libvnet_la_SOURCES +=				\
- vnet/udp/udp.c					\
- vnet/udp/udp_input.c				\
- vnet/udp/udp_format.c				\
- vnet/udp/udp_local.c				\
- vnet/udp/udp_pg.c				\
- vnet/udp/udp_encap_node.c			\
- vnet/udp/udp_encap.c				\
- vnet/udp/udp_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/udp/udp_error.def                       	\
-  vnet/udp/udp.h                               	\
-  vnet/udp/udp_packet.h				\
-  vnet/udp/udp.api.h
-
-API_FILES += vnet/udp/udp.api
-
-########################################
-# Layer 4 protocol: sctp
-########################################
-libvnet_la_SOURCES +=				\
-  vnet/sctp/sctp_api.c				\
-  vnet/sctp/sctp.c				\
-  vnet/sctp/sctp_pg.c				\
-  vnet/sctp/sctp_input.c			\
-  vnet/sctp/sctp_output.c			\
-  vnet/sctp/sctp_format.c
-
-nobase_include_HEADERS +=			\
-  vnet/sctp/sctp_error.def                    	\
-  vnet/sctp/sctp_packet.h			\
-  vnet/sctp/sctp_timer.h			\
-  vnet/sctp/sctp.h				\
-  vnet/sctp/sctp.api.h
-
-API_FILES += vnet/sctp/sctp.api
-
-########################################
-# Tunnel protocol: gre
-########################################
-libvnet_la_SOURCES +=				\
- vnet/gre/gre.c					\
- vnet/gre/node.c				\
- vnet/gre/interface.c				\
- vnet/gre/pg.c					\
- vnet/gre/gre_api.c
-
-nobase_include_HEADERS +=			\
- vnet/gre/gre.h					\
- vnet/gre/packet.h				\
- vnet/gre/error.def				\
- vnet/gre/gre.api.h
-
-API_FILES += vnet/gre/gre.api
-
-########################################
-# Tunnel protocol: ipip
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ipip/ipip.c				\
- vnet/ipip/node.c				\
- vnet/ipip/sixrd.c				\
- vnet/ipip/ipip_api.c				\
- vnet/ipip/ipip_cli.c
-
-nobase_include_HEADERS +=			\
- vnet/ipip/ipip.api.h				\
- vnet/ipip/ipip.h
-
-API_FILES += vnet/ipip/ipip.api
-
-########################################
-# Tunnel protocol: l2tpv3
-########################################
-libvnet_la_SOURCES +=				\
- vnet/l2tp/l2tp.c				\
- vnet/l2tp/encap.c 				\
- vnet/l2tp/decap.c  				\
- vnet/l2tp/pg.c					\
- vnet/l2tp/l2tp_api.c
-
-nobase_include_HEADERS +=			\
- vnet/l2tp/l2tp.h				\
- vnet/l2tp/packet.h				\
- vnet/l2tp/l2tp.api.h
-
-API_FILES += vnet/l2tp/l2tp.api
-
-########################################
-# Tunnel protocol: gre+mpls
-########################################
-libvnet_la_SOURCES +=				\
- vnet/mpls/mpls.c				\
- vnet/mpls/mpls_lookup.c			\
- vnet/mpls/mpls_output.c			\
- vnet/mpls/mpls_features.c			\
- vnet/mpls/mpls_input.c				\
- vnet/mpls/interface.c			        \
- vnet/mpls/mpls_tunnel.c		        \
- vnet/mpls/pg.c			        \
- vnet/mpls/mpls_api.c
-
-nobase_include_HEADERS +=			\
- vnet/mpls/mpls.h				\
- vnet/mpls/mpls_types.h				\
- vnet/mpls/mpls_tunnel.h			\
- vnet/mpls/packet.h				\
- vnet/mpls/error.def			\
- vnet/mpls/mpls.api.h
-
-API_FILES += vnet/mpls/mpls.api
-
-########################################
-# Tunnel protocol: vxlan-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/vxlan-gpe/vxlan_gpe.c			\
- vnet/vxlan-gpe/encap.c				\
- vnet/vxlan-gpe/decap.c				\
- vnet/vxlan-gpe/vxlan_gpe_api.c
-
-nobase_include_HEADERS +=			\
- vnet/vxlan-gpe/vxlan_gpe.h			\
- vnet/vxlan-gpe/vxlan_gpe_packet.h		\
- vnet/vxlan-gpe/vxlan_gpe_error.def		\
- vnet/vxlan-gpe/vxlan_gpe.api.h
-
-API_FILES += vnet/vxlan-gpe/vxlan_gpe.api
-
-########################################
-# Tunnel protocol: ipsec+gre
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ipsec-gre/ipsec_gre.c			\
- vnet/ipsec-gre/node.c				\
- vnet/ipsec-gre/interface.c			\
- vnet/ipsec-gre/ipsec_gre_api.c
-
-nobase_include_HEADERS +=			\
- vnet/ipsec-gre/ipsec_gre.h			\
- vnet/ipsec-gre/error.def			\
- vnet/ipsec-gre/ipsec_gre.api.h
-
-API_FILES += vnet/ipsec-gre/ipsec_gre.api
-
-########################################
-# LISP control plane: lisp-cp
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/lisp-cp/lisp_types.c			\
- vnet/lisp-cp/lisp_cp_dpo.c			\
- vnet/lisp-cp/control.c				\
- vnet/lisp-cp/gid_dictionary.c			\
- vnet/lisp-cp/lisp_msg_serdes.c			\
- vnet/lisp-cp/packets.c				\
- vnet/lisp-cp/one_cli.c				\
- vnet/lisp-cp/lisp_cli.c			\
- vnet/lisp-cp/one_api.c				\
- vnet/lisp-cp/lisp_api.c
-
-nobase_include_HEADERS +=			\
- vnet/lisp-cp/lisp_types.h			\
- vnet/lisp-cp/packets.h				\
- vnet/lisp-cp/gid_dictionary.h			\
- vnet/lisp-cp/lisp_cp_messages.h		\
- vnet/lisp-cp/lisp_msg_serdes.h			\
- vnet/lisp-cp/control.h				\
- vnet/lisp-cp/one.api.h				\
- vnet/lisp-cp/lisp.api.h
-
-API_FILES += vnet/lisp-cp/lisp.api
-API_FILES += vnet/lisp-cp/one.api
-
-if ENABLE_TESTS
-LDS = \
-  libvppinfra.la \
-  libvnet.la \
-  libvlib.la  \
-  libsvm.la \
-  libsvmdb.la \
-  libvlibmemory.la \
-  -lpthread -ldl -lrt -lm
-
-TESTS += test_cp_serdes test_lisp_types
-
-test_cp_serdes_SOURCES =			\
- tests/vnet/lisp-cp/test_cp_serdes.c		\
- vnet/lisp-cp/lisp_msg_serdes.c			\
- vnet/lisp-cp/lisp_types.c			\
- vnet/lisp-cp/packets.c				\
- vnet/ip/ip_checksum.c
-
-test_lisp_types_SOURCES =			\
- tests/vnet/lisp-cp/test_lisp_types.c		\
- vnet/lisp-cp/lisp_types.c
-
-test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_cp_serdes_LDADD = $(LDS)
-test_lisp_types_LDADD = $(LDS)
-endif
-
-########################################
-# Tunnel protocol: lisp-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/lisp-gpe/lisp_gpe.c			\
- vnet/lisp-gpe/lisp_gpe_sub_interface.c		\
- vnet/lisp-gpe/lisp_gpe_adjacency.c		\
- vnet/lisp-gpe/lisp_gpe_tunnel.c		\
- vnet/lisp-gpe/lisp_gpe_fwd_entry.c		\
- vnet/lisp-gpe/lisp_gpe_tenant.c		\
- vnet/lisp-gpe/interface.c			\
- vnet/lisp-gpe/decap.c				\
- vnet/lisp-gpe/lisp_gpe_api.c
-
-nobase_include_HEADERS +=			\
- vnet/lisp-gpe/lisp_gpe.h			\
- vnet/lisp-gpe/lisp_gpe_fwd_entry.h		\
- vnet/lisp-gpe/lisp_gpe_tenant.h		\
- vnet/lisp-gpe/lisp_gpe_packet.h		\
- vnet/lisp-gpe/lisp_gpe_error.def		\
- vnet/lisp-gpe/lisp_gpe.api.h
-
-API_FILES += vnet/lisp-gpe/lisp_gpe.api
-
-########################################
-# DHCP client
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcp/client.c				\
- vnet/dhcp/dhcp_client_detect.c			\
- vnet/dhcp/dhcp6_client_common_dp.c		\
- vnet/dhcp/dhcp6_pd_client_dp.c			\
- vnet/dhcp/dhcp6_pd_client_cp.c			\
- vnet/dhcp/dhcp6_ia_na_client_dp.c		\
- vnet/dhcp/dhcp6_ia_na_client_cp.c		\
- vnet/dhcp/dhcp_api.c
-
-nobase_include_HEADERS +=			\
- vnet/dhcp/client.h				\
- vnet/dhcp/dhcp6_client_common_dp.h		\
- vnet/dhcp/dhcp6_pd_client_dp.h			\
- vnet/dhcp/dhcp6_ia_na_client_dp.h		\
- vnet/dhcp/dhcp.api.h				\
- vnet/dhcp/dhcp6_pd_client_cp.api.h		\
- vnet/dhcp/dhcp6_ia_na_client_cp.api.h
-
-API_FILES +=					\
- vnet/dhcp/dhcp.api				\
- vnet/dhcp/dhcp6_pd_client_cp.api		\
- vnet/dhcp/dhcp6_ia_na_client_cp.api
-
-########################################
-# DHCP proxy
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dhcp/dhcp6_proxy_node.c                   \
- vnet/dhcp/dhcp4_proxy_node.c			\
- vnet/dhcp/dhcp_proxy.c
-
-nobase_include_HEADERS +=			\
- vnet/dhcp/dhcp4_packet.h		        \
- vnet/dhcp/dhcp6_packet.h		        \
- vnet/dhcp/dhcp_proxy.h				\
- vnet/dhcp/dhcp6_proxy_error.def                \
- vnet/dhcp/dhcp4_proxy_error.def
-
-########################################
-# ipv6 segment routing
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/srv6/sr.c						\
- vnet/srv6/sr_localsid.c			\
- vnet/srv6/sr_policy_rewrite.c		\
- vnet/srv6/sr_steering.c			\
- vnet/srv6/sr_api.c
-
-nobase_include_HEADERS +=			\
- vnet/srv6/sr_packet.h				\
- vnet/srv6/sr.h 					\
- vnet/srv6/sr.api.h
-
-API_FILES += vnet/srv6/sr.api
-
-########################################
-# mpls segment routing
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/srmpls/sr_mpls_policy.c		\
- vnet/srmpls/sr_mpls_steering.c   \
- vnet/srmpls/sr_mpls_api.c
-
-
-nobase_include_HEADERS +=			\
- vnet/srmpls/sr_mpls.h      \
- vnet/srmpls/sr_mpls.api.h
-
-API_FILES += vnet/srmpls/sr_mpls.api
-
-########################################
-# IPFIX / netflow v10
-########################################
-libvnet_la_SOURCES +=				\
- vnet/ipfix-export/flow_report.c			\
- vnet/ipfix-export/flow_api.c
-
-nobase_include_HEADERS +=			\
- vnet/ipfix-export/flow_report.h			\
- vnet/ipfix-export/ipfix_info_elements.h		\
- vnet/ipfix-export/ipfix_packet.h			\
- vnet/ipfix-export/ipfix_export.api.h
-
-API_FILES += vnet/ipfix-export/ipfix_export.api
-
-########################################
-# IPFIX classify code
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/ipfix-export/flow_report_classify.c
-
-nobase_include_HEADERS +=			\
-  vnet/ipfix-export/flow_report_classify.h
-
-########################################
-# lawful intercept
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/lawful-intercept/lawful_intercept.c	\
-  vnet/lawful-intercept/node.c
-
-nobase_include_HEADERS += 			\
-  vnet/lawful-intercept/lawful_intercept.h
-
-########################################
-# SPAN (port mirroring)
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/span/span_api.c  \
-  vnet/span/span.c	    \
-  vnet/span/node.c
-
-nobase_include_HEADERS += 			\
-  vnet/span/span.api.h  \
-  vnet/span/span.h
-
-API_FILES += vnet/span/span.api
-
-########################################
-# DNS proxy, API
-########################################
-libvnet_la_SOURCES +=				\
- vnet/dns/dns.c					\
- vnet/dns/dns.h					\
- vnet/dns/dns_packet.h				\
- vnet/dns/reply_node.c				\
- vnet/dns/request_node.c			\
- vnet/dns/resolver_process.c
-
-nobase_include_HEADERS +=			\
- vnet/dns/dns.api.h				\
- vnet/dns/dns.h
-
-API_FILES += vnet/dns/dns.api
-
-########################################
-# Packet generator
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/pg/cli.c					\
-  vnet/pg/edit.c				\
-  vnet/pg/init.c				\
-  vnet/pg/input.c				\
-  vnet/pg/output.c				\
-  vnet/pg/stream.c				\
-  vnet/pg/pg_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/pg/pg.h					\
-  vnet/pg/edit.h				\
-  vnet/pg/pg.api.h
-
-API_FILES += vnet/pg/pg.api
-
-########################################
-# virtio
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/devices/virtio/device.c			\
-  vnet/devices/virtio/node.c			\
-  vnet/devices/virtio/vhost_user.c		\
-  vnet/devices/virtio/vhost_user_input.c	\
-  vnet/devices/virtio/vhost_user_output.c	\
-  vnet/devices/virtio/vhost_user_api.c		\
-  vnet/devices/virtio/virtio.c
-
-
-nobase_include_HEADERS +=			\
-  vnet/devices/virtio/virtio.h			\
-  vnet/devices/virtio/vhost_user.h		\
-  vnet/devices/virtio/vhost_user.api.h
-
-libvnet_multiversioning_sources +=		\
-  vnet/devices/virtio/vhost_user_input.c	\
-  vnet/devices/virtio/vhost_user_output.c
-
-API_FILES += vnet/devices/virtio/vhost_user.api
-
-########################################
-# tap interface (with virtio backend)
-########################################
-
-libvnet_la_SOURCES += 				\
-  vnet/devices/tap/cli.c			\
-  vnet/devices/tap/tap.c			\
-  vnet/devices/tap/tapv2_api.c
-
-nobase_include_HEADERS += 			\
-  vnet/devices/tap/tap.h			\
-  vnet/devices/tap/tapv2.api.h
-
-API_FILES += vnet/devices/tap/tapv2.api
-
-########################################
-# tap interface (with virtio backend)
-########################################
-
-libvnet_la_SOURCES += 				\
-  vnet/devices/pipe/pipe_api.c			\
-  vnet/devices/pipe/pipe.c
-
-nobase_include_HEADERS += 			\
-  vnet/devices/pipe/pipe.h			\
-  vnet/devices/pipe/pipe.api.h
-
-API_FILES += vnet/devices/pipe/pipe.api
-
-########################################
-# session managmeent
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/session/session.c			\
-  vnet/session/session_table.c			\
-  vnet/session/session_rules_table.c		\
-  vnet/session/session_lookup.c			\
-  vnet/session/session_node.c			\
-  vnet/session/transport.c			\
-  vnet/session/application.c			\
-  vnet/session/session_cli.c			\
-  vnet/session/application_interface.c		\
-  vnet/session/application_namespace.c		\
-  vnet/session/segment_manager.c		\
-  vnet/session/session_test.c			\
-  vnet/session/session_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/session/session.h			\
-  vnet/session/session_table.h			\
-  vnet/session/session_rules_table.h		\
-  vnet/session/stream_session.h			\
-  vnet/session/session_lookup.h			\
-  vnet/session/application.h			\
-  vnet/session/transport.h			\
-  vnet/session/transport_interface.h		\
-  vnet/session/application_interface.h		\
-  vnet/session/application_namespace.h		\
-  vnet/session/session_debug.h			\
-  vnet/session/segment_manager.h		\
-  vnet/session/mma_template.h			\
-  vnet/session/mma_template.c			\
-  vnet/session/mma_16.h				\
-  vnet/session/mma_40.h				\
-  vnet/session/session.api.h
-
-API_FILES += vnet/session/session.api
-
-########################################
-# session layer applications
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/session-apps/echo_client.c		\
-  vnet/session-apps/echo_server.c		\
-  vnet/session-apps/http_server.c		\
-  vnet/session-apps/proxy.c
-
-nobase_include_HEADERS +=			\
-  vnet/session-apps/echo_client.h		\
-  vnet/session-apps/proxy.h
-
-########################################
-# TLS protocol
-########################################
-
-libvnet_la_SOURCES += vnet/tls/tls.c
-
-nobase_include_HEADERS +=			\
-  vnet/tls/tls.h
-
-########################################
-# Linux packet interface
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/devices/af_packet/af_packet.c		\
-  vnet/devices/af_packet/device.c		\
-  vnet/devices/af_packet/node.c			\
-  vnet/devices/af_packet/cli.c			\
-  vnet/devices/af_packet/af_packet_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/af_packet/af_packet.h	\
-  vnet/devices/af_packet/af_packet.api.h
-
-API_FILES += vnet/devices/af_packet/af_packet.api
-
-########################################
-# NETMAP interface
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/devices/netmap/netmap.c			\
-  vnet/devices/netmap/device.c			\
-  vnet/devices/netmap/node.c			\
-  vnet/devices/netmap/cli.c			\
-  vnet/devices/netmap/netmap_api.c
-
-nobase_include_HEADERS +=			\
-  vnet/devices/netmap/netmap.h		\
-  vnet/devices/netmap/netmap.api.h
-
-API_FILES += vnet/devices/netmap/netmap.api
-
-########################################
-# Driver feature graph arc support
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/feature/feature.c			\
-  vnet/feature/feature_api.c			\
-  vnet/feature/registration.c
-
-nobase_include_HEADERS +=			\
-  vnet/feature/feature.h			\
-  vnet/feature/feature.api.h
-
-API_FILES += vnet/feature/feature.api
-
-########################################
-# Unix kernel related
-########################################
-
-# FIXME: vnet/unix/hgshm.c
-
-libvnet_la_SOURCES +=				\
-  vnet/unix/gdb_funcs.c				\
-  vnet/unix/pcap.c				\
-  vnet/unix/tap_api.c				\
-  vnet/unix/tapcli.c				\
-  vnet/unix/tuntap.c
-
-nobase_include_HEADERS +=			\
-  vnet/unix/pcap.h				\
-  vnet/unix/tuntap.h				\
-  vnet/unix/tap.api.h				\
-  vnet/unix/tapcli.h
-
-API_FILES += vnet/unix/tap.api
-
-########################################
-# FIB
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/fib/fib.c                                \
-  vnet/fib/fib_test.c                           \
-  vnet/fib/ip4_fib.c                            \
-  vnet/fib/ip6_fib.c                            \
-  vnet/fib/mpls_fib.c                           \
-  vnet/fib/fib_table.c                          \
-  vnet/fib/fib_walk.c                           \
-  vnet/fib/fib_types.c                          \
-  vnet/fib/fib_node.c                           \
-  vnet/fib/fib_node_list.c                      \
-  vnet/fib/fib_entry.c                          \
-  vnet/fib/fib_entry_src.c                      \
-  vnet/fib/fib_entry_src_rr.c                   \
-  vnet/fib/fib_entry_src_interface.c            \
-  vnet/fib/fib_entry_src_interpose.c            \
-  vnet/fib/fib_entry_src_default_route.c        \
-  vnet/fib/fib_entry_src_special.c              \
-  vnet/fib/fib_entry_src_api.c                  \
-  vnet/fib/fib_entry_src_adj.c                  \
-  vnet/fib/fib_entry_src_mpls.c                 \
-  vnet/fib/fib_entry_src_lisp.c                 \
-  vnet/fib/fib_entry_cover.c                    \
-  vnet/fib/fib_entry_delegate.c                 \
-  vnet/fib/fib_path_list.c                      \
-  vnet/fib/fib_path.c				\
-  vnet/fib/fib_path_ext.c			\
-  vnet/fib/fib_urpf_list.c			\
-  vnet/fib/fib_attached_export.c		\
-  vnet/fib/fib_api.c				\
-  vnet/fib/fib_bfd.c
-
-nobase_include_HEADERS +=			\
-  vnet/fib/fib.h				\
-  vnet/fib/fib_api.h				\
-  vnet/fib/ip4_fib.h				\
-  vnet/fib/ip6_fib.h				\
-  vnet/fib/fib_types.h				\
-  vnet/fib/fib_table.h				\
-  vnet/fib/fib_node.h				\
-  vnet/fib/fib_node_list.h			\
-  vnet/fib/fib_entry.h				\
-  vnet/fib/fib_entry_delegate.h
-
-########################################
-# ADJ
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/adj/adj_nbr.c				\
-  vnet/adj/adj_glean.c   			\
-  vnet/adj/adj_midchain.c   			\
-  vnet/adj/adj_mcast.c   			\
-  vnet/adj/adj_l2.c      			\
-  vnet/adj/adj_nsh.c      			\
-  vnet/adj/adj.c		                \
-  vnet/adj/rewrite.c				\
-  vnet/adj/adj_bfd.c				\
-  vnet/adj/adj_delegate.c
-
-nobase_include_HEADERS +=			\
-  vnet/adj/adj.h				\
-  vnet/adj/adj_types.h				\
-  vnet/adj/adj_glean.h  			\
-  vnet/adj/adj_nsh.h  				\
-  vnet/adj/adj_nbr.h 				\
-  vnet/adj/rewrite.h
-
-########################################
-# Data-Plane Objects
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/dpo/dpo.c				\
-  vnet/dpo/drop_dpo.c				\
-  vnet/dpo/ip_null_dpo.c			\
-  vnet/dpo/ip6_ll_dpo.c				\
-  vnet/dpo/punt_dpo.c				\
-  vnet/dpo/receive_dpo.c			\
-  vnet/dpo/load_balance.c			\
-  vnet/dpo/load_balance_map.c			\
-  vnet/dpo/lookup_dpo.c   			\
-  vnet/dpo/classify_dpo.c   			\
-  vnet/dpo/replicate_dpo.c   			\
-  vnet/dpo/interface_rx_dpo.c  			\
-  vnet/dpo/interface_tx_dpo.c  			\
-  vnet/dpo/mpls_disposition.c   		\
-  vnet/dpo/mpls_label_dpo.c			\
-  vnet/dpo/l3_proxy_dpo.c			\
-  vnet/dpo/dvr_dpo.c
-
-nobase_include_HEADERS +=			\
-  vnet/dpo/load_balance.h			\
-  vnet/dpo/drop_dpo.h				\
-  vnet/dpo/lookup_dpo.h				\
-  vnet/dpo/punt_dpo.h				\
-  vnet/dpo/classify_dpo.h			\
-  vnet/dpo/receive_dpo.h			\
-  vnet/dpo/ip_null_dpo.h			\
-  vnet/dpo/replicate_dpo.h   			\
-  vnet/dpo/dpo.h
-
-########################################
-# Multicast FIB
-########################################
-
-libvnet_la_SOURCES +=				\
-  vnet/mfib/mfib_test.c                         \
-  vnet/mfib/mfib_forward.c                      \
-  vnet/mfib/ip4_mfib.c                          \
-  vnet/mfib/ip6_mfib.c                          \
-  vnet/mfib/mfib_types.c                        \
-  vnet/mfib/mfib_signal.c                       \
-  vnet/mfib/mfib_itf.c                          \
-  vnet/mfib/mfib_entry.c                        \
-  vnet/mfib/mfib_table.c
-
-nobase_include_HEADERS +=			\
-  vnet/mfib/ip4_mfib.h                          \
-  vnet/mfib/mfib_types.h                        \
-  vnet/mfib/mfib_table.h
-
-########################################
-# Utilities
-########################################
-
-libvnet_la_SOURCES +=                    \
-  vnet/util/radix.c			     \
-  vnet/util/refcount.c			 \
-  vnet/util/throttle.c			 \
-  vnet/util/trajectory.c
-
-nobase_include_HEADERS +=                       \
-  vnet/util/throttle.h
-
-########################################
-# QoS
-########################################
-
-libvnet_la_SOURCES +=      	                \
-  vnet/qos/qos_types.c				\
-  vnet/qos/qos_api.c				\
-  vnet/qos/qos_egress_map.c			\
-  vnet/qos/qos_record.c				\
-  vnet/qos/qos_mark.c
-
-API_FILES += vnet/qos/qos.api
-
-nobase_include_HEADERS +=                       \
- vnet/qos/qos.api.h
-
-########################################
-# BIER
-########################################
-
-libvnet_la_SOURCES +=                           \
-  vnet/bier/bier_bit_string.c                   \
-  vnet/bier/bier_entry.c                        \
-  vnet/bier/bier_fmask.c                        \
-  vnet/bier/bier_fmask_db.c                     \
-  vnet/bier/bier_input.c                   	\
-  vnet/bier/bier_lookup.c                  	\
-  vnet/bier/bier_output.c                  	\
-  vnet/bier/bier_table.c                        \
-  vnet/bier/bier_types.c                        \
-  vnet/bier/bier_test.c                         \
-  vnet/bier/bier_api.c                          \
-  vnet/bier/bier_drop.c                         \
-  vnet/bier/bier_update.c			\
-  vnet/bier/bier_imp_node.c			\
-  vnet/bier/bier_imp.c				\
-  vnet/bier/bier_disp_entry.c			\
-  vnet/bier/bier_disp_lookup_node.c		\
-  vnet/bier/bier_disp_dispatch_node.c		\
-  vnet/bier/bier_disp_table.c			\
-  vnet/bier/bier_bift_table.c
-
-nobase_include_HEADERS +=			\
-  vnet/bier/bier_types.h                        \
-  vnet/bier/bier_entry.h                        \
-  vnet/bier/bier_update.h                       \
-  vnet/bier/bier.api.h                          \
-  vnet/bier/bier_table.h
-
-API_FILES += vnet/bier/bier.api
-
-if CPU_X86_64
-if CC_SUPPORTS_AVX2
-###############################################################
-# AVX2
-###############################################################
-libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_sources)
-libvnet_avx2_la_CFLAGS =			\
-	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@		\
-	-DCLIB_MARCH_VARIANT=avx2
-noinst_LTLIBRARIES += libvnet_avx2.la
-libvnet_la_LIBADD += libvnet_avx2.la
-endif
-
-if CC_SUPPORTS_AVX512
-###############################################################
-# AVX512
-###############################################################
-libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_sources)
-libvnet_avx512_la_CFLAGS =			\
-	$(AM_CFLAGS) @CPU_AVX512_FLAGS@		\
-	-DCLIB_MARCH_VARIANT=avx512
-noinst_LTLIBRARIES += libvnet_avx512.la
-libvnet_la_LIBADD += libvnet_avx512.la
-endif
-endif
-
-########################################
-# Test apps
-########################################
-
-noinst_PROGRAMS += tcp_echo udp_echo
-
-TEST_APPS_LDADD = libvlibmemoryclient.la libsvm.la libvppinfra.la
-TEST_APPS_LDADD += -lpthread -lm -lrt
-
-tcp_echo_SOURCES = tests/vnet/session/tcp_echo.c
-tcp_echo_LDADD = $(TEST_APPS_LDADD)
-
-udp_echo_SOURCES = tests/vnet/session/udp_echo.c
-udp_echo_LDADD = $(TEST_APPS_LDADD)
-
-########################################
-# Plugin client library
-########################################
-
-nobase_include_HEADERS +=                      \
-  vnet/plugin/plugin.h
-
-pcap2pg_SOURCES = 				\
-  vnet/unix/pcap2pg.c				\
-  vnet/unix/pcap.h
-
-pcap2pg_LDFLAGS = -static
-pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
-
-pcap2cinit_SOURCES = 				\
-  vnet/unix/pcap2cinit.c			\
-  vnet/unix/pcap.h
-
-pcap2cinit_LDFLAGS = -static
-pcap2cinit_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl
-
-noinst_PROGRAMS += pcap2pg pcap2cinit
-
-# vi:syntax=automake
diff --git a/src/vpp-api-test.am b/src/vpp-api-test.am
deleted file mode 100644
index 4e73ef7..0000000
--- a/src/vpp-api-test.am
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-libvatplugin_la_LIBADD = libvppinfra.la
-libvatplugin_la_DEPENDENCIES = libvppinfra.la
-libvatplugin_la_SOURCES = \
-  vat/plugin_api.c
-
-lib_LTLIBRARIES += libvatplugin.la
-
-bin_PROGRAMS += vpp_api_test vpp_json_test vpp_restart
-
-vpp_api_test_SOURCES = \
-  vat/api_format.c 	\
-  vat/main.c		\
-  vat/plugin.c		\
-  vat/vat.h		\
-  vat/json_format.h	\
-  vat/json_format.c
-
-vpp_json_test_SOURCES = \
-  vat/json_format.h	\
-  vat/json_format.c	\
-  vat/json_test.c
-
-vpp_api_test_LDADD = \
-  libvlibmemoryclient.la		\
-  libsvm.la				\
-  libvatplugin.la			\
-  libvppinfra.la 			\
-  -lpthread -lm -lrt -ldl -lcrypto
-
-vpp_api_test_LDFLAGS = -Wl,--export-dynamic
-
-vpp_json_test_LDADD = libvppinfra.la -lm
-vpp_json_test_LDFLAGS = -Wl,--export-dynamic
-
-nobase_include_HEADERS += \
-  vat/vat.h 		\
-  vat/json_format.h
-
-vpp_restart_SOURCES =  \
-  vat/restart.c
-vpp_restart_LDADD = \
-  libsvmdb.la				\
-  libsvm.la				\
-  libvppinfra.la			\
-  -lpthread -lrt
-
-# vi:syntax=automake
diff --git a/src/vpp-api.am b/src/vpp-api.am
deleted file mode 100644
index 8742556..0000000
--- a/src/vpp-api.am
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# VPP API C wrapper extension
-#
-lib_LTLIBRARIES += libvppapiclient.la
-libvppapiclient_la_SOURCES =			\
-  vpp-api/client/client.c			\
-  vpp-api/client/stat_client.c			\
-  vpp-api/client/libvppapiclient.map
-
-libvppapiclient_la_LIBADD = \
-  -lpthread -lm -lrt
-
-libvppapiclient_la_LDFLAGS = \
-  -Wl,-L$(top_builddir)/.libs,--whole-archive,-l:libsvm.a,-l:libvppinfra.a,-l:libvlibmemoryclient.a,--no-whole-archive \
-  -Wl,--version-script=$(srcdir)/vpp-api/client/libvppapiclient.map,-lrt
-
-libvppapiclient_la_DEPENDENCIES = libvppinfra.la libvlibmemoryclient.la libsvm.la
-
-libvppapiclient_la_CPPFLAGS =
-
-nobase_include_HEADERS += vpp-api/client/vppapiclient.h
-
-#
-# Test client
-#
-if ENABLE_TESTS
-noinst_PROGRAMS += vac_test
-vac_test_SOURCES = vpp-api/client/test.c
-vac_test_LDADD = \
-  $(builddir)/libvppapiclient.la \
-  -lpthread -lm -lrt
-endif
-
-# vi:syntax=automake
diff --git a/src/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am
deleted file mode 100644
index e6c064e..0000000
--- a/src/vpp-api/python/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-install-exec-local:
-	(cd $(srcdir) ; $(PYTHON) $(srcdir)/setup.py build              \
-	--build-base $(shell readlink -f $(builddir))/build             \
-	install                                                         \
-	--root /                                                        \
-	--prefix $(DESTDIR)$(prefix)                                    \
-	--single-version-externally-managed                             \
-	--verbose                                                       \
-	bdist_egg 							\
-	--dist-dir=$(DESTDIR)$(prefix))
diff --git a/src/vpp-api/vapi/Makefile.am b/src/vpp-api/vapi/Makefile.am
deleted file mode 100644
index 07ef46e..0000000
--- a/src/vpp-api/vapi/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-AM_LIBTOOLFLAGS = --quiet
-
-AM_CFLAGS = @CPU_FLAGS@ -Wall -I${top_srcdir} -I${top_builddir} -I. -I$(top_srcdir)/vpp-api/
-
-AM_LDFLAGS = -shared -avoid-version -rpath /none -no-undefined
-
-bin_PROGRAMS =
-noinst_LTLIBRARIES =
-CLEANDIRS =
-
-vapi/%.api.vapi.h: %.api.json vapi_c_gen.py vapi_json_parser.py
-	@echo "  VAPI C GEN $< " $@ ;			\
-	mkdir -p `dirname $@` ;				\
-        $(top_srcdir)/vpp-api/vapi/vapi_c_gen.py --prefix=vapi $<
-
-vapi/%.api.vapi.hpp: %.api.json vapi_cpp_gen.py vapi_c_gen.py vapi_json_parser.py
-	@echo "  VAPI CPP GEN $< " $@ ;			\
-	mkdir -p `dirname $@` ;				\
-        $(top_srcdir)/vpp-api/vapi/vapi_cpp_gen.py --prefix=vapi --gen-h-prefix=vapi $<
-
-%.api.json:
-	find $(top_builddir) -name '$@' | xargs ln -s
-
-BUILT_SOURCES = $(shell find $(top_builddir) -name '*.api.json' | xargs -n1 basename) \
-  $(patsubst %.api.json,vapi/%.api.vapi.h,$(JSON_FILES)) \
-  $(patsubst %.api.json,vapi/%.api.vapi.hpp,$(JSON_FILES))
-
-vapi.c: $(BUILT_SOURCES)
-
-JSON_FILES = $(wildcard *.api.json)
-
-lib_LTLIBRARIES = libvapiclient.la
-
-libvapiclient_la_SOURCES = vapi.c
-
-libvapiclient_la_DEPENDENCIES = libvapiclient.map
-
-libvapiclient_la_LIBADD = -lpthread -lm -lrt \
-  $(top_builddir)/libvppinfra.la \
-  $(top_builddir)/libvlibmemoryclient.la \
-  $(top_builddir)/libsvm.la
-
-libvapiclient_la_LDFLAGS = \
-  -Wl,-L$(top_builddir)/.libs,--whole-archive,--no-whole-archive \
-  -Wl,--version-script=$(srcdir)/libvapiclient.map,-lrt
-
-libvapiclient_la_CPPFLAGS = -I. -I$(top_builddir)/vpp-api/vapi
-
-vapiincludedir = $(includedir)/vapi
-
-vapiinclude_HEADERS = vapi.h \
-  vapi.hpp \
-  vapi_dbg.h \
-  vapi_common.h \
-  vapi_internal.h \
-  $(patsubst %.api.json,vapi/%.api.vapi.h,$(JSON_FILES)) \
-  $(patsubst %.api.json,vapi/%.api.vapi.hpp,$(JSON_FILES))
-
-# vi:syntax=automake
diff --git a/src/vpp.am b/src/vpp.am
deleted file mode 100644
index 60be623..0000000
--- a/src/vpp.am
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-bin_PROGRAMS += bin/vpp 
-
-bin_vpp_SOURCES =				\
-  vpp/vnet/main.c				\
-  vpp/app/vpe_cli.c				\
-  vpp/app/version.c				\
-  vpp/oam/oam.c					\
-  vpp/oam/oam_api.c				\
-  vpp/stats/stats.c				\
-  vpp/stats/stat_segment.c
-
-bin_vpp_SOURCES +=				\
-  vpp/api/api.c					\
-  vpp/api/custom_dump.c				\
-  vpp/api/json_format.c
-
-if WITH_APICLI
-  bin_vpp_SOURCES +=				\
-  vpp/api/api_format.c				\
-  vpp/api/api_main.c				\
-  vpp/api/plugin.c				\
-  vpp/api/plugin.h
-endif
-
-# uncomment to enable stats upload to gmond
-# bin_vpp_SOURCES +=				\
-#  vpp/api/gmon.c
-
-bin_vpp_CFLAGS = @APICLI@
-
-nobase_include_HEADERS +=			\
-  vpp/api/vpe_all_api_h.h			\
-  vpp/api/vpe_msg_enum.h			\
-  vpp/stats/stats.api.h 			\
-  vpp/oam/oam.api.h 				\
-  vpp/api/vpe.api.h
-
-API_FILES += 					\
-  vpp/api/vpe.api				\
-  vpp/stats/stats.api				\
-  vpp/oam/oam.api
-
-BUILT_SOURCES += .version
-
-vpp/app/version.o:	vpp/app/version.h
-
-.PHONY:	.version
-
-VPP_VERSION = $(shell $(srcdir)/scripts/version)
-
-VPP_BUILD_DATE ?= $$(date)
-VPP_BUILD_USER ?= $$(whoami)
-VPP_BUILD_HOST ?= $$(hostname)
-
-# update version.h only when version changes, to avoid
-# unnecessary re-linking of vpp binary
-
-.version:
-	@if [ "$$(cat .version 2> /dev/null)" != "$(VPP_VERSION)" ] ; then		\
-	  f="vpp/app/version.h" 							;\
-	  echo "  VERSION  $$f ($(VPP_VERSION))"					;\
-	  echo $(VPP_VERSION) > .version						;\
-          echo "#define VPP_BUILD_DATE \"$(VPP_BUILD_DATE)\"" > $$f                             ;\
-          echo "#define VPP_BUILD_USER \"$(VPP_BUILD_USER)\"" >> $$f                            ;\
-          echo "#define VPP_BUILD_HOST \"$(VPP_BUILD_HOST)\"" >> $$f                            ;\
-	  echo -n "#define VPP_BUILD_TOPDIR " >> $$f					;\
-	  echo "\"$$(cd $(srcdir) && git rev-parse --show-toplevel)\"" >> $$f 		;\
-	  echo "#define VPP_BUILD_VER \"$(VPP_VERSION)\"" >> $$f			;\
-	fi
-
-bin_vpp_LDADD = \
-  libvlibmemory.la \
-  libvlib.la \
-  libvnet.la \
-  libsvm.la \
-  libsvmdb.la \
-  libvppinfra.la \
-  -lrt -lm -lpthread -ldl
-
-bin_vpp_LDFLAGS = -Wl,--export-dynamic
-
-bin_PROGRAMS += bin/vppctl
-bin_vppctl_SOURCES = vpp/app/vppctl.c
-bin_vppctl_LDADD = libvppinfra.la
-
-if ENABLE_TESTS
-noinst_PROGRAMS += bin/test_client
-
-bin_test_client_SOURCES = \
-  vpp/api/test_client.c
-
-bin_test_client_LDADD = \
-  libvlibmemoryclient.la \
-  libsvm.la \
-  libvppinfra.la \
-  -lpthread -lm -lrt
-
-noinst_PROGRAMS += bin/test_client bin/test_ha
-
-bin_test_ha_SOURCES = \
-  vpp/api/test_ha.c
-
-bin_test_ha_LDADD = \
-  libvlibmemoryclient.la \
-  libsvm.la \
-  libvppinfra.la \
-  -lpthread -lm -lrt
-endif
-
-noinst_PROGRAMS += bin/summary_stats_client
-
-bin_summary_stats_client_SOURCES = \
-   vpp/api/summary_stats_client.c
-
-bin_summary_stats_client_LDADD = \
-   libvlibmemoryclient.la \
-   libsvm.la \
-   libvppinfra.la \
-   -lpthread -lm -lrt
-
-bin_PROGRAMS += bin/vpp_get_stats
-
-bin_vpp_get_stats_SOURCES = \
-  vpp/app/vpp_get_stats.c
-
-bin_vpp_get_stats_LDADD =				\
-  libvppapiclient.la				\
-  libvlibmemoryclient.la			\
-  libsvm.la					\
-  libvppinfra.la				\
-  -lpthread -lm -lrt
-
-bin_PROGRAMS += bin/vpp_prometheus_export
-
-bin_vpp_prometheus_export_SOURCES = \
-  vpp/app/vpp_prometheus_export.c
-
-bin_vpp_prometheus_export_LDADD =				\
-  libvppapiclient.la				\
-  libvlibmemoryclient.la			\
-  libsvm.la					\
-  libvppinfra.la				\
-  -lpthread -lm -lrt
-
-
-bin_PROGRAMS += bin/vpp_get_metrics
-
-bin_vpp_get_metrics_SOURCES = \
-  vpp/api/vpp_get_metrics.c
-
-bin_vpp_get_metrics_LDADD = \
-  libsvmdb.la \
-  libsvm.la \
-  libvppinfra.la \
-  -lpthread -lm -lrt
-
-CLEANFILES += vpp/app/version.h
-
-# vi:syntax=automake
diff --git a/src/vppapigen.am b/src/vppapigen.am
deleted file mode 100644
index 485205b..0000000
--- a/src/vppapigen.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dist_bin_SCRIPTS += tools/vppapigen/vppapigen
-
-dist_pkgdata_SCRIPTS = tools/vppapigen/C.py \
-                       tools/vppapigen/JSON.py
-# vi:syntax=automake
diff --git a/src/vppinfra.am b/src/vppinfra.am
deleted file mode 100644
index 1d8e270..0000000
--- a/src/vppinfra.am
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-lib_LTLIBRARIES += libvppinfra.la
-
-TESTS = 
-
-if ENABLE_TESTS
-TESTS  +=  test_bihash_template \
-           test_bihash_vec88 \
-	   test_cuckoo_bihash \
-	   test_cuckoo_template\
-	   test_dlist \
-	   test_elf \
-	   test_elog \
-	   test_fifo \
-	   test_flowhash_template \
-	   test_format \
-	   test_fpool \
-	   test_hash \
-	   test_heap \
-	   test_longjmp \
-	   test_macros \
-	   test_maplog \
-	   test_mheap \
-	   test_pool_iterate \
-	   test_ptclosure \
-	   test_random \
-	   test_random_isaac \
-	   test_serialize \
-	   test_slist \
-	   test_socket \
-	   test_time \
-	   test_time_range \
-	   test_timing_wheel \
-	   test_tw_timer \
-	   test_valloc \
-	   test_vec \
-	   test_zvec
-endif
-
-noinst_PROGRAMS = $(TESTS)
-check_PROGRAMS	= $(TESTS)
-
-test_bihash_template_SOURCES = vppinfra/test_bihash_template.c
-test_bihash_vec88_SOURCES = vppinfra/test_bihash_vec88.c
-test_cuckoo_template_SOURCES = vppinfra/test_cuckoo_template.c
-test_cuckoo_bihash_SOURCES = vppinfra/test_cuckoo_bihash.c
-test_dlist_SOURCES = vppinfra/test_dlist.c
-test_elf_SOURCES = vppinfra/test_elf.c
-test_elog_SOURCES = vppinfra/test_elog.c
-test_fifo_SOURCES = vppinfra/test_fifo.c
-test_flowhash_template_SOURCES = vppinfra/test_flowhash_template.c
-test_format_SOURCES = vppinfra/test_format.c
-test_fpool_SOURCES = vppinfra/test_fpool.c
-test_hash_SOURCES = vppinfra/test_hash.c
-test_heap_SOURCES = vppinfra/test_heap.c
-test_longjmp_SOURCES = vppinfra/test_longjmp.c
-test_macros_SOURCES = vppinfra/test_macros.c
-test_maplog_SOURCES = vppinfra/test_maplog.c
-test_mheap_SOURCES = vppinfra/test_mheap.c
-test_pool_iterate_SOURCES = vppinfra/test_pool_iterate.c
-test_ptclosure_SOURCES = vppinfra/test_ptclosure.c
-test_random_isaac_SOURCES = vppinfra/test_random_isaac.c
-test_random_SOURCES = vppinfra/test_random.c
-test_serialize_SOURCES = vppinfra/test_serialize.c
-test_slist_SOURCES = vppinfra/test_slist.c
-test_socket_SOURCES = vppinfra/test_socket.c
-test_time_SOURCES = vppinfra/test_time.c
-test_time_range_SOURCES = vppinfra/test_time_range.c
-test_timing_wheel_SOURCES = vppinfra/test_timing_wheel.c
-test_tw_timer_SOURCES = vppinfra/test_tw_timer.c
-test_valloc_SOURCES = vppinfra/test_valloc.c
-test_vec_SOURCES = vppinfra/test_vec.c
-test_zvec_SOURCES = vppinfra/test_zvec.c
-
-# All unit tests use ASSERT for failure
-# So we'll need -DDEBUG to enable ASSERTs
-test_bihash_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_bihash_vec88_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_cuckoo_template_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_cuckoo_bihash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_dlist_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_elf_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_elog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_fifo_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_flowhash_template_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_format_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_fpool_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_hash_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_heap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_longjmp_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_macros_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_maplog_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_mheap_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_pool_iterate_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_ptclosure_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_random_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_random_isaac_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_serialize_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_slist_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_socket_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_time_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_timing_wheel_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-test_tw_timer_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_valloc_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_vec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-test_zvec_CPPFLAGS =	$(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_bihash_template_LDADD =	libvppinfra.la -lpthread 
-test_bihash_vec88_LDADD =	libvppinfra.la
-test_cuckoo_template_LDADD =	libvppinfra.la
-test_cuckoo_bihash_LDADD =	libvppinfra.la
-test_dlist_LDADD =	libvppinfra.la
-test_elf_LDADD =	libvppinfra.la
-test_elog_LDADD =	libvppinfra.la
-test_fifo_LDADD =	libvppinfra.la
-test_flowhash_template_LDADD =  libvppinfra.la
-test_format_LDADD =	libvppinfra.la
-test_fpool_LDADD =	libvppinfra.la
-test_hash_LDADD =	libvppinfra.la
-test_heap_LDADD =	libvppinfra.la
-test_longjmp_LDADD =	libvppinfra.la
-test_macros_LDADD =	libvppinfra.la
-test_maplog_LDADD =	libvppinfra.la
-test_mheap_LDADD =	libvppinfra.la
-test_pool_iterate_LDADD =	libvppinfra.la
-test_ptclosure_LDADD =	libvppinfra.la
-test_random_isaac_LDADD =	libvppinfra.la
-test_random_LDADD =	libvppinfra.la
-test_serialize_LDADD =	libvppinfra.la
-test_slist_LDADD =	libvppinfra.la
-test_socket_LDADD =	libvppinfra.la
-test_time_LDADD =	libvppinfra.la -lm
-test_time_range_LDADD =	libvppinfra.la -lm
-test_timing_wheel_LDADD =	libvppinfra.la -lm
-test_tw_timer_LDADD =	libvppinfra.la
-test_valloc_LDADD =	libvppinfra.la
-test_vec_LDADD =	libvppinfra.la
-test_zvec_LDADD =	libvppinfra.la
-
-test_bihash_template_LDFLAGS = -static
-test_bihash_vec88_LDFLAGS = -static
-test_cuckoo_template_LDFLAGS = -static
-test_cuckoo_bihash_LDFLAGS = -static -lpthread
-test_dlist_LDFLAGS = -static
-test_elf_LDFLAGS = -static
-test_elog_LDFLAGS = -static
-test_fifo_LDFLAGS = -static
-test_flowhash_template_LDFLAGS = -static
-test_format_LDFLAGS = -static
-test_fpool_LDFLAGS = -static
-test_hash_LDFLAGS = -static
-test_heap_LDFLAGS = -static
-test_longjmp_LDFLAGS = -static
-test_macros_LDFLAGS = -static
-test_maplog_LDFLAGS = -static
-test_mheap_LDFLAGS = -static
-test_pool_iterate_LDFLAGS = -static
-test_ptclosure_LDFLAGS = -static
-test_random_isaac_LDFLAGS = -static
-test_random_LDFLAGS = -static
-test_serialize_LDFLAGS = -static
-test_slist_LDFLAGS = -static
-test_socket_LDFLAGS = -static
-test_time_LDFLAGS = -static
-test_time_range_LDFLAGS = -static
-test_timing_wheel_LDFLAGS = -static
-test_tw_timer_LDFLAGS = -static
-test_valloc_LDFLAGS = -static
-test_vec_LDFLAGS = -static
-test_zvec_LDFLAGS = -static
-
-# noinst_PROGRAMS += test_vhash
-# test_vhash_SOURCES = vppinfra/test_vhash.c vppinfra/vhash.c
-# test_vhash_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-# test_vhash_LDADD = libvppinfra.la
-# test_vhash_LDFLAGS = -static
-
-nobase_include_HEADERS = \
-  vppinfra/asm_mips.h \
-  vppinfra/asm_x86.h \
-  vppinfra/bihash_8_8.h \
-  vppinfra/bihash_vec8_8.h \
-  vppinfra/bihash_16_8.h \
-  vppinfra/bihash_24_8.h \
-  vppinfra/bihash_40_8.h \
-  vppinfra/bihash_48_8.h \
-  vppinfra/bihash_template.h \
-  vppinfra/bihash_template.c \
-  vppinfra/bitmap.h \
-  vppinfra/bitops.h \
-  vppinfra/byte_order.h \
-  vppinfra/cache.h \
-  vppinfra/config.h \
-  vppinfra/clib.h \
-  vppinfra/clib_error.h \
-  vppinfra/cpu.h \
-  vppinfra/crc32.h \
-  vppinfra/lb_hash_hash.h \
-  vppinfra/dlist.h \
-  vppinfra/elf.h \
-  vppinfra/elf_clib.h \
-  vppinfra/elog.h \
-  vppinfra/fheap.h \
-  vppinfra/error.h \
-  vppinfra/error_bootstrap.h \
-  vppinfra/fifo.h \
-  vppinfra/file.h \
-  vppinfra/flowhash_template.h \
-  vppinfra/flowhash_8_8.h \
-  vppinfra/flowhash_24_16.h \
-  vppinfra/format.h \
-  vppinfra/graph.h \
-  vppinfra/hash.h \
-  vppinfra/heap.h \
-  vppinfra/linux/sysfs.h \
-  vppinfra/linux/syscall.h \
-  vppinfra/lock.h \
-  vppinfra/longjmp.h \
-  vppinfra/macros.h \
-  vppinfra/maplog.h \
-  vppinfra/math.h \
-  vppinfra/mem.h \
-  vppinfra/memcpy_sse3.h \
-  vppinfra/memcpy_avx2.h \
-  vppinfra/memcpy_avx512.h \
-  vppinfra/mhash.h \
-  vppinfra/mheap.h \
-  vppinfra/mheap_bootstrap.h \
-  vppinfra/os.h \
-  vppinfra/pipeline.h \
-  vppinfra/pool.h \
-  vppinfra/ptclosure.h \
-  vppinfra/random.h \
-  vppinfra/random_buffer.h \
-  vppinfra/random_isaac.h \
-  vppinfra/serialize.h \
-  vppinfra/slist.h \
-  vppinfra/smp.h \
-  vppinfra/socket.h \
-  vppinfra/sparse_vec.h \
-  vppinfra/string.h \
-  vppinfra/time.h \
-  vppinfra/time_range.h \
-  vppinfra/timing_wheel.h \
-  vppinfra/timer.h \
-  vppinfra/tw_timer_2t_1w_2048sl.h \
-  vppinfra/tw_timer_16t_2w_512sl.h \
-  vppinfra/tw_timer_16t_1w_2048sl.h \
-  vppinfra/tw_timer_4t_3w_256sl.h \
-  vppinfra/tw_timer_1t_3w_1024sl_ov.h \
-  vppinfra/tw_timer_template.h \
-  vppinfra/tw_timer_template.c \
-  vppinfra/types.h \
-  vppinfra/unix.h \
-  vppinfra/valloc.h \
-  vppinfra/vec.h \
-  vppinfra/vec_bootstrap.h \
-  vppinfra/vector.h \
-  vppinfra/vector_altivec.h \
-  vppinfra/vector_avx2.h \
-  vppinfra/vector_avx512.h \
-  vppinfra/vector_funcs.h \
-  vppinfra/vector_neon.h \
-  vppinfra/vector_sse42.h \
-  vppinfra/valgrind.h \
-  vppinfra/xxhash.h \
-  vppinfra/xy.h \
-  vppinfra/zvec.h
-
-if ENABLE_DLMALLOC
-  nobase_include_HEADERS += \
-  vppinfra/dlmalloc.h
-else
-  nobase_include_HEADERS +=  \
-  vppinfra/mheap_bootstrap.h 
-endif
-
-CLIB_CORE = \
-  vppinfra/asm_x86.c \
-  vppinfra/backtrace.c \
-  vppinfra/bihash_8_8.h \
-  vppinfra/bihash_vec8_8.h \
-  vppinfra/bihash_24_8.h \
-  vppinfra/bihash_template.h \
-  vppinfra/cpu.c \
-  vppinfra/elf.c \
-  vppinfra/elog.c \
-  vppinfra/error.c \
-  vppinfra/fifo.c \
-  vppinfra/fheap.c \
-  vppinfra/flowhash_8_8.h \
-  vppinfra/flowhash_24_16.h \
-  vppinfra/flowhash_template.h \
-  vppinfra/format.c \
-  vppinfra/pool.c \
-  vppinfra/graph.c \
-  vppinfra/hash.c \
-  vppinfra/heap.c \
-  vppinfra/longjmp.S \
-  vppinfra/macros.c \
-  vppinfra/mhash.c \
-  vppinfra/ptclosure.c \
-  vppinfra/random.c \
-  vppinfra/random_buffer.c \
-  vppinfra/random_isaac.c \
-  vppinfra/serialize.c \
-  vppinfra/slist.c \
-  vppinfra/std-formats.c \
-  vppinfra/string.c \
-  vppinfra/time.c \
-  vppinfra/time_range.c \
-  vppinfra/timing_wheel.c \
-  vppinfra/tw_timer_template.h \
-  vppinfra/tw_timer_2t_1w_2048sl.h \
-  vppinfra/tw_timer_2t_1w_2048sl.c \
-  vppinfra/tw_timer_16t_2w_512sl.h \
-  vppinfra/tw_timer_16t_2w_512sl.c \
-  vppinfra/tw_timer_16t_1w_2048sl.h \
-  vppinfra/tw_timer_16t_1w_2048sl.c \
-  vppinfra/tw_timer_4t_3w_256sl.h \
-  vppinfra/tw_timer_4t_3w_256sl.c \
-  vppinfra/tw_timer_1t_3w_1024sl_ov.h \
-  vppinfra/tw_timer_1t_3w_1024sl_ov.c \
-  vppinfra/unformat.c \
-  vppinfra/valloc.c \
-  vppinfra/vec.c \
-  vppinfra/vector.c \
-  vppinfra/zvec.c
-
-if ENABLE_DLMALLOC
-  CLIB_CORE += \
-  vppinfra/mem_dlmalloc.c \
-  vppinfra/dlmalloc.c \
-  vppinfra/dlmalloc.h
-else
-  CLIB_CORE += \
-  vppinfra/mheap.c \
-  vppinfra/mem_mheap.c 
-endif
-
-# Core plus Unix additions
-libvppinfra_la_SOURCES =			\
-  $(CLIB_CORE)					\
-  vppinfra/elf_clib.c				\
-  vppinfra/linux/mem.c				\
-  vppinfra/linux/sysfs.c			\
-  vppinfra/maplog.c 				\
-  vppinfra/socket.c				\
-  vppinfra/timer.c				\
-  vppinfra/unix-formats.c			\
-  vppinfra/unix-misc.c
-
-bin_PROGRAMS = elftool
-
-elftool_SOURCES = tools/elftool/elftool.c
-elftool_CPPFLAGS = $(AM_CPPFLAGS)
-elftool_LDADD = libvppinfra.la -lpthread -lrt -lm
-
-# vi:syntax=automake