From: Damjan Marion Date: Mon, 19 Dec 2016 22:05:39 +0000 (+0100) Subject: Reorganize source tree to use single autotools instance X-Git-Tag: v17.04-rc1~454 X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 Reorganize source tree to use single autotools instance Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23 Signed-off-by: Damjan Marion --- diff --git a/Makefile b/Makefile index 292b0d286c0..1b75779a92c 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ endif DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd -DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope +DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless @@ -147,7 +147,7 @@ else @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++ endif - @make -C $(BR) V=$(V) is_build_tool=yes vppapigen-install + @make -C $(BR) V=$(V) is_build_tool=yes tools-install @touch $@ bootstrap: $(BR)/.bootstrap.ok diff --git a/build-data/packages/cavium-dpdk.mk b/build-data/packages/cavium-dpdk.mk deleted file mode 100644 index ce8ee228429..00000000000 --- a/build-data/packages/cavium-dpdk.mk +++ /dev/null @@ -1,55 +0,0 @@ -# Temporary until Cavium upstreams their work - -cavium-dpdk_configure = \ - src_dir=$(call find_source_fn,$(PACKAGE_SOURCE)) ; \ - dst_dir=$(PACKAGE_BUILD_DIR) ; \ - tar -C $${src_dir} -cf - . | tar -C $${dst_dir} -xf - ; \ - cd $${dst_dir} ; \ - : colossal hemorrhoid to configure headroom ; \ - if [ x$($(PACKAGE)_configure_args_$(PLATFORM)) = "x" ] ; then \ - HR=256 ; \ - else \ - dpdk_configure_args=$($(PACKAGE)_configure_args_$(PLATFORM)) ; \ - if [ $$dpdk_configure_args = "--with-headroom=256" ] ; then \ - HR=256 ; \ - elif [ $$dpdk_configure_args = "--with-headroom=384" ] ; then \ - HR=384 ; \ - else \ - HR=256 ; \ - fi ; \ - fi ; \ - env HR=$$HR \ - spp -o \ - $(PACKAGE_BUILD_DIR)/config/common_linuxapp \ - $(PACKAGE_BUILD_DIR)/config/common_linuxapp.spp \ - ; \ - env $(CONFIGURE_ENV) \ - make config T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64 \ - CC=aarch64-thunderx-linux-gnu-gcc V=0 \ - RTE_SDK=$(PACKAGE_BUILD_DIR) \ - RTE_TARGET=arm-default-linuxapp-gcc - -# Note: add e.g. "-O0" to EXTRA_CFLAGS if desired: EXTRA_CFLAGS='-g -O0' - -cavium-dpdk_make_args = install T=arm64-thunderx-linuxapp-gcc RTE_ARCH=arm64 \ - CC=aarch64-thunderx-linux-gnu-gcc V=0 \ - RTE_SDK=$(PACKAGE_BUILD_DIR) \ - RTE_TARGET=arm-default-linuxapp-gcc - -cavium-dpdk_install = \ - src_dir=$(PACKAGE_BUILD_DIR) ; \ - dst_dir=$(PACKAGE_INSTALL_DIR) ; \ - tar -h -C $${src_dir}/arm64-thunderx-linuxapp-gcc -cf - . \ - | tar -C $${dst_dir} -xf - - -# dpdk libraries end up in .../lib not .../lib64. Fix it. -cavium-dpdk_post_install = \ - if [ "$(arch_lib_dir)" != "lib" ] ; then \ - mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir) ; \ - cd $(PACKAGE_INSTALL_DIR)/lib ; \ - tar cf - . | ( cd $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir); tar xf - ) ; \ - fi - -# nothing to install, all static libraries -cavium-dpdk_image_include = echo - diff --git a/build-data/packages/g2.mk b/build-data/packages/g2.mk index 258eff1daa4..9b760e63d1f 100644 --- a/build-data/packages/g2.mk +++ b/build-data/packages/g2.mk @@ -1,5 +1,3 @@ -g2_configure_depend = vppinfra-install +g2_source = src -g2_CPPFLAGS = $(call installed_includes_fn, vppinfra) - -g2_LDFLAGS = $(call installed_libs_fn, vppinfra) +g2_configure_args = --disable-vlib --disable-svm --enable-g2 diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk index a6ba42d093b..6fa7e0f160f 100644 --- a/build-data/packages/gmod.mk +++ b/build-data/packages/gmod.mk @@ -1,9 +1,9 @@ -gmod_configure_depend = vppinfra-install svm-install +gmod_configure_depend = vpp-install gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia -gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm) +gmod_CPPFLAGS = $(call installed_includes_fn, vpp) gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/include -gmod_LDFLAGS = $(call installed_libs_fn, vppinfra svm) +gmod_LDFLAGS = $(call installed_libs_fn, vpp) gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc diff --git a/build-data/packages/perftool.mk b/build-data/packages/perftool.mk index 300f902b08f..e582c316db1 100644 --- a/build-data/packages/perftool.mk +++ b/build-data/packages/perftool.mk @@ -1,5 +1,4 @@ -perftool_configure_depend = vppinfra-install +perftool_source = src -perftool_CPPFLAGS = $(call installed_includes_fn, vppinfra) +perftool_configure_args = --disable-vlib --disable-svm --enable-perftool -perftool_LDFLAGS = $(call installed_libs_fn, vppinfra) diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk index 44a8e2bd141..b4d67a28abd 100644 --- a/build-data/packages/plugins.mk +++ b/build-data/packages/plugins.mk @@ -1,24 +1,13 @@ plugins_configure_depend = \ - vppinfra-install \ - vlib-api-install \ - vpp-api-test-install \ - vnet-install \ - vlib-install \ - vpp-api-install + vpp-api-install \ + vpp-install -plugins_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - vlib \ - vnet \ - svm \ - vpp-api-test \ - vlib-api \ - vpp-api) +plugins_CPPFLAGS = $(call installed_includes_fn, \ + vpp \ + vpp-api) -plugins_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - vlib \ - vlib-api) +plugins_LDFLAGS = $(call installed_libs_fn, \ + vpp) ifeq ($($(PLATFORM)_enable_tests),yes) plugins_configure_args += --enable-tests diff --git a/vpp-api/python/README.rst b/build-data/packages/src.mk similarity index 100% rename from vpp-api/python/README.rst rename to build-data/packages/src.mk diff --git a/build-data/packages/svm.mk b/build-data/packages/svm.mk deleted file mode 100644 index 3971fe82335..00000000000 --- a/build-data/packages/svm.mk +++ /dev/null @@ -1,5 +0,0 @@ -svm_top_srcdir = $(call find_source_fn,svm) -svm_configure_depend = vppinfra-install - -svm_CPPFLAGS = $(call installed_includes_fn, vppinfra) -svm_LDFLAGS = $(call installed_libs_fn, vppinfra) diff --git a/build-data/packages/vlib-api-cavium-dpdk.mk b/build-data/packages/vlib-api-cavium-dpdk.mk deleted file mode 100644 index 7a4fe2cd718..00000000000 --- a/build-data/packages/vlib-api-cavium-dpdk.mk +++ /dev/null @@ -1,6 +0,0 @@ -vlib-api-cavium-dpdk_source = vlib-api - -vlib-api-cavium-dpdk_configure_depend = vppinfra-install svm-install vlib-cavium-dpdk-install - -vlib-api-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib-cavium-dpdk) -vlib-api-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib-cavium-dpdk) diff --git a/build-data/packages/vlib-api.mk b/build-data/packages/vlib-api.mk deleted file mode 100644 index 29b0d17dba2..00000000000 --- a/build-data/packages/vlib-api.mk +++ /dev/null @@ -1,4 +0,0 @@ -vlib-api_configure_depend = vppinfra-install svm-install vlib-install - -vlib-api_CPPFLAGS = $(call installed_includes_fn, vppinfra svm vlib) -vlib-api_LDFLAGS = $(call installed_libs_fn, vppinfra svm vlib) diff --git a/build-data/packages/vlib-cavium-dpdk.mk b/build-data/packages/vlib-cavium-dpdk.mk deleted file mode 100644 index 0f2f132d05c..00000000000 --- a/build-data/packages/vlib-cavium-dpdk.mk +++ /dev/null @@ -1,7 +0,0 @@ -vlib-cavium-dpdk_source = vlib -vlib-cavium-dpdk_configure_depend = vppinfra-install cavium-dpdk-install - -vlib-cavium-dpdk_configure_args += --with-dpdk - -vlib-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, vppinfra cavium-dpdk) -vlib-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, vppinfra cavium-dpdk) diff --git a/build-data/packages/vlib.mk b/build-data/packages/vlib.mk deleted file mode 100644 index 2172708d07e..00000000000 --- a/build-data/packages/vlib.mk +++ /dev/null @@ -1,16 +0,0 @@ -vlib_configure_depend = vppinfra-install - -vlib_CPPFLAGS = $(call installed_includes_fn, vppinfra) -vlib_LDFLAGS = $(call installed_libs_fn, vppinfra) - -ifneq ($($(PLATFORM)_uses_dpdk),no) -vlib_configure_args += --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -vlib_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -vlib_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -vlib_configure_depend += dpdk-install -vlib_CPPFLAGS += $(call installed_includes_fn, dpdk) -vlib_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif diff --git a/build-data/packages/vnet-cavium-dpdk.mk b/build-data/packages/vnet-cavium-dpdk.mk deleted file mode 100644 index 4c35b04dce8..00000000000 --- a/build-data/packages/vnet-cavium-dpdk.mk +++ /dev/null @@ -1,29 +0,0 @@ -vnet-cavium-dpdk_source = vnet - -vnet-cavium-dpdk_configure_depend = \ - vppinfra-install \ - cavium-dpdk-install \ - svm-install \ - vlib-api-cavium-dpdk-install \ - vlib-cavium-dpdk-install - - -vnet-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - cavium-dpdk \ - openssl \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk) - -vnet-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - cavium-dpdk \ - openssl \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk) - -# Platform dependent configure flags -vnet-cavium-dpdk_configure_args += $(vnet-cavium-dpdk_configure_args_$(PLATFORM)) - diff --git a/build-data/packages/vpp-api-test-cavium-dpdk.mk b/build-data/packages/vpp-api-test-cavium-dpdk.mk deleted file mode 100644 index e352317ff8d..00000000000 --- a/build-data/packages/vpp-api-test-cavium-dpdk.mk +++ /dev/null @@ -1,32 +0,0 @@ -vpp-api-test-cavium-dpdk_source = vpp-api-test - -vpp-api-test-cavium-dpdk_configure_depend = \ - vppinfra-install \ - cavium-dpdk-install \ - svm-install \ - vlib-api-cavium-dpdk-install \ - vlib-cavium-dpdk-install \ - vnet-cavium-dpdk-install \ - vpp-cavium-dpdk-install - -# -vpp-api-test-cavium-dpdk_configure_args = --with-dpdk - -vpp-api-test-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - cavium-dpdk \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk \ - vnet-cavium-dpdk \ - vpp-cavium-dpdk) - -vpp-api-test-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - cavium-dpdk \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk \ - vnet-cavium-dpdk \ - vpp-cavium-dpdk) - diff --git a/build-data/packages/vpp-api-test.mk b/build-data/packages/vpp-api-test.mk deleted file mode 100644 index c9eae367a12..00000000000 --- a/build-data/packages/vpp-api-test.mk +++ /dev/null @@ -1,39 +0,0 @@ -vpp-api-test_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install - -vpp-api-test_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp) - -vpp-api-test_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp) - -ifneq ($($(PLATFORM)_uses_dpdk),no) -vpp-api-test_configure_args = --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -vpp-api-test_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -vpp-api-test_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -vpp-api-test_configure_depend += dpdk-install -vpp-api-test_CPPFLAGS += $(call installed_includes_fn, dpdk) -vpp-api-test_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif -ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes) -vpp-api-test_configure_args += --with-dpdk-crypto -endif - diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk index 4937023aceb..d9e8d72e182 100644 --- a/build-data/packages/vpp-api.mk +++ b/build-data/packages/vpp-api.mk @@ -1,23 +1,9 @@ vpp-api_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ vpp-install vpp-api_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api \ - vnet \ vpp) -vpp-api_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api) +vpp-api_LDFLAGS = vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include diff --git a/build-data/packages/vpp-cavium-dpdk.mk b/build-data/packages/vpp-cavium-dpdk.mk deleted file mode 100644 index 704e3a95535..00000000000 --- a/build-data/packages/vpp-cavium-dpdk.mk +++ /dev/null @@ -1,30 +0,0 @@ -vpp-cavium-dpdk_source = vpp - -vpp-cavium-dpdk_configure_depend = \ - vppinfra-install \ - cavium-dpdk-install \ - svm-install \ - vlib-api-cavium-dpdk-install \ - vlib-cavium-dpdk-install \ - vnet-cavium-dpdk-install - -# Platform dependent configure flags -vpp-cavium-dpdk_configure_args += $(vpp-cavium-dpdk_configure_args_$(PLATFORM)) - -vpp-cavium-dpdk_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - cavium-dpdk \ - openssl \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk \ - vnet-cavium-dpdk) - -vpp-cavium-dpdk_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - cavium-dpdk \ - openssl \ - svm \ - vlib-cavium-dpdk \ - vlib-api-cavium-dpdk \ - vnet-cavium-dpdk) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index a3d60528a01..fe68cd823a3 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -1,11 +1,5 @@ -vpp_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ +vpp_source = src -# ifeq ($($(PLATFORM)_dpdk_shared_lib),yes) vpp_configure_args = --enable-dpdk-shared else @@ -16,25 +10,8 @@ endif vpp_configure_args += $(vpp_configure_args_$(PLATFORM)) -vpp_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api \ - vnet) - -vpp_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - svm \ - vlib \ - vlib-api \ - vnet) - -# include & link with openssl only if needed -ifneq ($($(PLATFORM)_uses_openssl),no) -vpp_CPPFLAGS += $(call installed_includes_fn, openssl) -vpp_LDFLAGS += $(call installed_libs_fn, openssl) -endif +vpp_CPPFLAGS = +vpp_LDFLAGS = ifneq ($($(PLATFORM)_uses_dpdk),no) ifeq ($($(PLATFORM)_uses_external_dpdk),yes) diff --git a/build-data/packages/vppinfra.mk b/build-data/packages/vppinfra.mk deleted file mode 100644 index 6ca6eb24b92..00000000000 --- a/build-data/packages/vppinfra.mk +++ /dev/null @@ -1,5 +0,0 @@ - -ifeq ($($(PLATFORM)_enable_tests),yes) -vppinfra_configure_args += --enable-tests -endif - diff --git a/build-data/platforms.mk b/build-data/platforms.mk index a568c7a06a3..88dd3ed813b 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -60,15 +60,15 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) deb/debian/vpp-dpdk-dev.install ; \ \ : bin package needs startup config ; \ - echo ../../vpp/conf/startup.conf /etc/vpp \ + echo ../../src/vpp/conf/startup.conf /etc/vpp \ >> deb/debian/vpp.install ; \ \ : and sysctl config ; \ - echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d \ + echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d \ >> deb/debian/vpp.install ; \ \ : dev package needs a couple of additions ; \ - echo ../build-tool-native/vppapigen/vppapigen /usr/bin \ + echo ../build-tool-native/tools/vppapigen /usr/bin \ >> deb/debian/vpp-dev.install ; \ echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin \ >> deb/debian/vpp-dev.install ; \ diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 97ddc57db71..513a4db40bc 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -29,11 +29,9 @@ vpp_uses_dpdk = yes # Uncoment to enable building unit tests # vpp_enable_tests = yes -vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ - vpp-api gmod plugins +vpp_root_packages = vpp vpp-api gmod plugins vpp_configure_args_vpp = --with-dpdk -vnet_configure_args_vpp = --with-dpdk # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e. vlib_configure_args_vpp = --with-pre-data=128 diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk index ef2ec4442f9..55805d1002a 100644 --- a/build-data/platforms/vpp_lite.mk +++ b/build-data/platforms/vpp_lite.mk @@ -27,8 +27,7 @@ vpp_lite_uses_dpdk = no # Uncoment to enable building unit tests #vpp_lite_enable_tests = yes -vpp_lite_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ - vpp-api gmod +vpp_lite_root_packages = vpp vpp-api gmod vlib_configure_args_vpp_lite = --with-pre-data=128 diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh index f83734fd4af..2949c1806c2 100755 --- a/build-root/bootstrap.sh +++ b/build-root/bootstrap.sh @@ -45,7 +45,7 @@ cd $wsroot cd $build_root echo Compile native tools -for tool in vppapigen +for tool in tools do make V=0 is_build_tool=yes $tool-install done diff --git a/build-root/packages/src.mk b/build-root/packages/src.mk new file mode 100644 index 00000000000..db48ed58f03 --- /dev/null +++ b/build-root/packages/src.mk @@ -0,0 +1,4 @@ +# nothing + + + diff --git a/build-root/packages/tools.mk b/build-root/packages/tools.mk new file mode 100644 index 00000000000..506e024b727 --- /dev/null +++ b/build-root/packages/tools.mk @@ -0,0 +1,3 @@ +tools_source = src +tools_configure_args = --disable-vlib + diff --git a/build-root/packages/vppapigen.mk b/build-root/packages/vppapigen.mk deleted file mode 100644 index 0d284631979..00000000000 --- a/build-root/packages/vppapigen.mk +++ /dev/null @@ -1,5 +0,0 @@ -vppapigen_configure_depend = vppinfra-install - -vppapigen_CPPFLAGS = $(call installed_includes_fn, vppinfra) - -vppapigen_LDFLAGS = $(call installed_libs_fn, vppinfra) diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index 194d205fe7e..654424c083f 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -97,12 +97,10 @@ groupadd -f -r vpp mkdir -p -m755 %{buildroot}%{_bindir} mkdir -p -m755 %{buildroot}%{_unitdir} install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/*/bin/* %{buildroot}%{_bindir} -install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir} +install -p -m 755 %{_mu_build_dir}/%{_vpp_build_dir}/tools/vppapigen %{buildroot}%{_bindir} -# core api +# api mkdir -p -m755 %{buildroot}/usr/share/vpp/api -install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/vpp-api/vpe.api.json %{buildroot}/usr/share/vpp/api -install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memclnt.api.json %{buildroot}/usr/share/vpp/api # # configs @@ -110,8 +108,8 @@ install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vlib-api/vlibmemory/memcl mkdir -p -m755 %{buildroot}/etc/vpp mkdir -p -m755 %{buildroot}/etc/sysctl.d install -p -m 644 %{_mu_build_dir}/rpm/vpp.service %{buildroot}%{_unitdir} -install -p -m 644 %{_mu_build_dir}/../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf -install -p -m 644 %{_mu_build_dir}/../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d +install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf +install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d # # libraries # @@ -128,7 +126,7 @@ do ( cd %{buildroot}%{_libdir} && ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') ) done -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vnet -type f -name '*.api.json' -print ) +for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api -type f -name '*.api.json' -print ) do install -p -m 644 $file %{buildroot}/usr/share/vpp/api done @@ -178,12 +176,24 @@ do %{buildroot}/usr/lib/vpp_plugins/$file done +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print) +do + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \ + %{buildroot}/usr/lib/vpp_plugins/$file +done + for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print) do install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \ %{buildroot}/usr/lib/vpp_api_test_plugins/$file done +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print) +do + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \ + %{buildroot}/usr/lib/vpp_api_test_plugins/$file +done + for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/plugins -type f -name '*.api.json' -print ) do install -p -m 644 $file %{buildroot}/usr/share/vpp/api diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents index a5a52acf337..4108f7905ea 100755 --- a/build-root/scripts/find-plugins-contents +++ b/build-root/scripts/find-plugins-contents @@ -2,14 +2,14 @@ rm -f $2 -for i in ${1}/plugins/lib64/vpp_plugins/*.so; do +for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do echo ../${i} /usr/lib/vpp_plugins >> ${2} done -for i in ${1}/plugins/lib64/vpp_api_test_plugins/*.so; do +for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2} done -for i in $(find ${1}/plugins -name *.api.json -type f -print); do +for i in $(find ${1}/plugins ${1}/vpp/share/vpp/api/plugins/ -name *.api.json -type f -print); do echo ../${i} /usr/share/vpp/api/ >> ${2} done diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-python-api-contents index 9b390e75849..24e8532c670 100755 --- a/build-root/scripts/find-python-api-contents +++ b/build-root/scripts/find-python-api-contents @@ -2,7 +2,7 @@ rm -f $2 -for i in $(find ${1}/vpp-api/lib/python2.7/site-packages/ -type f -print); do +for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2} done diff --git a/gmod/gmod/mod_vpp.c b/gmod/gmod/mod_vpp.c index 4a1da83cacd..572f9ef58ab 100644 --- a/gmod/gmod/mod_vpp.c +++ b/gmod/gmod/mod_vpp.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include mmodule vpp_module; diff --git a/perftool/Makefile.am b/perftool/Makefile.am deleted file mode 100644 index ac652aa6a2c..00000000000 --- a/perftool/Makefile.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. - -AUTOMAKE_OPTIONS = foreign -AM_CFLAGS = -Wall - -bin_PROGRAMS = c2cpel cpelatency cpeldump cpelinreg cpelstate - -lib_LTLIBRARIES = libcperf.la - -libcperf_la_SOURCES = delsvec.c linreg.c props.c cpel_util.c - -TOOL_LIBS = libcperf.la -lvppinfra -lm - -c2cpel_SOURCE = c2cpel.c -c2cpel_LDADD = $(TOOL_LIBS) - -cpelatency_SOURCE = cpelatency.c -cpelatency_LDADD = $(TOOL_LIBS) - -cpeldump_SOURCE = cpeldump.c -cpeldump_LDADD = $(TOOL_LIBS) - -cpelinreg_SOURCE = cpelinreg.c -cpelinreg_LDADD = $(TOOL_LIBS) - -cpelstate_SOURCE = cpelstate.c -cpelstate_LDADD = $(TOOL_LIBS) - - - - - - diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 100f089e0fe..a101e47f5d7 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -28,10 +28,6 @@ if ENABLE_sample_PLUGIN SUBDIRS += sample-plugin endif -if ENABLE_sixrd_PLUGIN -SUBDIRS += sixrd-plugin -endif - if ENABLE_ioam_PLUGIN SUBDIRS += ioam-plugin endif @@ -44,18 +40,10 @@ if ENABLE_snat_PLUGIN SUBDIRS += snat-plugin endif -if ENABLE_ila_PLUGIN -SUBDIRS += ila-plugin -endif - if ENABLE_lb_PLUGIN SUBDIRS += lb-plugin endif -if ENABLE_flowperpkt_PLUGIN -SUBDIRS += flowperpkt-plugin -endif - if ENABLE_acl_PLUGIN SUBDIRS += acl-plugin endif diff --git a/plugins/configure.ac b/plugins/configure.ac index 6e7d5b8ad1e..9c631634ff6 100644 --- a/plugins/configure.ac +++ b/plugins/configure.ac @@ -53,12 +53,9 @@ AM_CONDITIONAL(ENABLE_$1_PLUGIN, test "$enable_the_plugin" = "1") # SUBDIRS += new-plugin # endif -PLUGIN_ENABLED(sixrd) PLUGIN_ENABLED(ioam) PLUGIN_ENABLED(snat) -PLUGIN_ENABLED(ila) PLUGIN_ENABLED(lb) -PLUGIN_ENABLED(flowperpkt) PLUGIN_ENABLED(acl) # Disabled plugins, require --enable-XXX-plugin diff --git a/plugins/flowperpkt-plugin/Makefile.am b/plugins/flowperpkt-plugin/Makefile.am deleted file mode 100644 index 9354e26faa2..00000000000 --- a/plugins/flowperpkt-plugin/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ - -# Copyright (c) -# 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 = -Wall -AM_LDFLAGS = -module -shared -avoid-version - -vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins -vpppluginsdir = ${libdir}/vpp_plugins - -vppplugins_LTLIBRARIES = flowperpkt_plugin.la -vppapitestplugins_LTLIBRARIES = flowperpkt_test_plugin.la - -flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c \ - flowperpkt/l2_node.c \ - flowperpkt/node.c \ - flowperpkt/flowperpkt_plugin.api.h -flowperpkt_plugin_la_LDFLAGS = -module - -BUILT_SOURCES = \ - flowperpkt/flowperpkt.api.h \ - flowperpkt/flowperpkt.api.json - -SUFFIXES = .api.h .api .api.json - -%.api.h: %.api - mkdir -p `dirname $@` ; \ - $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ - | vppapigen --input - --output $@ --show-name $@ - -%.api.json: %.api - @echo " JSON APIGEN " $@ ; \ - mkdir -p `dirname $@` ; \ - $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ - | vppapigen --input - --json $@ - -apidir = $(prefix)/flowperpkt/ -api_DATA = flowperpkt/flowperpkt.api.json - -noinst_HEADERS = \ - flowperpkt/flowperpkt_all_api_h.h \ - flowperpkt/flowperpkt_msg_enum.h \ - flowperpkt/flowperpkt.api.h - -flowperpkt_test_plugin_la_SOURCES = \ - flowperpkt/flowperpkt_test.c flowperpkt/flowperpkt_plugin.api.h - -# Remove *.la files -install-data-hook: - @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) - @(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES)) - diff --git a/plugins/flowperpkt-plugin/configure.ac b/plugins/flowperpkt-plugin/configure.ac deleted file mode 100644 index 80546169efd..00000000000 --- a/plugins/flowperpkt-plugin/configure.ac +++ /dev/null @@ -1,9 +0,0 @@ - -AC_INIT(flowperpkt_plugin, 1.0) -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_LIBTOOL -AC_PROG_CC - -AC_OUTPUT([Makefile]) diff --git a/plugins/ila-plugin/configure.ac b/plugins/ila-plugin/configure.ac deleted file mode 100644 index 56016b4d22d..00000000000 --- a/plugins/ila-plugin/configure.ac +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(ila_plugin, 1.0) -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) -AC_PREFIX_DEFAULT([/usr]) - -AC_PROG_LIBTOOL -AC_PROG_CC - -AC_OUTPUT([Makefile]) diff --git a/plugins/sixrd-plugin/configure.ac b/plugins/sixrd-plugin/configure.ac deleted file mode 100644 index 3aa4c425158..00000000000 --- a/plugins/sixrd-plugin/configure.ac +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(sixrd_plugin, 1.0) -LT_INIT -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) -AC_PREFIX_DEFAULT([/usr]) - -AC_PROG_CC - -AC_OUTPUT([Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 00000000000..e691a5393d3 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,101 @@ +# 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_CFLAGS = -Wall + +SUBDIRS = . +SUFFIXES = .api.h .api .api.json +API_FILES = +noinst_HEADERS = +dist_bin_SCRIPTS = +lib_LTLIBRARIES = +BUILT_SOURCES = + +############################################################################### +# DPDK +############################################################################### + +if WITH_DPDK +if ENABLE_DPDK_SHARED +DPDK_LD_FLAGS = -Wl,--whole-archive,-ldpdk,--no-whole-archive +else +DPDK_LD_FLAGS = -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive +endif +if WITH_DPDK_CRYPTO +DPDK_LD_ADD = -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB +endif +if WITH_DPDK_MLX5_PMD +DPDK_LD_FLAGS += -libverbs -lmlx5 -lnuma +endif +else +DPDK_LD_FLAGS = +DPDK_LD_ADD = +endif + +############################################################################### +# 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 + +SUBDIRS += vpp-api/python plugins + +############################################################################### +# 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.json,$(API_FILES)) \ + $(patsubst %.api,%.api.h,$(API_FILES)) + +endif # if ENABLE_VLIB +endif # if ENABLE_SVM diff --git a/src/configure.ac b/src/configure.ac new file mode 100644 index 00000000000..f8e4d94f81d --- /dev/null +++ b/src/configure.ac @@ -0,0 +1,195 @@ +AC_INIT([vpp], [17.04], [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]) + +AC_PROG_CC +AM_PROG_AS +AM_PROG_LIBTOOL +AC_PROG_YACC + +############################################################################### +# 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)) ]) + +############################################################################### +# 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]) + +# --disable-X +DISABLE_ARG(vlib, [Disable vlib and dependant libs and binaries]) +DISABLE_ARG(svm, [Disable svm and dependant libs and binaries]) + +# --with-X +WITH_ARG(dpdk, [Use use DPDK]) +WITH_ARG(dpdk_crypto, [Use DPDK cryptodev]) +WITH_ARG(dpdk_mlx5_pmd, [Use DPDK with mlx5 PMD]) + +# --without-X +WITHOUT_ARG(ipsec, [Disable IPSec]) +WITHOUT_ARG(ipv6sr, [Disable IPv6 SR]) +WITHOUT_ARG(apicli, [Disable binary api CLI]) + +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]) + +############################################################################### +# Substitutions and defines +############################################################################### + +AC_SUBST(PRE_DATA_SIZE, [$with_pre_data]) +AC_SUBST(APICLI, [-DVPP_API_TEST_BUILTIN=${n_with_apicli}]) + +AC_DEFINE_UNQUOTED(DPDK, [${n_with_dpdk}]) +AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB, [${n_enable_dpdk_shared}]) +AC_DEFINE_UNQUOTED(DPDK_CRYPTO, [${n_with_dpdk_crypto}]) +AC_DEFINE_UNQUOTED(IPSEC, [${n_with_ipsec}]) +AC_DEFINE_UNQUOTED(IPV6SR, [${n_with_ipv6sr}]) + +############################################################################### +# Dependency checks +############################################################################### + +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])],) +]) + +AM_COND_IF([ENABLE_G2], +[ + PKG_CHECK_MODULES(g2, gtk+-2.0) +]) + +############################################################################### +# Plugins +############################################################################### + +PLUGIN_ENABLED(sixrd) +PLUGIN_ENABLED(ila) +PLUGIN_ENABLED(flowperpkt) + +############################################################################### +# 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}) + +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/vlib/example/dir.dox b/src/examples/vlib/dir.dox similarity index 100% rename from vlib/example/dir.dox rename to src/examples/vlib/dir.dox diff --git a/vlib/example/main_stub.c b/src/examples/vlib/main_stub.c similarity index 100% rename from vlib/example/main_stub.c rename to src/examples/vlib/main_stub.c diff --git a/vlib/example/mc_test.c b/src/examples/vlib/mc_test.c similarity index 100% rename from vlib/example/mc_test.c rename to src/examples/vlib/mc_test.c diff --git a/vlib/example/plex_test.c b/src/examples/vlib/plex_test.c similarity index 100% rename from vlib/example/plex_test.c rename to src/examples/vlib/plex_test.c diff --git a/g2/Makefile.am b/src/g2.am similarity index 62% rename from g2/Makefile.am rename to src/g2.am index 8457c272fcd..e79657335fe 100644 --- a/g2/Makefile.am +++ b/src/g2.am @@ -11,24 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign - -bin_PROGRAMS = g2 - -AM_CFLAGS = -Wall +bin_PROGRAMS += g2 g2_SOURCES = \ - clib.c \ - cpel.c \ - cpel.h \ - events.c \ - g2.h \ - main.c \ - menu1.c \ - pointsel.c \ - props.c \ - props.h \ - g2version.c \ - view1.c + 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 -g2_LDADD = $(g2_LIBS) -lvppinfra -lpthread -lm +# vi:syntax=automake diff --git a/src/perftool.am b/src/perftool.am new file mode 100644 index 00000000000..09f1681a7e3 --- /dev/null +++ b/src/perftool.am @@ -0,0 +1,41 @@ +# 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 + +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) + +# vi:syntax=automake diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am new file mode 100644 index 00000000000..ffc4b3abddc --- /dev/null +++ b/src/plugins/Makefile.am @@ -0,0 +1,60 @@ + +# Copyright (c) +# 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 = -Wall -I${top_srcdir} -I${top_builddir} +AM_LDFLAGS = -module -shared -avoid-version +SUFFIXES = .api.h .api .api.json +API_FILES = +BUILT_SOURCES = +vppplugins_LTLIBRARIES = +vppapitestplugins_LTLIBRARIES = +noinst_HEADERS = + +vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins +vpppluginsdir = ${libdir}/vpp_plugins + +if ENABLE_FLOWPERPKT_PLUGIN +include flowperpkt.am +endif + +if ENABLE_ILA_PLUGIN +include ila.am +endif + +if ENABLE_SIXRD_PLUGIN +include sixrd.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 + +api_DATA = \ + $(patsubst %.api,%.api.json,$(API_FILES)) + +BUILT_SOURCES += \ + $(patsubst %.api,%.api.json,$(API_FILES)) \ + $(patsubst %.api,%.api.h,$(API_FILES)) + diff --git a/src/plugins/flowperpkt.am b/src/plugins/flowperpkt.am new file mode 100644 index 00000000000..a400603a71f --- /dev/null +++ b/src/plugins/flowperpkt.am @@ -0,0 +1,38 @@ + +# Copyright (c) +# 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 += flowperpkt_plugin.la +vppapitestplugins_LTLIBRARIES += flowperpkt_test_plugin.la + +flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c \ + flowperpkt/l2_node.c \ + flowperpkt/node.c \ + flowperpkt/flowperpkt_plugin.api.h + +BUILT_SOURCES += \ + flowperpkt/flowperpkt.api.h \ + flowperpkt/flowperpkt.api.json + +noinst_HEADERS += \ + flowperpkt/flowperpkt_all_api_h.h \ + flowperpkt/flowperpkt_msg_enum.h \ + flowperpkt/flowperpkt.api.h + +flowperpkt_test_plugin_la_SOURCES = \ + flowperpkt/flowperpkt_test.c \ + flowperpkt/flowperpkt_plugin.api.h + +API_FILES += flowperpkt/flowperpkt.api + +# vi:syntax=automake diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api b/src/plugins/flowperpkt/flowperpkt.api similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt.api rename to src/plugins/flowperpkt/flowperpkt.api diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c b/src/plugins/flowperpkt/flowperpkt.c similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt.c rename to src/plugins/flowperpkt/flowperpkt.c diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h b/src/plugins/flowperpkt/flowperpkt.h similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt.h rename to src/plugins/flowperpkt/flowperpkt.h diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h b/src/plugins/flowperpkt/flowperpkt_all_api_h.h similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt_all_api_h.h rename to src/plugins/flowperpkt/flowperpkt_all_api_h.h diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h b/src/plugins/flowperpkt/flowperpkt_msg_enum.h similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt_msg_enum.h rename to src/plugins/flowperpkt/flowperpkt_msg_enum.h diff --git a/plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md b/src/plugins/flowperpkt/flowperpkt_plugin_doc.md similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt_plugin_doc.md rename to src/plugins/flowperpkt/flowperpkt_plugin_doc.md diff --git a/plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c b/src/plugins/flowperpkt/flowperpkt_test.c similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/flowperpkt_test.c rename to src/plugins/flowperpkt/flowperpkt_test.c diff --git a/plugins/flowperpkt-plugin/flowperpkt/l2_node.c b/src/plugins/flowperpkt/l2_node.c similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/l2_node.c rename to src/plugins/flowperpkt/l2_node.c diff --git a/plugins/flowperpkt-plugin/flowperpkt/node.c b/src/plugins/flowperpkt/node.c similarity index 100% rename from plugins/flowperpkt-plugin/flowperpkt/node.c rename to src/plugins/flowperpkt/node.c diff --git a/plugins/ila-plugin/Makefile.am b/src/plugins/ila.am similarity index 66% rename from plugins/ila-plugin/Makefile.am rename to src/plugins/ila.am index fe785df9bc3..d900f3eb307 100644 --- a/plugins/ila-plugin/Makefile.am +++ b/src/plugins/ila.am @@ -11,19 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall -AM_LDFLAGS = -module -shared -avoid-version - -vpppluginsdir = ${libdir}/vpp_plugins - -vppplugins_LTLIBRARIES = ila_plugin.la +vppplugins_LTLIBRARIES += ila_plugin.la ila_plugin_la_SOURCES = ila/ila.c -noinst_HEADERS = ila/ila.h +noinst_HEADERS += ila/ila.h -# Remove *.la files -install-data-hook: - @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) +# vi:syntax=automake diff --git a/plugins/ila-plugin/ila/ila.c b/src/plugins/ila/ila.c similarity index 100% rename from plugins/ila-plugin/ila/ila.c rename to src/plugins/ila/ila.c diff --git a/plugins/ila-plugin/ila/ila.h b/src/plugins/ila/ila.h similarity index 100% rename from plugins/ila-plugin/ila/ila.h rename to src/plugins/ila/ila.h diff --git a/plugins/sixrd-plugin/Makefile.am b/src/plugins/sixrd.am similarity index 70% rename from plugins/sixrd-plugin/Makefile.am rename to src/plugins/sixrd.am index eb0d806aa6a..0de4508831e 100644 --- a/plugins/sixrd-plugin/Makefile.am +++ b/src/plugins/sixrd.am @@ -11,28 +11,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall -AM_LDFLAGS = -module -shared -avoid-version - libsixrd_plugin_la_SOURCES = \ sixrd/sixrd.c \ sixrd/sixrd_dpo.c \ sixrd/ip4_sixrd.c \ sixrd/ip6_sixrd.c -noinst_HEADERS = \ +noinst_HEADERS += \ sixrd/sixrd.h \ sixrd/sixrd_dpo.h -BUILT_SOURCES = - -vpppluginsdir = ${libdir}/vpp_plugins - -vppplugins_LTLIBRARIES = libsixrd_plugin.la - +vppplugins_LTLIBRARIES += libsixrd_plugin.la -# Remove *.la files -install-data-hook: - @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) +# vi:syntax=automake diff --git a/plugins/sixrd-plugin/sixrd/ip4_sixrd.c b/src/plugins/sixrd/ip4_sixrd.c similarity index 100% rename from plugins/sixrd-plugin/sixrd/ip4_sixrd.c rename to src/plugins/sixrd/ip4_sixrd.c diff --git a/plugins/sixrd-plugin/sixrd/ip6_sixrd.c b/src/plugins/sixrd/ip6_sixrd.c similarity index 100% rename from plugins/sixrd-plugin/sixrd/ip6_sixrd.c rename to src/plugins/sixrd/ip6_sixrd.c diff --git a/plugins/sixrd-plugin/sixrd/sixrd.c b/src/plugins/sixrd/sixrd.c similarity index 100% rename from plugins/sixrd-plugin/sixrd/sixrd.c rename to src/plugins/sixrd/sixrd.c diff --git a/plugins/sixrd-plugin/sixrd/sixrd.h b/src/plugins/sixrd/sixrd.h similarity index 100% rename from plugins/sixrd-plugin/sixrd/sixrd.h rename to src/plugins/sixrd/sixrd.h diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.c b/src/plugins/sixrd/sixrd_dpo.c similarity index 100% rename from plugins/sixrd-plugin/sixrd/sixrd_dpo.c rename to src/plugins/sixrd/sixrd_dpo.c diff --git a/plugins/sixrd-plugin/sixrd/sixrd_dpo.h b/src/plugins/sixrd/sixrd_dpo.h similarity index 100% rename from plugins/sixrd-plugin/sixrd/sixrd_dpo.h rename to src/plugins/sixrd/sixrd_dpo.h diff --git a/vnet/etc/scripts/arp4 b/src/scripts/vnet/arp4 similarity index 100% rename from vnet/etc/scripts/arp4 rename to src/scripts/vnet/arp4 diff --git a/vnet/etc/scripts/arp4-mpls b/src/scripts/vnet/arp4-mpls similarity index 100% rename from vnet/etc/scripts/arp4-mpls rename to src/scripts/vnet/arp4-mpls diff --git a/vnet/etc/scripts/arp6 b/src/scripts/vnet/arp6 similarity index 100% rename from vnet/etc/scripts/arp6 rename to src/scripts/vnet/arp6 diff --git a/vnet/etc/scripts/bvi b/src/scripts/vnet/bvi similarity index 100% rename from vnet/etc/scripts/bvi rename to src/scripts/vnet/bvi diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/src/scripts/vnet/dhcp/dhcpd.conf similarity index 100% rename from vnet/etc/scripts/dhcp/dhcpd.conf rename to src/scripts/vnet/dhcp/dhcpd.conf diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/src/scripts/vnet/dhcp/left-ping-target.sh similarity index 100% rename from vnet/etc/scripts/dhcp/left-ping-target.sh rename to src/scripts/vnet/dhcp/left-ping-target.sh diff --git a/vnet/etc/scripts/dhcp/leftpeer.conf b/src/scripts/vnet/dhcp/leftpeer.conf similarity index 100% rename from vnet/etc/scripts/dhcp/leftpeer.conf rename to src/scripts/vnet/dhcp/leftpeer.conf diff --git a/vnet/etc/scripts/icmp b/src/scripts/vnet/icmp similarity index 100% rename from vnet/etc/scripts/icmp rename to src/scripts/vnet/icmp diff --git a/vnet/etc/scripts/icmp6 b/src/scripts/vnet/icmp6 similarity index 100% rename from vnet/etc/scripts/icmp6 rename to src/scripts/vnet/icmp6 diff --git a/vnet/etc/scripts/ige b/src/scripts/vnet/ige similarity index 100% rename from vnet/etc/scripts/ige rename to src/scripts/vnet/ige diff --git a/vnet/etc/scripts/ip6 b/src/scripts/vnet/ip6 similarity index 100% rename from vnet/etc/scripts/ip6 rename to src/scripts/vnet/ip6 diff --git a/vnet/etc/scripts/ip6-hbh b/src/scripts/vnet/ip6-hbh similarity index 100% rename from vnet/etc/scripts/ip6-hbh rename to src/scripts/vnet/ip6-hbh diff --git a/vnet/etc/scripts/ixge b/src/scripts/vnet/ixge similarity index 100% rename from vnet/etc/scripts/ixge rename to src/scripts/vnet/ixge diff --git a/vnet/etc/scripts/l2efpfilter b/src/scripts/vnet/l2efpfilter similarity index 100% rename from vnet/etc/scripts/l2efpfilter rename to src/scripts/vnet/l2efpfilter diff --git a/vnet/etc/scripts/l2efpfilter_perf b/src/scripts/vnet/l2efpfilter_perf similarity index 100% rename from vnet/etc/scripts/l2efpfilter_perf rename to src/scripts/vnet/l2efpfilter_perf diff --git a/vnet/etc/scripts/l2fib b/src/scripts/vnet/l2fib similarity index 100% rename from vnet/etc/scripts/l2fib rename to src/scripts/vnet/l2fib diff --git a/vnet/etc/scripts/l2fib_perf b/src/scripts/vnet/l2fib_perf similarity index 100% rename from vnet/etc/scripts/l2fib_perf rename to src/scripts/vnet/l2fib_perf diff --git a/vnet/etc/scripts/l2fib_xc b/src/scripts/vnet/l2fib_xc similarity index 100% rename from vnet/etc/scripts/l2fib_xc rename to src/scripts/vnet/l2fib_xc diff --git a/vnet/etc/scripts/l2flood b/src/scripts/vnet/l2flood similarity index 100% rename from vnet/etc/scripts/l2flood rename to src/scripts/vnet/l2flood diff --git a/vnet/etc/scripts/l2tp b/src/scripts/vnet/l2tp similarity index 100% rename from vnet/etc/scripts/l2tp rename to src/scripts/vnet/l2tp diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify b/src/scripts/vnet/leftpeer/leftpeer-classify similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-classify rename to src/scripts/vnet/leftpeer/leftpeer-classify diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classify6 b/src/scripts/vnet/leftpeer/leftpeer-classify6 similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-classify6 rename to src/scripts/vnet/leftpeer/leftpeer-classify6 diff --git a/vnet/etc/scripts/leftpeer/leftpeer-classifyl2 b/src/scripts/vnet/leftpeer/leftpeer-classifyl2 similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-classifyl2 rename to src/scripts/vnet/leftpeer/leftpeer-classifyl2 diff --git a/vnet/etc/scripts/leftpeer/leftpeer-dhcp b/src/scripts/vnet/leftpeer/leftpeer-dhcp similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-dhcp rename to src/scripts/vnet/leftpeer/leftpeer-dhcp diff --git a/vnet/etc/scripts/leftpeer/leftpeer-ioam.conf b/src/scripts/vnet/leftpeer/leftpeer-ioam.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-ioam.conf rename to src/scripts/vnet/leftpeer/leftpeer-ioam.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-l3vxlan.conf rename to src/scripts/vnet/leftpeer/leftpeer-l3vxlan.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer-lisp.conf b/src/scripts/vnet/leftpeer/leftpeer-lisp.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-lisp.conf rename to src/scripts/vnet/leftpeer/leftpeer-lisp.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer-mpls.conf b/src/scripts/vnet/leftpeer/leftpeer-mpls.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-mpls.conf rename to src/scripts/vnet/leftpeer/leftpeer-mpls.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer-sr.conf b/src/scripts/vnet/leftpeer/leftpeer-sr.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-sr.conf rename to src/scripts/vnet/leftpeer/leftpeer-sr.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf b/src/scripts/vnet/leftpeer/leftpeer-vxlan.conf similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer-vxlan.conf rename to src/scripts/vnet/leftpeer/leftpeer-vxlan.conf diff --git a/vnet/etc/scripts/leftpeer/leftpeer.script b/src/scripts/vnet/leftpeer/leftpeer.script similarity index 100% rename from vnet/etc/scripts/leftpeer/leftpeer.script rename to src/scripts/vnet/leftpeer/leftpeer.script diff --git a/vnet/etc/scripts/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls similarity index 100% rename from vnet/etc/scripts/lfib/ip4-to-mpls rename to src/scripts/vnet/lfib/ip4-to-mpls diff --git a/vnet/etc/scripts/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls similarity index 100% rename from vnet/etc/scripts/lfib/mpls-pop-to-mpls rename to src/scripts/vnet/lfib/mpls-pop-to-mpls diff --git a/vnet/etc/scripts/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4 similarity index 100% rename from vnet/etc/scripts/lfib/mpls-to-ip4 rename to src/scripts/vnet/lfib/mpls-to-ip4 diff --git a/vnet/etc/scripts/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls similarity index 100% rename from vnet/etc/scripts/lfib/mpls-to-mpls rename to src/scripts/vnet/lfib/mpls-to-mpls diff --git a/vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf b/src/scripts/vnet/mpls-o-ethernet/leftpeer.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-ethernet/leftpeer.conf rename to src/scripts/vnet/mpls-o-ethernet/leftpeer.conf diff --git a/vnet/etc/scripts/mpls-o-ethernet/pg b/src/scripts/vnet/mpls-o-ethernet/pg similarity index 100% rename from vnet/etc/scripts/mpls-o-ethernet/pg rename to src/scripts/vnet/mpls-o-ethernet/pg diff --git a/vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf b/src/scripts/vnet/mpls-o-ethernet/rightpeer.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-ethernet/rightpeer.conf rename to src/scripts/vnet/mpls-o-ethernet/rightpeer.conf diff --git a/vnet/etc/scripts/mpls-o-ethernet/single.conf b/src/scripts/vnet/mpls-o-ethernet/single.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-ethernet/single.conf rename to src/scripts/vnet/mpls-o-ethernet/single.conf diff --git a/vnet/etc/scripts/mpls-o-gre/dhcpd.conf b/src/scripts/vnet/mpls-o-gre/dhcpd.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-gre/dhcpd.conf rename to src/scripts/vnet/mpls-o-gre/dhcpd.conf diff --git a/vnet/etc/scripts/mpls-o-gre/leftpeer.conf b/src/scripts/vnet/mpls-o-gre/leftpeer.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-gre/leftpeer.conf rename to src/scripts/vnet/mpls-o-gre/leftpeer.conf diff --git a/vnet/etc/scripts/mpls-o-gre/rightpeer.conf b/src/scripts/vnet/mpls-o-gre/rightpeer.conf similarity index 100% rename from vnet/etc/scripts/mpls-o-gre/rightpeer.conf rename to src/scripts/vnet/mpls-o-gre/rightpeer.conf diff --git a/vnet/etc/scripts/mpls-tunnel b/src/scripts/vnet/mpls-tunnel similarity index 100% rename from vnet/etc/scripts/mpls-tunnel rename to src/scripts/vnet/mpls-tunnel diff --git a/vnet/etc/scripts/pcap b/src/scripts/vnet/pcap similarity index 100% rename from vnet/etc/scripts/pcap rename to src/scripts/vnet/pcap diff --git a/vnet/etc/scripts/probe4 b/src/scripts/vnet/probe4 similarity index 100% rename from vnet/etc/scripts/probe4 rename to src/scripts/vnet/probe4 diff --git a/vnet/etc/scripts/probe6 b/src/scripts/vnet/probe6 similarity index 100% rename from vnet/etc/scripts/probe6 rename to src/scripts/vnet/probe6 diff --git a/vnet/etc/scripts/rewrite b/src/scripts/vnet/rewrite similarity index 100% rename from vnet/etc/scripts/rewrite rename to src/scripts/vnet/rewrite diff --git a/vnet/etc/scripts/rightpeer/rightpeer-ioam.conf b/src/scripts/vnet/rightpeer/rightpeer-ioam.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-ioam.conf rename to src/scripts/vnet/rightpeer/rightpeer-ioam.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-l3vxlan.conf rename to src/scripts/vnet/rightpeer/rightpeer-l3vxlan.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-lisp.conf b/src/scripts/vnet/rightpeer/rightpeer-lisp.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-lisp.conf rename to src/scripts/vnet/rightpeer/rightpeer-lisp.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-mpls-l2.conf rename to src/scripts/vnet/rightpeer/rightpeer-mpls-l2.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-mpls.conf b/src/scripts/vnet/rightpeer/rightpeer-mpls.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-mpls.conf rename to src/scripts/vnet/rightpeer/rightpeer-mpls.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-sr.conf b/src/scripts/vnet/rightpeer/rightpeer-sr.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-sr.conf rename to src/scripts/vnet/rightpeer/rightpeer-sr.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf b/src/scripts/vnet/rightpeer/rightpeer-vxlan.conf similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer-vxlan.conf rename to src/scripts/vnet/rightpeer/rightpeer-vxlan.conf diff --git a/vnet/etc/scripts/rightpeer/rightpeer.script b/src/scripts/vnet/rightpeer/rightpeer.script similarity index 100% rename from vnet/etc/scripts/rightpeer/rightpeer.script rename to src/scripts/vnet/rightpeer/rightpeer.script diff --git a/vnet/etc/scripts/rpf b/src/scripts/vnet/rpf similarity index 100% rename from vnet/etc/scripts/rpf rename to src/scripts/vnet/rpf diff --git a/vnet/etc/scripts/rtt-test b/src/scripts/vnet/rtt-test similarity index 100% rename from vnet/etc/scripts/rtt-test rename to src/scripts/vnet/rtt-test diff --git a/vnet/etc/scripts/snat b/src/scripts/vnet/snat similarity index 100% rename from vnet/etc/scripts/snat rename to src/scripts/vnet/snat diff --git a/vnet/etc/scripts/snat_static b/src/scripts/vnet/snat_static similarity index 100% rename from vnet/etc/scripts/snat_static rename to src/scripts/vnet/snat_static diff --git a/vnet/etc/scripts/snat_static_with_port b/src/scripts/vnet/snat_static_with_port similarity index 100% rename from vnet/etc/scripts/snat_static_with_port rename to src/scripts/vnet/snat_static_with_port diff --git a/vnet/etc/scripts/source_and_port_range_check b/src/scripts/vnet/source_and_port_range_check similarity index 100% rename from vnet/etc/scripts/source_and_port_range_check rename to src/scripts/vnet/source_and_port_range_check diff --git a/vnet/etc/scripts/speed b/src/scripts/vnet/speed similarity index 100% rename from vnet/etc/scripts/speed rename to src/scripts/vnet/speed diff --git a/vnet/etc/scripts/sr/left-linux-ping.sh b/src/scripts/vnet/sr/left-linux-ping.sh similarity index 100% rename from vnet/etc/scripts/sr/left-linux-ping.sh rename to src/scripts/vnet/sr/left-linux-ping.sh diff --git a/vnet/etc/scripts/sr/leftpeer.conf b/src/scripts/vnet/sr/leftpeer.conf similarity index 100% rename from vnet/etc/scripts/sr/leftpeer.conf rename to src/scripts/vnet/sr/leftpeer.conf diff --git a/vnet/etc/scripts/sr/right-linux-ping.sh b/src/scripts/vnet/sr/right-linux-ping.sh similarity index 100% rename from vnet/etc/scripts/sr/right-linux-ping.sh rename to src/scripts/vnet/sr/right-linux-ping.sh diff --git a/vnet/etc/scripts/sr/rightpeer.conf b/src/scripts/vnet/sr/rightpeer.conf similarity index 100% rename from vnet/etc/scripts/sr/rightpeer.conf rename to src/scripts/vnet/sr/rightpeer.conf diff --git a/vnet/etc/scripts/sr/srlocal.sh b/src/scripts/vnet/sr/srlocal.sh similarity index 100% rename from vnet/etc/scripts/sr/srlocal.sh rename to src/scripts/vnet/sr/srlocal.sh diff --git a/vnet/etc/scripts/srp b/src/scripts/vnet/srp similarity index 100% rename from vnet/etc/scripts/srp rename to src/scripts/vnet/srp diff --git a/vnet/etc/scripts/tcp b/src/scripts/vnet/tcp similarity index 100% rename from vnet/etc/scripts/tcp rename to src/scripts/vnet/tcp diff --git a/vnet/etc/scripts/tcp-test b/src/scripts/vnet/tcp-test similarity index 100% rename from vnet/etc/scripts/tcp-test rename to src/scripts/vnet/tcp-test diff --git a/vnet/etc/scripts/tf-ucs-1 b/src/scripts/vnet/tf-ucs-1 similarity index 100% rename from vnet/etc/scripts/tf-ucs-1 rename to src/scripts/vnet/tf-ucs-1 diff --git a/vnet/etc/scripts/urpf b/src/scripts/vnet/urpf similarity index 100% rename from vnet/etc/scripts/urpf rename to src/scripts/vnet/urpf diff --git a/vnet/etc/scripts/virl/ip6sr.virl b/src/scripts/vnet/virl/ip6sr.virl similarity index 100% rename from vnet/etc/scripts/virl/ip6sr.virl rename to src/scripts/vnet/virl/ip6sr.virl diff --git a/vnet/etc/scripts/virl/ip6sr_notes.txt b/src/scripts/vnet/virl/ip6sr_notes.txt similarity index 100% rename from vnet/etc/scripts/virl/ip6sr_notes.txt rename to src/scripts/vnet/virl/ip6sr_notes.txt diff --git a/vnet/etc/scripts/virl/mplsogre.virl b/src/scripts/vnet/virl/mplsogre.virl similarity index 100% rename from vnet/etc/scripts/virl/mplsogre.virl rename to src/scripts/vnet/virl/mplsogre.virl diff --git a/vnet/etc/scripts/virl/simple.virl b/src/scripts/vnet/virl/simple.virl similarity index 100% rename from vnet/etc/scripts/virl/simple.virl rename to src/scripts/vnet/virl/simple.virl diff --git a/vnet/etc/scripts/vlan b/src/scripts/vnet/vlan similarity index 100% rename from vnet/etc/scripts/vlan rename to src/scripts/vnet/vlan diff --git a/vpp-api-test/scripts/vppctl b/src/scripts/vppctl similarity index 100% rename from vpp-api-test/scripts/vppctl rename to src/scripts/vppctl diff --git a/build-data/suffix-rules.mk b/src/suffix-rules.mk similarity index 100% rename from build-data/suffix-rules.mk rename to src/suffix-rules.mk diff --git a/svm/Makefile.am b/src/svm.am similarity index 57% rename from svm/Makefile.am rename to src/svm.am index 490e27b33a6..d91eaa272a2 100644 --- a/svm/Makefile.am +++ b/src/svm.am @@ -11,20 +11,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign +bin_PROGRAMS += svmtool svmdbtool -bin_PROGRAMS = svmtool svmdbtool +nobase_include_HEADERS += svm/svm.h svm/ssvm.h svm/svmdb.h -AM_CFLAGS = -Wall +libsvmdir = ${libdir} +libsvm_LTLIBRARIES = libsvm.la libsvmdb.la -nobase_include_HEADERS = svm.h ssvm.h svmdb.h +libsvm_la_SOURCES = svm/svm.c svm/ssvm.c -lib_LTLIBRARIES = libsvm.la libsvmdb.la +svmtool_SOURCES = svm/svmtool.c +svmtool_LDADD = libsvm.la libvppinfra.la -lpthread -lrt -libsvm_la_SOURCES = svm.c ssvm.c +libsvmdb_la_SOURCES = svm/svmdb.c -svmtool_LDADD = libsvm.la -lvppinfra -lpthread -lrt +svmdbtool_SOURCES = svm/svmdbtool.c +svmdbtool_LDADD = libsvmdb.la libsvm.la libvppinfra.la -lpthread -lrt -libsvmdb_la_SOURCES = svmdb.c - -svmdbtool_LDADD = libsvmdb.la libsvm.la -lvppinfra -lpthread -lrt +# vi:syntax=automake diff --git a/svm/dir.dox b/src/svm/dir.dox similarity index 100% rename from svm/dir.dox rename to src/svm/dir.dox diff --git a/svm/persist.c b/src/svm/persist.c similarity index 100% rename from svm/persist.c rename to src/svm/persist.c diff --git a/svm/ssvm.c b/src/svm/ssvm.c similarity index 100% rename from svm/ssvm.c rename to src/svm/ssvm.c diff --git a/svm/ssvm.h b/src/svm/ssvm.h similarity index 100% rename from svm/ssvm.h rename to src/svm/ssvm.h diff --git a/svm/svm.c b/src/svm/svm.c similarity index 100% rename from svm/svm.c rename to src/svm/svm.c diff --git a/svm/svm.h b/src/svm/svm.h similarity index 100% rename from svm/svm.h rename to src/svm/svm.h diff --git a/svm/svm_test.c b/src/svm/svm_test.c similarity index 100% rename from svm/svm_test.c rename to src/svm/svm_test.c diff --git a/svm/svmdb.c b/src/svm/svmdb.c similarity index 100% rename from svm/svmdb.c rename to src/svm/svmdb.c diff --git a/svm/svmdb.h b/src/svm/svmdb.h similarity index 100% rename from svm/svmdb.h rename to src/svm/svmdb.h diff --git a/svm/svmdbtool.c b/src/svm/svmdbtool.c similarity index 100% rename from svm/svmdbtool.c rename to src/svm/svmdbtool.c diff --git a/svm/svmtool.c b/src/svm/svmtool.c similarity index 100% rename from svm/svmtool.c rename to src/svm/svmtool.c diff --git a/vnet/test/README b/src/tests/vnet/README similarity index 100% rename from vnet/test/README rename to src/tests/vnet/README diff --git a/vnet/test/lisp-cp/test_cp_serdes.c b/src/tests/vnet/lisp-cp/test_cp_serdes.c similarity index 99% rename from vnet/test/lisp-cp/test_cp_serdes.c rename to src/tests/vnet/lisp-cp/test_cp_serdes.c index 5343d0e47dc..9d51dc8fa51 100644 --- a/vnet/test/lisp-cp/test_cp_serdes.c +++ b/src/tests/vnet/lisp-cp/test_cp_serdes.c @@ -21,6 +21,10 @@ #include #include +/* FIXME */ +#include +vpe_api_main_t vpe_api_main; + #define _assert(e) \ error = CLIB_ERROR_ASSERT (e); \ if (error) \ diff --git a/vnet/test/lisp-cp/test_lisp_types.c b/src/tests/vnet/lisp-cp/test_lisp_types.c similarity index 99% rename from vnet/test/lisp-cp/test_lisp_types.c rename to src/tests/vnet/lisp-cp/test_lisp_types.c index 8aa9d41824d..5d910f6669b 100644 --- a/vnet/test/lisp-cp/test_lisp_types.c +++ b/src/tests/vnet/lisp-cp/test_lisp_types.c @@ -18,6 +18,10 @@ #include #include +/* FIXME */ +#include +vpe_api_main_t vpe_api_main; + #define _assert(e) \ error = CLIB_ERROR_ASSERT (e); \ if (error) \ diff --git a/vnet/test/lisp-gpe/test.c b/src/tests/vnet/lisp-gpe/test.c similarity index 100% rename from vnet/test/lisp-gpe/test.c rename to src/tests/vnet/lisp-gpe/test.c diff --git a/vppinfra/tools/dir.dox b/src/tools/elftool/dir.dox similarity index 100% rename from vppinfra/tools/dir.dox rename to src/tools/elftool/dir.dox diff --git a/vppinfra/tools/elftool.c b/src/tools/elftool/elftool.c similarity index 100% rename from vppinfra/tools/elftool.c rename to src/tools/elftool/elftool.c diff --git a/g2/clib.c b/src/tools/g2/clib.c similarity index 98% rename from g2/clib.c rename to src/tools/g2/clib.c index d0cd6195a5f..6454c84d42d 100644 --- a/g2/clib.c +++ b/src/tools/g2/clib.c @@ -107,7 +107,7 @@ int read_clib_file(char *clib_file) } vec_add2(bound_tracks, btp, 1); btp->track = track_code; - btp->track_str = t->name; + btp->track_str = (u8 *) t->name; hash_set(the_trackdef_hash, track_code, btp - bound_tracks); track_strlen = strlen((char *)btp->track_str); diff --git a/g2/configure.ac b/src/tools/g2/configure.ac similarity index 100% rename from g2/configure.ac rename to src/tools/g2/configure.ac diff --git a/g2/cpel.c b/src/tools/g2/cpel.c similarity index 100% rename from g2/cpel.c rename to src/tools/g2/cpel.c diff --git a/g2/cpel.h b/src/tools/g2/cpel.h similarity index 100% rename from g2/cpel.h rename to src/tools/g2/cpel.h diff --git a/g2/events.c b/src/tools/g2/events.c similarity index 100% rename from g2/events.c rename to src/tools/g2/events.c diff --git a/g2/g2.h b/src/tools/g2/g2.h similarity index 100% rename from g2/g2.h rename to src/tools/g2/g2.h diff --git a/g2/g2version.c b/src/tools/g2/g2version.c similarity index 100% rename from g2/g2version.c rename to src/tools/g2/g2version.c diff --git a/g2/main.c b/src/tools/g2/main.c similarity index 100% rename from g2/main.c rename to src/tools/g2/main.c diff --git a/g2/menu1.c b/src/tools/g2/menu1.c similarity index 100% rename from g2/menu1.c rename to src/tools/g2/menu1.c diff --git a/g2/mkversion.c b/src/tools/g2/mkversion.c similarity index 100% rename from g2/mkversion.c rename to src/tools/g2/mkversion.c diff --git a/g2/pointsel.c b/src/tools/g2/pointsel.c similarity index 100% rename from g2/pointsel.c rename to src/tools/g2/pointsel.c diff --git a/g2/props.c b/src/tools/g2/props.c similarity index 100% rename from g2/props.c rename to src/tools/g2/props.c diff --git a/g2/props.h b/src/tools/g2/props.h similarity index 100% rename from g2/props.h rename to src/tools/g2/props.h diff --git a/g2/view1.c b/src/tools/g2/view1.c similarity index 100% rename from g2/view1.c rename to src/tools/g2/view1.c diff --git a/perftool/c2cpel.c b/src/tools/perftool/c2cpel.c similarity index 100% rename from perftool/c2cpel.c rename to src/tools/perftool/c2cpel.c diff --git a/perftool/configure.ac b/src/tools/perftool/configure.ac similarity index 100% rename from perftool/configure.ac rename to src/tools/perftool/configure.ac diff --git a/perftool/cpel.h b/src/tools/perftool/cpel.h similarity index 100% rename from perftool/cpel.h rename to src/tools/perftool/cpel.h diff --git a/perftool/cpel_util.c b/src/tools/perftool/cpel_util.c similarity index 100% rename from perftool/cpel_util.c rename to src/tools/perftool/cpel_util.c diff --git a/perftool/cpel_util.h b/src/tools/perftool/cpel_util.h similarity index 100% rename from perftool/cpel_util.h rename to src/tools/perftool/cpel_util.h diff --git a/perftool/cpelatency.c b/src/tools/perftool/cpelatency.c similarity index 99% rename from perftool/cpelatency.c rename to src/tools/perftool/cpelatency.c index f40a1fb1c84..7b87d606cda 100644 --- a/perftool/cpelatency.c +++ b/src/tools/perftool/cpelatency.c @@ -618,7 +618,7 @@ int track_compare_name (const void *arg1, const void *arg2) void sort_state_statistics(sort_t type, FILE *ofp) { - int (*compare)(const void *, const void *); + int (*compare)(const void *, const void *) = 0; if (summary_stats_only) return; diff --git a/perftool/cpeldump.c b/src/tools/perftool/cpeldump.c similarity index 100% rename from perftool/cpeldump.c rename to src/tools/perftool/cpeldump.c diff --git a/perftool/cpelinreg.c b/src/tools/perftool/cpelinreg.c similarity index 100% rename from perftool/cpelinreg.c rename to src/tools/perftool/cpelinreg.c diff --git a/perftool/cpelstate.c b/src/tools/perftool/cpelstate.c similarity index 100% rename from perftool/cpelstate.c rename to src/tools/perftool/cpelstate.c diff --git a/perftool/delsvec.c b/src/tools/perftool/delsvec.c similarity index 100% rename from perftool/delsvec.c rename to src/tools/perftool/delsvec.c diff --git a/perftool/linreg.c b/src/tools/perftool/linreg.c similarity index 100% rename from perftool/linreg.c rename to src/tools/perftool/linreg.c diff --git a/perftool/new.cpel b/src/tools/perftool/new.cpel similarity index 100% rename from perftool/new.cpel rename to src/tools/perftool/new.cpel diff --git a/perftool/new.elog b/src/tools/perftool/new.elog similarity index 100% rename from perftool/new.elog rename to src/tools/perftool/new.elog diff --git a/perftool/props.c b/src/tools/perftool/props.c similarity index 100% rename from perftool/props.c rename to src/tools/perftool/props.c diff --git a/vppapigen/configure.ac b/src/tools/vppapigen/configure.ac similarity index 100% rename from vppapigen/configure.ac rename to src/tools/vppapigen/configure.ac diff --git a/vppapigen/gram.y b/src/tools/vppapigen/gram.y similarity index 100% rename from vppapigen/gram.y rename to src/tools/vppapigen/gram.y diff --git a/vppapigen/lex.c b/src/tools/vppapigen/lex.c similarity index 99% rename from vppapigen/lex.c rename to src/tools/vppapigen/lex.c index e807d46b9a0..733942add8d 100644 --- a/vppapigen/lex.c +++ b/src/tools/vppapigen/lex.c @@ -26,7 +26,7 @@ #include "lex.h" #include "node.h" -#include "gram.h" +#include "tools/vppapigen/gram.h" FILE *ifp, *ofp, *pythonfp, *jsonfp; char *vlib_app_name = "vpp"; diff --git a/vppapigen/lex.h b/src/tools/vppapigen/lex.h similarity index 97% rename from vppapigen/lex.h rename to src/tools/vppapigen/lex.h index e9b0954c0b9..a0fdc735b74 100644 --- a/vppapigen/lex.h +++ b/src/tools/vppapigen/lex.h @@ -29,7 +29,7 @@ extern int yyparse (void); #define YYSTYPE void * #endif -#include "gram.h" +#include "tools/vppapigen/gram.h" enum lex_state { START_STATE = 1, diff --git a/vppapigen/node.c b/src/tools/vppapigen/node.c similarity index 99% rename from vppapigen/node.c rename to src/tools/vppapigen/node.c index abb909a1703..260c6f2ef7b 100644 --- a/vppapigen/node.c +++ b/src/tools/vppapigen/node.c @@ -344,7 +344,7 @@ void node_define_print (node_t *this) void node_define_generate (node_t *this, enum passid which, FILE *fp) { - node_t *child, *save_child; + node_t *child; switch(which) { case TYPEDEF_PASS: @@ -945,10 +945,6 @@ YYSTYPE add_defbody (YYSTYPE a1, YYSTYPE a2) YYSTYPE add_primtype (YYSTYPE a1, YYSTYPE a2, YYSTYPE a3) { - node_t *np1; - - np1 = (node_t *)a1; - /* Hook instance to type node */ deeper (a1, a2); if (a3) { diff --git a/vppapigen/node.h b/src/tools/vppapigen/node.h similarity index 100% rename from vppapigen/node.h rename to src/tools/vppapigen/node.h diff --git a/vpp-api-test/vat/api_format.c b/src/vat/api_format.c similarity index 99% rename from vpp-api-test/vat/api_format.c rename to src/vat/api_format.c index a864ab23539..e6c0f244d83 100644 --- a/vpp-api-test/vat/api_format.c +++ b/src/vat/api_format.c @@ -17,7 +17,7 @@ *------------------------------------------------------------------ */ -#include "vat.h" +#include #include #include #include @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -49,23 +49,25 @@ #include #include +#include "vat/json_format.h" + #include #include #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs /* declare message handlers for each api */ #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun static uword diff --git a/vpp-api-test/vat/json_format.c b/src/vat/json_format.c similarity index 100% rename from vpp-api-test/vat/json_format.c rename to src/vat/json_format.c diff --git a/vpp-api-test/vat/json_format.h b/src/vat/json_format.h similarity index 100% rename from vpp-api-test/vat/json_format.h rename to src/vat/json_format.h diff --git a/vpp-api-test/vat/json_test.c b/src/vat/json_test.c similarity index 100% rename from vpp-api-test/vat/json_test.c rename to src/vat/json_test.c diff --git a/vpp-api-test/vat/main.c b/src/vat/main.c similarity index 99% rename from vpp-api-test/vat/main.c rename to src/vat/main.c index 34492e2ba1a..e01d15ec026 100644 --- a/vpp-api-test/vat/main.c +++ b/src/vat/main.c @@ -18,6 +18,9 @@ vat_main_t vat_main; +#include +vpe_api_main_t vpe_api_main; + void vat_suspend (vlib_main_t * vm, f64 interval) { diff --git a/vpp-api-test/vat/plugin.c b/src/vat/plugin.c similarity index 100% rename from vpp-api-test/vat/plugin.c rename to src/vat/plugin.c diff --git a/vpp-api-test/vat/plugin.h b/src/vat/plugin.h similarity index 100% rename from vpp-api-test/vat/plugin.h rename to src/vat/plugin.h diff --git a/vpp-api-test/vat/plugin_api.c b/src/vat/plugin_api.c similarity index 100% rename from vpp-api-test/vat/plugin_api.c rename to src/vat/plugin_api.c diff --git a/vpp-api-test/vat/restart.c b/src/vat/restart.c similarity index 99% rename from vpp-api-test/vat/restart.c rename to src/vat/restart.c index adc63f848c0..adeee000680 100644 --- a/vpp-api-test/vat/restart.c +++ b/src/vat/restart.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vpp-api-test/vat/vat.h b/src/vat/vat.h similarity index 99% rename from vpp-api-test/vat/vat.h rename to src/vat/vat.h index 01f755132dc..64be2f7f97f 100644 --- a/vpp-api-test/vat/vat.h +++ b/src/vat/vat.h @@ -28,7 +28,7 @@ #include #include -#include "json_format.h" +#include "vat/json_format.h" #include diff --git a/vlib-api/Makefile.am b/src/vlib-api.am similarity index 73% rename from vlib-api/Makefile.am rename to src/vlib-api.am index d9f4a27b762..80eb760d108 100644 --- a/vlib-api/Makefile.am +++ b/src/vlib-api.am @@ -11,12 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall - -lib_LTLIBRARIES = libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \ - libvlibsocket.la +lib_LTLIBRARIES += libvlibapi.la libvlibmemory.la libvlibmemoryclient.la \ + libvlibsocket.la libvlibapi_la_SOURCES = \ vlibapi/api.h \ @@ -24,7 +20,7 @@ libvlibapi_la_SOURCES = \ vlibapi/api_shared.c \ vlibapi/node_serialize.c -nobase_include_HEADERS = vlibapi/api.h vlibapi/api_helper_macros.h +nobase_include_HEADERS += vlibapi/api.h vlibapi/api_helper_macros.h libvlibmemory_la_SOURCES = \ vlibmemory/api.h \ @@ -34,7 +30,7 @@ libvlibmemory_la_SOURCES = \ vlibmemory/vl_memory_api_h.h \ vlibmemory/vl_memory_msg_enum.h \ vlibmemory/unix_shared_memory_queue.c \ - vlibmemory/unix_shared_memory_queue.h + vlibmemory/unix_shared_memory_queue.h libvlibmemoryclient_la_SOURCES = \ vlibmemory/api.h \ @@ -44,7 +40,7 @@ libvlibmemoryclient_la_SOURCES = \ vlibmemory/vl_memory_api_h.h \ vlibmemory/vl_memory_msg_enum.h \ vlibmemory/unix_shared_memory_queue.c \ - vlibmemory/unix_shared_memory_queue.h + vlibmemory/unix_shared_memory_queue.h nobase_include_HEADERS += \ vlibmemory/api.h \ @@ -67,18 +63,11 @@ nobase_include_HEADERS += \ vlibsocket/vl_socket_msg_enum.h \ vlibsocket/sockclnt.api.h -BUILT_SOURCES = \ +BUILT_SOURCES += \ vlibsocket/sockclnt.api.h \ vlibmemory/memclnt.api.h \ vlibmemory/memclnt.api.json -SUFFIXES = .api.h .api .api.json - -# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk -# and requires a symbolic link at the top of the vnet source tree - -include $(top_srcdir)/suffix-rules.mk +API_FILES += vlibmemory/memclnt.api -# install the API definition, so we can produce java bindings, etc. -apidir = $(prefix)/vlibmemory -api_DATA = vlibmemory/memclnt.api.json +# vi:syntax=automake diff --git a/vlib/Makefile.am b/src/vlib.am similarity index 84% rename from vlib/Makefile.am rename to src/vlib.am index 3da0a3abbbb..2464076fcaf 100644 --- a/vlib/Makefile.am +++ b/src/vlib.am @@ -11,18 +11,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall @DPDK@ +libvlibdir = ${libdir} +libvlib_LTLIBRARIES = libvlib.la +libvlib_la_LIBAD = libvppinfra.la -PRE_DATA_SIZE=@PRE_DATA_SIZE@ - -lib_LTLIBRARIES = libvlib.la - -BUILT_SOURCES = vlib/config.h +BUILT_SOURCES += vlib/config.h vlib/config.h: - echo "#define __PRE_DATA_SIZE" $(PRE_DATA_SIZE) > $@ + echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@ libvlib_la_SOURCES = \ vlib/buffer.c \ @@ -45,7 +42,7 @@ libvlib_la_SOURCES = \ vlib/threads_cli.c \ vlib/trace.c -nobase_include_HEADERS = \ +nobase_include_HEADERS += \ vlib/buffer_funcs.h \ vlib/buffer_node.h \ vlib/buffer.h \ @@ -72,7 +69,7 @@ nobase_include_HEADERS = \ vlib/trace.h \ vlib/vlib.h -lib_LTLIBRARIES += libvlib_unix.la +libvlib_LTLIBRARIES += libvlib_unix.la libvlib_unix_la_SOURCES = \ vlib/unix/cj.c \ @@ -93,12 +90,14 @@ nobase_include_HEADERS += \ vlib/unix/unix.h if !WITH_DPDK -noinst_PROGRAMS = vlib_unix +noinst_PROGRAMS += vlib_unix vlib_unix_SOURCES = \ - example/main_stub.c \ - example/mc_test.c + examples/vlib/main_stub.c \ + examples/vlib/mc_test.c vlib_unix_LDADD = libvlib_unix.la libvlib.la \ - -lvppinfra -lpthread -lm -ldl -lrt + libvppinfra.la -lpthread -lm -ldl -lrt endif + +# vi:syntax=automake diff --git a/vlib/vlib/buffer.c b/src/vlib/buffer.c similarity index 100% rename from vlib/vlib/buffer.c rename to src/vlib/buffer.c diff --git a/vlib/vlib/buffer.h b/src/vlib/buffer.h similarity index 100% rename from vlib/vlib/buffer.h rename to src/vlib/buffer.h diff --git a/vlib/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h similarity index 100% rename from vlib/vlib/buffer_funcs.h rename to src/vlib/buffer_funcs.h diff --git a/vlib/vlib/buffer_node.h b/src/vlib/buffer_node.h similarity index 100% rename from vlib/vlib/buffer_node.h rename to src/vlib/buffer_node.h diff --git a/vlib/vlib/cli.c b/src/vlib/cli.c similarity index 100% rename from vlib/vlib/cli.c rename to src/vlib/cli.c diff --git a/vlib/vlib/cli.h b/src/vlib/cli.h similarity index 100% rename from vlib/vlib/cli.h rename to src/vlib/cli.h diff --git a/vlib/vlib/cli_funcs.h b/src/vlib/cli_funcs.h similarity index 100% rename from vlib/vlib/cli_funcs.h rename to src/vlib/cli_funcs.h diff --git a/vlib/vlib/counter.c b/src/vlib/counter.c similarity index 100% rename from vlib/vlib/counter.c rename to src/vlib/counter.c diff --git a/vlib/vlib/counter.h b/src/vlib/counter.h similarity index 100% rename from vlib/vlib/counter.h rename to src/vlib/counter.h diff --git a/vlib/vlib/defs.h b/src/vlib/defs.h similarity index 100% rename from vlib/vlib/defs.h rename to src/vlib/defs.h diff --git a/vlib/vlib/dir.dox b/src/vlib/dir.dox similarity index 100% rename from vlib/vlib/dir.dox rename to src/vlib/dir.dox diff --git a/vlib/vlib/elog_samples.c b/src/vlib/elog_samples.c similarity index 100% rename from vlib/vlib/elog_samples.c rename to src/vlib/elog_samples.c diff --git a/vlib/vlib/error.c b/src/vlib/error.c similarity index 100% rename from vlib/vlib/error.c rename to src/vlib/error.c diff --git a/vlib/vlib/error.h b/src/vlib/error.h similarity index 100% rename from vlib/vlib/error.h rename to src/vlib/error.h diff --git a/vlib/vlib/error_funcs.h b/src/vlib/error_funcs.h similarity index 100% rename from vlib/vlib/error_funcs.h rename to src/vlib/error_funcs.h diff --git a/vlib/vlib/format.c b/src/vlib/format.c similarity index 100% rename from vlib/vlib/format.c rename to src/vlib/format.c diff --git a/vlib/vlib/format_funcs.h b/src/vlib/format_funcs.h similarity index 100% rename from vlib/vlib/format_funcs.h rename to src/vlib/format_funcs.h diff --git a/vlib/vlib/global_funcs.h b/src/vlib/global_funcs.h similarity index 100% rename from vlib/vlib/global_funcs.h rename to src/vlib/global_funcs.h diff --git a/vlib/vlib/i2c.c b/src/vlib/i2c.c similarity index 100% rename from vlib/vlib/i2c.c rename to src/vlib/i2c.c diff --git a/vlib/vlib/i2c.h b/src/vlib/i2c.h similarity index 100% rename from vlib/vlib/i2c.h rename to src/vlib/i2c.h diff --git a/vlib/vlib/init.c b/src/vlib/init.c similarity index 100% rename from vlib/vlib/init.c rename to src/vlib/init.c diff --git a/vlib/vlib/init.h b/src/vlib/init.h similarity index 100% rename from vlib/vlib/init.h rename to src/vlib/init.h diff --git a/vlib/vlib/lex.c b/src/vlib/lex.c similarity index 100% rename from vlib/vlib/lex.c rename to src/vlib/lex.c diff --git a/vlib/vlib/lex.h b/src/vlib/lex.h similarity index 100% rename from vlib/vlib/lex.h rename to src/vlib/lex.h diff --git a/vlib/vlib/main.c b/src/vlib/main.c similarity index 100% rename from vlib/vlib/main.c rename to src/vlib/main.c diff --git a/vlib/vlib/main.h b/src/vlib/main.h similarity index 100% rename from vlib/vlib/main.h rename to src/vlib/main.h diff --git a/vlib/vlib/mc.c b/src/vlib/mc.c similarity index 100% rename from vlib/vlib/mc.c rename to src/vlib/mc.c diff --git a/vlib/vlib/mc.h b/src/vlib/mc.h similarity index 100% rename from vlib/vlib/mc.h rename to src/vlib/mc.h diff --git a/vlib/vlib/node.c b/src/vlib/node.c similarity index 100% rename from vlib/vlib/node.c rename to src/vlib/node.c diff --git a/vlib/vlib/node.h b/src/vlib/node.h similarity index 100% rename from vlib/vlib/node.h rename to src/vlib/node.h diff --git a/vlib/vlib/node_cli.c b/src/vlib/node_cli.c similarity index 100% rename from vlib/vlib/node_cli.c rename to src/vlib/node_cli.c diff --git a/vlib/vlib/node_format.c b/src/vlib/node_format.c similarity index 100% rename from vlib/vlib/node_format.c rename to src/vlib/node_format.c diff --git a/vlib/vlib/node_funcs.h b/src/vlib/node_funcs.h similarity index 100% rename from vlib/vlib/node_funcs.h rename to src/vlib/node_funcs.h diff --git a/vlib/vlib/parse.c b/src/vlib/parse.c similarity index 100% rename from vlib/vlib/parse.c rename to src/vlib/parse.c diff --git a/vlib/vlib/parse.h b/src/vlib/parse.h similarity index 100% rename from vlib/vlib/parse.h rename to src/vlib/parse.h diff --git a/vlib/vlib/parse_builtin.c b/src/vlib/parse_builtin.c similarity index 100% rename from vlib/vlib/parse_builtin.c rename to src/vlib/parse_builtin.c diff --git a/vlib/vlib/pci/linux_pci.c b/src/vlib/pci/linux_pci.c similarity index 100% rename from vlib/vlib/pci/linux_pci.c rename to src/vlib/pci/linux_pci.c diff --git a/vlib/vlib/pci/pci.c b/src/vlib/pci/pci.c similarity index 100% rename from vlib/vlib/pci/pci.c rename to src/vlib/pci/pci.c diff --git a/vlib/vlib/pci/pci.h b/src/vlib/pci/pci.h similarity index 100% rename from vlib/vlib/pci/pci.h rename to src/vlib/pci/pci.h diff --git a/vlib/vlib/pci/pci_config.h b/src/vlib/pci/pci_config.h similarity index 100% rename from vlib/vlib/pci/pci_config.h rename to src/vlib/pci/pci_config.h diff --git a/vlib/vlib/physmem.h b/src/vlib/physmem.h similarity index 100% rename from vlib/vlib/physmem.h rename to src/vlib/physmem.h diff --git a/vlib/vlib/threads.c b/src/vlib/threads.c similarity index 100% rename from vlib/vlib/threads.c rename to src/vlib/threads.c diff --git a/vlib/vlib/threads.h b/src/vlib/threads.h similarity index 100% rename from vlib/vlib/threads.h rename to src/vlib/threads.h diff --git a/vlib/vlib/threads_cli.c b/src/vlib/threads_cli.c similarity index 100% rename from vlib/vlib/threads_cli.c rename to src/vlib/threads_cli.c diff --git a/vlib/vlib/trace.c b/src/vlib/trace.c similarity index 100% rename from vlib/vlib/trace.c rename to src/vlib/trace.c diff --git a/vlib/vlib/trace.h b/src/vlib/trace.h similarity index 100% rename from vlib/vlib/trace.h rename to src/vlib/trace.h diff --git a/vlib/vlib/trace_funcs.h b/src/vlib/trace_funcs.h similarity index 100% rename from vlib/vlib/trace_funcs.h rename to src/vlib/trace_funcs.h diff --git a/vlib/vlib/unix/cj.c b/src/vlib/unix/cj.c similarity index 100% rename from vlib/vlib/unix/cj.c rename to src/vlib/unix/cj.c diff --git a/vlib/vlib/unix/cj.h b/src/vlib/unix/cj.h similarity index 100% rename from vlib/vlib/unix/cj.h rename to src/vlib/unix/cj.h diff --git a/vlib/vlib/unix/cli.c b/src/vlib/unix/cli.c similarity index 100% rename from vlib/vlib/unix/cli.c rename to src/vlib/unix/cli.c diff --git a/vlib/vlib/unix/dir.dox b/src/vlib/unix/dir.dox similarity index 100% rename from vlib/vlib/unix/dir.dox rename to src/vlib/unix/dir.dox diff --git a/vlib/vlib/unix/input.c b/src/vlib/unix/input.c similarity index 100% rename from vlib/vlib/unix/input.c rename to src/vlib/unix/input.c diff --git a/vlib/vlib/unix/main.c b/src/vlib/unix/main.c similarity index 100% rename from vlib/vlib/unix/main.c rename to src/vlib/unix/main.c diff --git a/vlib/vlib/unix/mc_socket.c b/src/vlib/unix/mc_socket.c similarity index 100% rename from vlib/vlib/unix/mc_socket.c rename to src/vlib/unix/mc_socket.c diff --git a/vlib/vlib/unix/mc_socket.h b/src/vlib/unix/mc_socket.h similarity index 100% rename from vlib/vlib/unix/mc_socket.h rename to src/vlib/unix/mc_socket.h diff --git a/vlib/vlib/unix/physmem.c b/src/vlib/unix/physmem.c similarity index 100% rename from vlib/vlib/unix/physmem.c rename to src/vlib/unix/physmem.c diff --git a/vlib/vlib/unix/physmem.h b/src/vlib/unix/physmem.h similarity index 100% rename from vlib/vlib/unix/physmem.h rename to src/vlib/unix/physmem.h diff --git a/vlib/vlib/unix/plugin.c b/src/vlib/unix/plugin.c similarity index 100% rename from vlib/vlib/unix/plugin.c rename to src/vlib/unix/plugin.c diff --git a/vlib/vlib/unix/plugin.h b/src/vlib/unix/plugin.h similarity index 100% rename from vlib/vlib/unix/plugin.h rename to src/vlib/unix/plugin.h diff --git a/vlib/vlib/unix/unix.h b/src/vlib/unix/unix.h similarity index 100% rename from vlib/vlib/unix/unix.h rename to src/vlib/unix/unix.h diff --git a/vlib/vlib/unix/util.c b/src/vlib/unix/util.c similarity index 100% rename from vlib/vlib/unix/util.c rename to src/vlib/unix/util.c diff --git a/vlib/vlib/vlib.h b/src/vlib/vlib.h similarity index 100% rename from vlib/vlib/vlib.h rename to src/vlib/vlib.h diff --git a/vlib/vlib/vlib_process_doc.h b/src/vlib/vlib_process_doc.h similarity index 100% rename from vlib/vlib/vlib_process_doc.h rename to src/vlib/vlib_process_doc.h diff --git a/vlib-api/vlibapi/api.h b/src/vlibapi/api.h similarity index 99% rename from vlib-api/vlibapi/api.h rename to src/vlibapi/api.h index 6274533580b..970a0ee0157 100644 --- a/vlib-api/vlibapi/api.h +++ b/src/vlibapi/api.h @@ -21,7 +21,7 @@ #define included_api_h #include -#include +#include #include #include #include diff --git a/vlib-api/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h similarity index 100% rename from vlib-api/vlibapi/api_helper_macros.h rename to src/vlibapi/api_helper_macros.h diff --git a/vlib-api/vlibapi/api_shared.c b/src/vlibapi/api_shared.c similarity index 100% rename from vlib-api/vlibapi/api_shared.c rename to src/vlibapi/api_shared.c diff --git a/vlib-api/vlibapi/node_serialize.c b/src/vlibapi/node_serialize.c similarity index 100% rename from vlib-api/vlibapi/node_serialize.c rename to src/vlibapi/node_serialize.c diff --git a/vlib-api/vlibmemory/api.h b/src/vlibmemory/api.h similarity index 99% rename from vlib-api/vlibmemory/api.h rename to src/vlibmemory/api.h index f1f8bb736b0..54a0a0011fd 100644 --- a/vlib-api/vlibmemory/api.h +++ b/src/vlibmemory/api.h @@ -21,7 +21,7 @@ #define included_vlibmemory_api_h #include -#include +#include #include #include #include diff --git a/vlib-api/vlibmemory/memclnt.api b/src/vlibmemory/memclnt.api similarity index 100% rename from vlib-api/vlibmemory/memclnt.api rename to src/vlibmemory/memclnt.api diff --git a/vlib-api/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c similarity index 100% rename from vlib-api/vlibmemory/memory_client.c rename to src/vlibmemory/memory_client.c diff --git a/vlib-api/vlibmemory/memory_shared.c b/src/vlibmemory/memory_shared.c similarity index 100% rename from vlib-api/vlibmemory/memory_shared.c rename to src/vlibmemory/memory_shared.c diff --git a/vlib-api/vlibmemory/memory_vlib.c b/src/vlibmemory/memory_vlib.c similarity index 100% rename from vlib-api/vlibmemory/memory_vlib.c rename to src/vlibmemory/memory_vlib.c diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.c b/src/vlibmemory/unix_shared_memory_queue.c similarity index 100% rename from vlib-api/vlibmemory/unix_shared_memory_queue.c rename to src/vlibmemory/unix_shared_memory_queue.c diff --git a/vlib-api/vlibmemory/unix_shared_memory_queue.h b/src/vlibmemory/unix_shared_memory_queue.h similarity index 100% rename from vlib-api/vlibmemory/unix_shared_memory_queue.h rename to src/vlibmemory/unix_shared_memory_queue.h diff --git a/vlib-api/vlibmemory/vl_memory_api_h.h b/src/vlibmemory/vl_memory_api_h.h similarity index 100% rename from vlib-api/vlibmemory/vl_memory_api_h.h rename to src/vlibmemory/vl_memory_api_h.h diff --git a/vlib-api/vlibmemory/vl_memory_msg_enum.h b/src/vlibmemory/vl_memory_msg_enum.h similarity index 100% rename from vlib-api/vlibmemory/vl_memory_msg_enum.h rename to src/vlibmemory/vl_memory_msg_enum.h diff --git a/vlib-api/vlibsocket/api.h b/src/vlibsocket/api.h similarity index 100% rename from vlib-api/vlibsocket/api.h rename to src/vlibsocket/api.h diff --git a/vlib-api/vlibsocket/sock_test.c b/src/vlibsocket/sock_test.c similarity index 100% rename from vlib-api/vlibsocket/sock_test.c rename to src/vlibsocket/sock_test.c diff --git a/vlib-api/vlibsocket/sockclnt.api b/src/vlibsocket/sockclnt.api similarity index 100% rename from vlib-api/vlibsocket/sockclnt.api rename to src/vlibsocket/sockclnt.api diff --git a/vlib-api/vlibsocket/sockclnt_vlib.c b/src/vlibsocket/sockclnt_vlib.c similarity index 100% rename from vlib-api/vlibsocket/sockclnt_vlib.c rename to src/vlibsocket/sockclnt_vlib.c diff --git a/vlib-api/vlibsocket/socksvr_vlib.c b/src/vlibsocket/socksvr_vlib.c similarity index 100% rename from vlib-api/vlibsocket/socksvr_vlib.c rename to src/vlibsocket/socksvr_vlib.c diff --git a/vlib-api/vlibsocket/vl_socket_api_h.h b/src/vlibsocket/vl_socket_api_h.h similarity index 100% rename from vlib-api/vlibsocket/vl_socket_api_h.h rename to src/vlibsocket/vl_socket_api_h.h diff --git a/vlib-api/vlibsocket/vl_socket_msg_enum.h b/src/vlibsocket/vl_socket_msg_enum.h similarity index 100% rename from vlib-api/vlibsocket/vl_socket_msg_enum.h rename to src/vlibsocket/vl_socket_msg_enum.h diff --git a/vnet/Makefile.am b/src/vnet.am similarity index 94% rename from vnet/Makefile.am rename to src/vnet.am index adc9043a328..032334874d5 100644 --- a/vnet/Makefile.am +++ b/src/vnet.am @@ -11,22 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@ - -API_FILES = - libvnet_la_SOURCES = libvnetplugin_la_SOURCES = -nobase_include_HEADERS = -noinst_PROGRAMS = -TESTS = -dpdk_libs = -if WITH_DPDK -dpdk_libs += -l:libdpdk.a -endif +libvnet_la_LIBAD = libvppinfra.la libvlib.la libsvm.la ######################################## # Generic stuff @@ -451,7 +439,7 @@ test_map_SOURCES = \ vnet/map/test.c test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG -test_map_LDADD = libvnet.la -lvppinfra -lvlib \ +test_map_LDADD = libvnet.la libvppinfra.la libvlib.la \ -lpthread -lvlibmemory -lvlibapi -lvlib_unix \ -ldl -lsvm -lrt @@ -574,30 +562,37 @@ nobase_include_HEADERS += \ API_FILES += vnet/lisp-cp/lisp.api if ENABLE_TESTS -LDS = -lvppinfra -l:libvlib.a $(dpdk_libs) -l:libvlibmemory.a \ - -l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a +LDS = \ + libvppinfra.la \ + libvnet.la \ + libvlib.la \ + libvlib_unix.la \ + libsvm.la \ + libsvmdb.la \ + libvlibapi.la \ + libvlibmemory.la \ + -lpthread -ldl -lrt -lm -lcrypto TESTS += test_cp_serdes test_lisp_types test_cp_serdes_SOURCES = \ - test/lisp-cp/test_cp_serdes.c \ + 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 = \ - test/lisp-cp/test_lisp_types.c \ + 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 = libvnet.la $(LDS) -test_lisp_types_LDADD = libvnet.la $(LDS) - -test_cp_serdes_LDFLAGS = -static -test_lisp_types_LDFLAGS = -static +test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS) +test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD) +test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS) +test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD) endif ######################################## @@ -628,14 +623,14 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api if ENABLE_TESTS TESTS += test_test -test_test_SOURCES = test/lisp-gpe/test.c +test_test_SOURCES = tests/vnet/lisp-gpe/test.c test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_test_LDADD = $(LIBOBJS) noinst_PROGRAMS += $(TESTS) -check_PROGRAMS = $(TESTS) +check_PROGRAMS += $(TESTS) endif ######################################## @@ -962,32 +957,16 @@ libvnetplugin_la_SOURCES += \ nobase_include_HEADERS += \ vnet/plugin/plugin.h -lib_LTLIBRARIES = libvnet.la libvnetplugin.la +libvnetdir = ${libdir} +libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la pcap2pg_SOURCES = \ vnet/unix/pcap2pg.c \ vnet/unix/pcap.h pcap2pg_LDFLAGS = -static -pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl +pcap2pg_LDADD = libvnet.la libvppinfra.la -lpthread libvlibmemory.la -lm -ldl noinst_PROGRAMS += pcap2pg -# Set the suffix list -SUFFIXES = .api.h .api .api.json - -# install the API definition, so we can produce java bindings, etc. - -apidir = $(prefix)/vnet - -api_DATA = \ - $(patsubst %.api,%.api.json,$(API_FILES)) - -BUILT_SOURCES = \ - $(patsubst %.api,%.api.json,$(API_FILES)) \ - $(patsubst %.api,%.api.h,$(API_FILES)) - -# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk -# and requires a symbolic link at the top of the vnet source tree - -include $(top_srcdir)/suffix-rules.mk +# vi:syntax=automake diff --git a/vnet/vnet/adj/adj.c b/src/vnet/adj/adj.c similarity index 100% rename from vnet/vnet/adj/adj.c rename to src/vnet/adj/adj.c diff --git a/vnet/vnet/adj/adj.h b/src/vnet/adj/adj.h similarity index 100% rename from vnet/vnet/adj/adj.h rename to src/vnet/adj/adj.h diff --git a/vnet/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c similarity index 100% rename from vnet/vnet/adj/adj_glean.c rename to src/vnet/adj/adj_glean.c diff --git a/vnet/vnet/adj/adj_glean.h b/src/vnet/adj/adj_glean.h similarity index 100% rename from vnet/vnet/adj/adj_glean.h rename to src/vnet/adj/adj_glean.h diff --git a/vnet/vnet/adj/adj_internal.h b/src/vnet/adj/adj_internal.h similarity index 100% rename from vnet/vnet/adj/adj_internal.h rename to src/vnet/adj/adj_internal.h diff --git a/vnet/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c similarity index 100% rename from vnet/vnet/adj/adj_l2.c rename to src/vnet/adj/adj_l2.c diff --git a/vnet/vnet/adj/adj_l2.h b/src/vnet/adj/adj_l2.h similarity index 100% rename from vnet/vnet/adj/adj_l2.h rename to src/vnet/adj/adj_l2.h diff --git a/vnet/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c similarity index 100% rename from vnet/vnet/adj/adj_midchain.c rename to src/vnet/adj/adj_midchain.c diff --git a/vnet/vnet/adj/adj_midchain.h b/src/vnet/adj/adj_midchain.h similarity index 100% rename from vnet/vnet/adj/adj_midchain.h rename to src/vnet/adj/adj_midchain.h diff --git a/vnet/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c similarity index 100% rename from vnet/vnet/adj/adj_nbr.c rename to src/vnet/adj/adj_nbr.c diff --git a/vnet/vnet/adj/adj_nbr.h b/src/vnet/adj/adj_nbr.h similarity index 100% rename from vnet/vnet/adj/adj_nbr.h rename to src/vnet/adj/adj_nbr.h diff --git a/vnet/vnet/adj/adj_rewrite.c b/src/vnet/adj/adj_rewrite.c similarity index 100% rename from vnet/vnet/adj/adj_rewrite.c rename to src/vnet/adj/adj_rewrite.c diff --git a/vnet/vnet/adj/adj_rewrite.h b/src/vnet/adj/adj_rewrite.h similarity index 100% rename from vnet/vnet/adj/adj_rewrite.h rename to src/vnet/adj/adj_rewrite.h diff --git a/vnet/vnet/adj/adj_types.h b/src/vnet/adj/adj_types.h similarity index 100% rename from vnet/vnet/adj/adj_types.h rename to src/vnet/adj/adj_types.h diff --git a/vnet/vnet/api_errno.h b/src/vnet/api_errno.h similarity index 100% rename from vnet/vnet/api_errno.h rename to src/vnet/api_errno.h diff --git a/vnet/vnet/bfd/bfd.api b/src/vnet/bfd/bfd.api similarity index 100% rename from vnet/vnet/bfd/bfd.api rename to src/vnet/bfd/bfd.api diff --git a/vnet/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c similarity index 100% rename from vnet/vnet/bfd/bfd_api.c rename to src/vnet/bfd/bfd_api.c diff --git a/vnet/vnet/bfd/bfd_api.h b/src/vnet/bfd/bfd_api.h similarity index 100% rename from vnet/vnet/bfd/bfd_api.h rename to src/vnet/bfd/bfd_api.h diff --git a/vnet/vnet/bfd/bfd_debug.h b/src/vnet/bfd/bfd_debug.h similarity index 100% rename from vnet/vnet/bfd/bfd_debug.h rename to src/vnet/bfd/bfd_debug.h diff --git a/vnet/vnet/bfd/bfd_doc.md b/src/vnet/bfd/bfd_doc.md similarity index 100% rename from vnet/vnet/bfd/bfd_doc.md rename to src/vnet/bfd/bfd_doc.md diff --git a/vnet/vnet/bfd/bfd_main.c b/src/vnet/bfd/bfd_main.c similarity index 100% rename from vnet/vnet/bfd/bfd_main.c rename to src/vnet/bfd/bfd_main.c diff --git a/vnet/vnet/bfd/bfd_main.h b/src/vnet/bfd/bfd_main.h similarity index 100% rename from vnet/vnet/bfd/bfd_main.h rename to src/vnet/bfd/bfd_main.h diff --git a/vnet/vnet/bfd/bfd_protocol.c b/src/vnet/bfd/bfd_protocol.c similarity index 100% rename from vnet/vnet/bfd/bfd_protocol.c rename to src/vnet/bfd/bfd_protocol.c diff --git a/vnet/vnet/bfd/bfd_protocol.h b/src/vnet/bfd/bfd_protocol.h similarity index 100% rename from vnet/vnet/bfd/bfd_protocol.h rename to src/vnet/bfd/bfd_protocol.h diff --git a/vnet/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c similarity index 100% rename from vnet/vnet/bfd/bfd_udp.c rename to src/vnet/bfd/bfd_udp.c diff --git a/vnet/vnet/bfd/bfd_udp.h b/src/vnet/bfd/bfd_udp.h similarity index 100% rename from vnet/vnet/bfd/bfd_udp.h rename to src/vnet/bfd/bfd_udp.h diff --git a/vnet/vnet/bfd/dir.dox b/src/vnet/bfd/dir.dox similarity index 100% rename from vnet/vnet/bfd/dir.dox rename to src/vnet/bfd/dir.dox diff --git a/vnet/vnet/buffer.h b/src/vnet/buffer.h similarity index 100% rename from vnet/vnet/buffer.h rename to src/vnet/buffer.h diff --git a/vnet/vnet/cdp/cdp.pg b/src/vnet/cdp/cdp.pg similarity index 100% rename from vnet/vnet/cdp/cdp.pg rename to src/vnet/cdp/cdp.pg diff --git a/vnet/vnet/cdp/cdp_input.c b/src/vnet/cdp/cdp_input.c similarity index 100% rename from vnet/vnet/cdp/cdp_input.c rename to src/vnet/cdp/cdp_input.c diff --git a/vnet/vnet/cdp/cdp_node.c b/src/vnet/cdp/cdp_node.c similarity index 100% rename from vnet/vnet/cdp/cdp_node.c rename to src/vnet/cdp/cdp_node.c diff --git a/vnet/vnet/cdp/cdp_node.h b/src/vnet/cdp/cdp_node.h similarity index 100% rename from vnet/vnet/cdp/cdp_node.h rename to src/vnet/cdp/cdp_node.h diff --git a/vnet/vnet/cdp/cdp_periodic.c b/src/vnet/cdp/cdp_periodic.c similarity index 100% rename from vnet/vnet/cdp/cdp_periodic.c rename to src/vnet/cdp/cdp_periodic.c diff --git a/vnet/vnet/cdp/cdp_protocol.h b/src/vnet/cdp/cdp_protocol.h similarity index 100% rename from vnet/vnet/cdp/cdp_protocol.h rename to src/vnet/cdp/cdp_protocol.h diff --git a/vnet/vnet/classify/README b/src/vnet/classify/README similarity index 100% rename from vnet/vnet/classify/README rename to src/vnet/classify/README diff --git a/vnet/vnet/classify/flow_classify.c b/src/vnet/classify/flow_classify.c similarity index 100% rename from vnet/vnet/classify/flow_classify.c rename to src/vnet/classify/flow_classify.c diff --git a/vnet/vnet/classify/flow_classify.h b/src/vnet/classify/flow_classify.h similarity index 100% rename from vnet/vnet/classify/flow_classify.h rename to src/vnet/classify/flow_classify.h diff --git a/vnet/vnet/classify/flow_classify_node.c b/src/vnet/classify/flow_classify_node.c similarity index 100% rename from vnet/vnet/classify/flow_classify_node.c rename to src/vnet/classify/flow_classify_node.c diff --git a/vnet/vnet/classify/input_acl.c b/src/vnet/classify/input_acl.c similarity index 100% rename from vnet/vnet/classify/input_acl.c rename to src/vnet/classify/input_acl.c diff --git a/vnet/vnet/classify/input_acl.h b/src/vnet/classify/input_acl.h similarity index 100% rename from vnet/vnet/classify/input_acl.h rename to src/vnet/classify/input_acl.h diff --git a/vnet/vnet/classify/ip_classify.c b/src/vnet/classify/ip_classify.c similarity index 100% rename from vnet/vnet/classify/ip_classify.c rename to src/vnet/classify/ip_classify.c diff --git a/vnet/vnet/classify/policer_classify.c b/src/vnet/classify/policer_classify.c similarity index 100% rename from vnet/vnet/classify/policer_classify.c rename to src/vnet/classify/policer_classify.c diff --git a/vnet/vnet/classify/policer_classify.h b/src/vnet/classify/policer_classify.h similarity index 100% rename from vnet/vnet/classify/policer_classify.h rename to src/vnet/classify/policer_classify.h diff --git a/vnet/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c similarity index 100% rename from vnet/vnet/classify/vnet_classify.c rename to src/vnet/classify/vnet_classify.c diff --git a/vnet/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h similarity index 100% rename from vnet/vnet/classify/vnet_classify.h rename to src/vnet/classify/vnet_classify.h diff --git a/vnet/vnet/config.c b/src/vnet/config.c similarity index 100% rename from vnet/vnet/config.c rename to src/vnet/config.c diff --git a/vnet/vnet/config.h b/src/vnet/config.h similarity index 100% rename from vnet/vnet/config.h rename to src/vnet/config.h diff --git a/vnet/vnet/cop/cop.c b/src/vnet/cop/cop.c similarity index 100% rename from vnet/vnet/cop/cop.c rename to src/vnet/cop/cop.c diff --git a/vnet/vnet/cop/cop.h b/src/vnet/cop/cop.h similarity index 100% rename from vnet/vnet/cop/cop.h rename to src/vnet/cop/cop.h diff --git a/vnet/vnet/cop/ip4_whitelist.c b/src/vnet/cop/ip4_whitelist.c similarity index 100% rename from vnet/vnet/cop/ip4_whitelist.c rename to src/vnet/cop/ip4_whitelist.c diff --git a/vnet/vnet/cop/ip6_whitelist.c b/src/vnet/cop/ip6_whitelist.c similarity index 100% rename from vnet/vnet/cop/ip6_whitelist.c rename to src/vnet/cop/ip6_whitelist.c diff --git a/vnet/vnet/cop/node1.c b/src/vnet/cop/node1.c similarity index 100% rename from vnet/vnet/cop/node1.c rename to src/vnet/cop/node1.c diff --git a/vnet/vnet/devices/af_packet/af_packet.api b/src/vnet/devices/af_packet/af_packet.api similarity index 100% rename from vnet/vnet/devices/af_packet/af_packet.api rename to src/vnet/devices/af_packet/af_packet.api diff --git a/vnet/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c similarity index 100% rename from vnet/vnet/devices/af_packet/af_packet.c rename to src/vnet/devices/af_packet/af_packet.c diff --git a/vnet/vnet/devices/af_packet/af_packet.h b/src/vnet/devices/af_packet/af_packet.h similarity index 100% rename from vnet/vnet/devices/af_packet/af_packet.h rename to src/vnet/devices/af_packet/af_packet.h diff --git a/vnet/vnet/devices/af_packet/af_packet_api.c b/src/vnet/devices/af_packet/af_packet_api.c similarity index 100% rename from vnet/vnet/devices/af_packet/af_packet_api.c rename to src/vnet/devices/af_packet/af_packet_api.c diff --git a/vnet/vnet/devices/af_packet/cli.c b/src/vnet/devices/af_packet/cli.c similarity index 100% rename from vnet/vnet/devices/af_packet/cli.c rename to src/vnet/devices/af_packet/cli.c diff --git a/vnet/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c similarity index 100% rename from vnet/vnet/devices/af_packet/device.c rename to src/vnet/devices/af_packet/device.c diff --git a/vnet/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c similarity index 100% rename from vnet/vnet/devices/af_packet/node.c rename to src/vnet/devices/af_packet/node.c diff --git a/vnet/vnet/devices/devices.c b/src/vnet/devices/devices.c similarity index 100% rename from vnet/vnet/devices/devices.c rename to src/vnet/devices/devices.c diff --git a/vnet/vnet/devices/devices.h b/src/vnet/devices/devices.h similarity index 100% rename from vnet/vnet/devices/devices.h rename to src/vnet/devices/devices.h diff --git a/vnet/vnet/devices/dpdk/cli.c b/src/vnet/devices/dpdk/cli.c similarity index 100% rename from vnet/vnet/devices/dpdk/cli.c rename to src/vnet/devices/dpdk/cli.c diff --git a/vnet/vnet/devices/dpdk/device.c b/src/vnet/devices/dpdk/device.c similarity index 100% rename from vnet/vnet/devices/dpdk/device.c rename to src/vnet/devices/dpdk/device.c diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/src/vnet/devices/dpdk/dpdk.h similarity index 100% rename from vnet/vnet/devices/dpdk/dpdk.h rename to src/vnet/devices/dpdk/dpdk.h diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/src/vnet/devices/dpdk/dpdk_priv.h similarity index 100% rename from vnet/vnet/devices/dpdk/dpdk_priv.h rename to src/vnet/devices/dpdk/dpdk_priv.h diff --git a/vnet/vnet/devices/dpdk/format.c b/src/vnet/devices/dpdk/format.c similarity index 100% rename from vnet/vnet/devices/dpdk/format.c rename to src/vnet/devices/dpdk/format.c diff --git a/vnet/vnet/devices/dpdk/hqos.c b/src/vnet/devices/dpdk/hqos.c similarity index 100% rename from vnet/vnet/devices/dpdk/hqos.c rename to src/vnet/devices/dpdk/hqos.c diff --git a/vnet/vnet/devices/dpdk/init.c b/src/vnet/devices/dpdk/init.c similarity index 100% rename from vnet/vnet/devices/dpdk/init.c rename to src/vnet/devices/dpdk/init.c diff --git a/vnet/vnet/devices/dpdk/ipsec/cli.c b/src/vnet/devices/dpdk/ipsec/cli.c similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/cli.c rename to src/vnet/devices/dpdk/ipsec/cli.c diff --git a/vnet/vnet/devices/dpdk/ipsec/crypto_node.c b/src/vnet/devices/dpdk/ipsec/crypto_node.c similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/crypto_node.c rename to src/vnet/devices/dpdk/ipsec/crypto_node.c diff --git a/vnet/vnet/devices/dpdk/ipsec/dir.dox b/src/vnet/devices/dpdk/ipsec/dir.dox similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/dir.dox rename to src/vnet/devices/dpdk/ipsec/dir.dox diff --git a/vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md b/src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md rename to src/vnet/devices/dpdk/ipsec/dpdk_crypto_ipsec_doc.md diff --git a/vnet/vnet/devices/dpdk/ipsec/esp.h b/src/vnet/devices/dpdk/ipsec/esp.h similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/esp.h rename to src/vnet/devices/dpdk/ipsec/esp.h diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c b/src/vnet/devices/dpdk/ipsec/esp_decrypt.c similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/esp_decrypt.c rename to src/vnet/devices/dpdk/ipsec/esp_decrypt.c diff --git a/vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c b/src/vnet/devices/dpdk/ipsec/esp_encrypt.c similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/esp_encrypt.c rename to src/vnet/devices/dpdk/ipsec/esp_encrypt.c diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.c b/src/vnet/devices/dpdk/ipsec/ipsec.c similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/ipsec.c rename to src/vnet/devices/dpdk/ipsec/ipsec.c diff --git a/vnet/vnet/devices/dpdk/ipsec/ipsec.h b/src/vnet/devices/dpdk/ipsec/ipsec.h similarity index 100% rename from vnet/vnet/devices/dpdk/ipsec/ipsec.h rename to src/vnet/devices/dpdk/ipsec/ipsec.h diff --git a/vnet/vnet/devices/dpdk/node.c b/src/vnet/devices/dpdk/node.c similarity index 100% rename from vnet/vnet/devices/dpdk/node.c rename to src/vnet/devices/dpdk/node.c diff --git a/vnet/vnet/devices/dpdk/qos_doc.md b/src/vnet/devices/dpdk/qos_doc.md similarity index 100% rename from vnet/vnet/devices/dpdk/qos_doc.md rename to src/vnet/devices/dpdk/qos_doc.md diff --git a/vnet/vnet/devices/netmap/cli.c b/src/vnet/devices/netmap/cli.c similarity index 100% rename from vnet/vnet/devices/netmap/cli.c rename to src/vnet/devices/netmap/cli.c diff --git a/vnet/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c similarity index 100% rename from vnet/vnet/devices/netmap/device.c rename to src/vnet/devices/netmap/device.c diff --git a/vnet/vnet/devices/netmap/net_netmap.h b/src/vnet/devices/netmap/net_netmap.h similarity index 100% rename from vnet/vnet/devices/netmap/net_netmap.h rename to src/vnet/devices/netmap/net_netmap.h diff --git a/vnet/vnet/devices/netmap/netmap.api b/src/vnet/devices/netmap/netmap.api similarity index 100% rename from vnet/vnet/devices/netmap/netmap.api rename to src/vnet/devices/netmap/netmap.api diff --git a/vnet/vnet/devices/netmap/netmap.c b/src/vnet/devices/netmap/netmap.c similarity index 100% rename from vnet/vnet/devices/netmap/netmap.c rename to src/vnet/devices/netmap/netmap.c diff --git a/vnet/vnet/devices/netmap/netmap.h b/src/vnet/devices/netmap/netmap.h similarity index 100% rename from vnet/vnet/devices/netmap/netmap.h rename to src/vnet/devices/netmap/netmap.h diff --git a/vnet/vnet/devices/netmap/netmap_api.c b/src/vnet/devices/netmap/netmap_api.c similarity index 100% rename from vnet/vnet/devices/netmap/netmap_api.c rename to src/vnet/devices/netmap/netmap_api.c diff --git a/vnet/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c similarity index 100% rename from vnet/vnet/devices/netmap/node.c rename to src/vnet/devices/netmap/node.c diff --git a/vnet/vnet/devices/nic/ixge.c b/src/vnet/devices/nic/ixge.c similarity index 100% rename from vnet/vnet/devices/nic/ixge.c rename to src/vnet/devices/nic/ixge.c diff --git a/vnet/vnet/devices/nic/ixge.h b/src/vnet/devices/nic/ixge.h similarity index 100% rename from vnet/vnet/devices/nic/ixge.h rename to src/vnet/devices/nic/ixge.h diff --git a/vnet/vnet/devices/nic/sfp.c b/src/vnet/devices/nic/sfp.c similarity index 100% rename from vnet/vnet/devices/nic/sfp.c rename to src/vnet/devices/nic/sfp.c diff --git a/vnet/vnet/devices/nic/sfp.h b/src/vnet/devices/nic/sfp.h similarity index 100% rename from vnet/vnet/devices/nic/sfp.h rename to src/vnet/devices/nic/sfp.h diff --git a/vnet/vnet/devices/ssvm/node.c b/src/vnet/devices/ssvm/node.c similarity index 100% rename from vnet/vnet/devices/ssvm/node.c rename to src/vnet/devices/ssvm/node.c diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.c b/src/vnet/devices/ssvm/ssvm_eth.c similarity index 100% rename from vnet/vnet/devices/ssvm/ssvm_eth.c rename to src/vnet/devices/ssvm/ssvm_eth.c diff --git a/vnet/vnet/devices/ssvm/ssvm_eth.h b/src/vnet/devices/ssvm/ssvm_eth.h similarity index 99% rename from vnet/vnet/devices/ssvm/ssvm_eth.h rename to src/vnet/devices/ssvm/ssvm_eth.h index ac611f4edb6..f877df3cd33 100644 --- a/vnet/vnet/devices/ssvm/ssvm_eth.h +++ b/src/vnet/devices/ssvm/ssvm_eth.h @@ -30,7 +30,7 @@ #include #include -#include +#include extern vnet_device_class_t ssvm_eth_device_class; extern vlib_node_registration_t ssvm_eth_input_node; diff --git a/vnet/vnet/devices/virtio/dir.dox b/src/vnet/devices/virtio/dir.dox similarity index 100% rename from vnet/vnet/devices/virtio/dir.dox rename to src/vnet/devices/virtio/dir.dox diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c similarity index 100% rename from vnet/vnet/devices/virtio/vhost-user.c rename to src/vnet/devices/virtio/vhost-user.c diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/src/vnet/devices/virtio/vhost-user.h similarity index 100% rename from vnet/vnet/devices/virtio/vhost-user.h rename to src/vnet/devices/virtio/vhost-user.h diff --git a/vnet/vnet/devices/virtio/vhost_user.api b/src/vnet/devices/virtio/vhost_user.api similarity index 100% rename from vnet/vnet/devices/virtio/vhost_user.api rename to src/vnet/devices/virtio/vhost_user.api diff --git a/vnet/vnet/devices/virtio/vhost_user_api.c b/src/vnet/devices/virtio/vhost_user_api.c similarity index 100% rename from vnet/vnet/devices/virtio/vhost_user_api.c rename to src/vnet/devices/virtio/vhost_user_api.c diff --git a/vnet/vnet/dhcp/client.c b/src/vnet/dhcp/client.c similarity index 100% rename from vnet/vnet/dhcp/client.c rename to src/vnet/dhcp/client.c diff --git a/vnet/vnet/dhcp/client.h b/src/vnet/dhcp/client.h similarity index 100% rename from vnet/vnet/dhcp/client.h rename to src/vnet/dhcp/client.h diff --git a/vnet/vnet/dhcp/packet.h b/src/vnet/dhcp/packet.h similarity index 100% rename from vnet/vnet/dhcp/packet.h rename to src/vnet/dhcp/packet.h diff --git a/vnet/vnet/dhcp/proxy.h b/src/vnet/dhcp/proxy.h similarity index 100% rename from vnet/vnet/dhcp/proxy.h rename to src/vnet/dhcp/proxy.h diff --git a/vnet/vnet/dhcp/proxy_error.def b/src/vnet/dhcp/proxy_error.def similarity index 100% rename from vnet/vnet/dhcp/proxy_error.def rename to src/vnet/dhcp/proxy_error.def diff --git a/vnet/vnet/dhcp/proxy_node.c b/src/vnet/dhcp/proxy_node.c similarity index 100% rename from vnet/vnet/dhcp/proxy_node.c rename to src/vnet/dhcp/proxy_node.c diff --git a/vnet/vnet/dhcpv6/packet.h b/src/vnet/dhcpv6/packet.h similarity index 100% rename from vnet/vnet/dhcpv6/packet.h rename to src/vnet/dhcpv6/packet.h diff --git a/vnet/vnet/dhcpv6/proxy.h b/src/vnet/dhcpv6/proxy.h similarity index 100% rename from vnet/vnet/dhcpv6/proxy.h rename to src/vnet/dhcpv6/proxy.h diff --git a/vnet/vnet/dhcpv6/proxy_error.def b/src/vnet/dhcpv6/proxy_error.def similarity index 100% rename from vnet/vnet/dhcpv6/proxy_error.def rename to src/vnet/dhcpv6/proxy_error.def diff --git a/vnet/vnet/dhcpv6/proxy_node.c b/src/vnet/dhcpv6/proxy_node.c similarity index 100% rename from vnet/vnet/dhcpv6/proxy_node.c rename to src/vnet/dhcpv6/proxy_node.c diff --git a/vnet/vnet/dpo/classify_dpo.c b/src/vnet/dpo/classify_dpo.c similarity index 100% rename from vnet/vnet/dpo/classify_dpo.c rename to src/vnet/dpo/classify_dpo.c diff --git a/vnet/vnet/dpo/classify_dpo.h b/src/vnet/dpo/classify_dpo.h similarity index 100% rename from vnet/vnet/dpo/classify_dpo.h rename to src/vnet/dpo/classify_dpo.h diff --git a/vnet/vnet/dpo/dpo.c b/src/vnet/dpo/dpo.c similarity index 100% rename from vnet/vnet/dpo/dpo.c rename to src/vnet/dpo/dpo.c diff --git a/vnet/vnet/dpo/dpo.h b/src/vnet/dpo/dpo.h similarity index 100% rename from vnet/vnet/dpo/dpo.h rename to src/vnet/dpo/dpo.h diff --git a/vnet/vnet/dpo/drop_dpo.c b/src/vnet/dpo/drop_dpo.c similarity index 100% rename from vnet/vnet/dpo/drop_dpo.c rename to src/vnet/dpo/drop_dpo.c diff --git a/vnet/vnet/dpo/drop_dpo.h b/src/vnet/dpo/drop_dpo.h similarity index 100% rename from vnet/vnet/dpo/drop_dpo.h rename to src/vnet/dpo/drop_dpo.h diff --git a/vnet/vnet/dpo/ip_null_dpo.c b/src/vnet/dpo/ip_null_dpo.c similarity index 100% rename from vnet/vnet/dpo/ip_null_dpo.c rename to src/vnet/dpo/ip_null_dpo.c diff --git a/vnet/vnet/dpo/ip_null_dpo.h b/src/vnet/dpo/ip_null_dpo.h similarity index 100% rename from vnet/vnet/dpo/ip_null_dpo.h rename to src/vnet/dpo/ip_null_dpo.h diff --git a/vnet/vnet/dpo/load_balance.c b/src/vnet/dpo/load_balance.c similarity index 100% rename from vnet/vnet/dpo/load_balance.c rename to src/vnet/dpo/load_balance.c diff --git a/vnet/vnet/dpo/load_balance.h b/src/vnet/dpo/load_balance.h similarity index 100% rename from vnet/vnet/dpo/load_balance.h rename to src/vnet/dpo/load_balance.h diff --git a/vnet/vnet/dpo/load_balance_map.c b/src/vnet/dpo/load_balance_map.c similarity index 100% rename from vnet/vnet/dpo/load_balance_map.c rename to src/vnet/dpo/load_balance_map.c diff --git a/vnet/vnet/dpo/load_balance_map.h b/src/vnet/dpo/load_balance_map.h similarity index 100% rename from vnet/vnet/dpo/load_balance_map.h rename to src/vnet/dpo/load_balance_map.h diff --git a/vnet/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c similarity index 100% rename from vnet/vnet/dpo/lookup_dpo.c rename to src/vnet/dpo/lookup_dpo.c diff --git a/vnet/vnet/dpo/lookup_dpo.h b/src/vnet/dpo/lookup_dpo.h similarity index 100% rename from vnet/vnet/dpo/lookup_dpo.h rename to src/vnet/dpo/lookup_dpo.h diff --git a/vnet/vnet/dpo/mpls_label_dpo.c b/src/vnet/dpo/mpls_label_dpo.c similarity index 100% rename from vnet/vnet/dpo/mpls_label_dpo.c rename to src/vnet/dpo/mpls_label_dpo.c diff --git a/vnet/vnet/dpo/mpls_label_dpo.h b/src/vnet/dpo/mpls_label_dpo.h similarity index 100% rename from vnet/vnet/dpo/mpls_label_dpo.h rename to src/vnet/dpo/mpls_label_dpo.h diff --git a/vnet/vnet/dpo/punt_dpo.c b/src/vnet/dpo/punt_dpo.c similarity index 100% rename from vnet/vnet/dpo/punt_dpo.c rename to src/vnet/dpo/punt_dpo.c diff --git a/vnet/vnet/dpo/punt_dpo.h b/src/vnet/dpo/punt_dpo.h similarity index 100% rename from vnet/vnet/dpo/punt_dpo.h rename to src/vnet/dpo/punt_dpo.h diff --git a/vnet/vnet/dpo/receive_dpo.c b/src/vnet/dpo/receive_dpo.c similarity index 100% rename from vnet/vnet/dpo/receive_dpo.c rename to src/vnet/dpo/receive_dpo.c diff --git a/vnet/vnet/dpo/receive_dpo.h b/src/vnet/dpo/receive_dpo.h similarity index 100% rename from vnet/vnet/dpo/receive_dpo.h rename to src/vnet/dpo/receive_dpo.h diff --git a/vnet/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c similarity index 100% rename from vnet/vnet/ethernet/arp.c rename to src/vnet/ethernet/arp.c diff --git a/vnet/vnet/ethernet/arp_packet.h b/src/vnet/ethernet/arp_packet.h similarity index 100% rename from vnet/vnet/ethernet/arp_packet.h rename to src/vnet/ethernet/arp_packet.h diff --git a/vnet/vnet/ethernet/dir.dox b/src/vnet/ethernet/dir.dox similarity index 100% rename from vnet/vnet/ethernet/dir.dox rename to src/vnet/ethernet/dir.dox diff --git a/vnet/vnet/ethernet/error.def b/src/vnet/ethernet/error.def similarity index 100% rename from vnet/vnet/ethernet/error.def rename to src/vnet/ethernet/error.def diff --git a/vnet/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h similarity index 100% rename from vnet/vnet/ethernet/ethernet.h rename to src/vnet/ethernet/ethernet.h diff --git a/vnet/vnet/ethernet/format.c b/src/vnet/ethernet/format.c similarity index 100% rename from vnet/vnet/ethernet/format.c rename to src/vnet/ethernet/format.c diff --git a/vnet/vnet/ethernet/init.c b/src/vnet/ethernet/init.c similarity index 100% rename from vnet/vnet/ethernet/init.c rename to src/vnet/ethernet/init.c diff --git a/vnet/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c similarity index 100% rename from vnet/vnet/ethernet/interface.c rename to src/vnet/ethernet/interface.c diff --git a/vnet/vnet/ethernet/mac_swap.c b/src/vnet/ethernet/mac_swap.c similarity index 100% rename from vnet/vnet/ethernet/mac_swap.c rename to src/vnet/ethernet/mac_swap.c diff --git a/vnet/vnet/ethernet/node.c b/src/vnet/ethernet/node.c similarity index 100% rename from vnet/vnet/ethernet/node.c rename to src/vnet/ethernet/node.c diff --git a/vnet/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h similarity index 100% rename from vnet/vnet/ethernet/packet.h rename to src/vnet/ethernet/packet.h diff --git a/vnet/vnet/ethernet/pg.c b/src/vnet/ethernet/pg.c similarity index 100% rename from vnet/vnet/ethernet/pg.c rename to src/vnet/ethernet/pg.c diff --git a/vnet/vnet/ethernet/types.def b/src/vnet/ethernet/types.def similarity index 100% rename from vnet/vnet/ethernet/types.def rename to src/vnet/ethernet/types.def diff --git a/vnet/vnet/feature/feature.c b/src/vnet/feature/feature.c similarity index 100% rename from vnet/vnet/feature/feature.c rename to src/vnet/feature/feature.c diff --git a/vnet/vnet/feature/feature.h b/src/vnet/feature/feature.h similarity index 100% rename from vnet/vnet/feature/feature.h rename to src/vnet/feature/feature.h diff --git a/vnet/vnet/feature/registration.c b/src/vnet/feature/registration.c similarity index 100% rename from vnet/vnet/feature/registration.c rename to src/vnet/feature/registration.c diff --git a/vnet/vnet/fib/fib.c b/src/vnet/fib/fib.c similarity index 100% rename from vnet/vnet/fib/fib.c rename to src/vnet/fib/fib.c diff --git a/vnet/vnet/fib/fib.h b/src/vnet/fib/fib.h similarity index 100% rename from vnet/vnet/fib/fib.h rename to src/vnet/fib/fib.h diff --git a/vnet/vnet/fib/fib_api.h b/src/vnet/fib/fib_api.h similarity index 100% rename from vnet/vnet/fib/fib_api.h rename to src/vnet/fib/fib_api.h diff --git a/vnet/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c similarity index 100% rename from vnet/vnet/fib/fib_attached_export.c rename to src/vnet/fib/fib_attached_export.c diff --git a/vnet/vnet/fib/fib_attached_export.h b/src/vnet/fib/fib_attached_export.h similarity index 100% rename from vnet/vnet/fib/fib_attached_export.h rename to src/vnet/fib/fib_attached_export.h diff --git a/vnet/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c similarity index 100% rename from vnet/vnet/fib/fib_entry.c rename to src/vnet/fib/fib_entry.c diff --git a/vnet/vnet/fib/fib_entry.h b/src/vnet/fib/fib_entry.h similarity index 100% rename from vnet/vnet/fib/fib_entry.h rename to src/vnet/fib/fib_entry.h diff --git a/vnet/vnet/fib/fib_entry_cover.c b/src/vnet/fib/fib_entry_cover.c similarity index 100% rename from vnet/vnet/fib/fib_entry_cover.c rename to src/vnet/fib/fib_entry_cover.c diff --git a/vnet/vnet/fib/fib_entry_cover.h b/src/vnet/fib/fib_entry_cover.h similarity index 100% rename from vnet/vnet/fib/fib_entry_cover.h rename to src/vnet/fib/fib_entry_cover.h diff --git a/vnet/vnet/fib/fib_entry_delegate.c b/src/vnet/fib/fib_entry_delegate.c similarity index 100% rename from vnet/vnet/fib/fib_entry_delegate.c rename to src/vnet/fib/fib_entry_delegate.c diff --git a/vnet/vnet/fib/fib_entry_delegate.h b/src/vnet/fib/fib_entry_delegate.h similarity index 100% rename from vnet/vnet/fib/fib_entry_delegate.h rename to src/vnet/fib/fib_entry_delegate.h diff --git a/vnet/vnet/fib/fib_entry_src.c b/src/vnet/fib/fib_entry_src.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src.c rename to src/vnet/fib/fib_entry_src.c diff --git a/vnet/vnet/fib/fib_entry_src.h b/src/vnet/fib/fib_entry_src.h similarity index 100% rename from vnet/vnet/fib/fib_entry_src.h rename to src/vnet/fib/fib_entry_src.h diff --git a/vnet/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_adj.c rename to src/vnet/fib/fib_entry_src_adj.c diff --git a/vnet/vnet/fib/fib_entry_src_api.c b/src/vnet/fib/fib_entry_src_api.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_api.c rename to src/vnet/fib/fib_entry_src_api.c diff --git a/vnet/vnet/fib/fib_entry_src_default.c b/src/vnet/fib/fib_entry_src_default.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_default.c rename to src/vnet/fib/fib_entry_src_default.c diff --git a/vnet/vnet/fib/fib_entry_src_default_route.c b/src/vnet/fib/fib_entry_src_default_route.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_default_route.c rename to src/vnet/fib/fib_entry_src_default_route.c diff --git a/vnet/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_interface.c rename to src/vnet/fib/fib_entry_src_interface.c diff --git a/vnet/vnet/fib/fib_entry_src_lisp.c b/src/vnet/fib/fib_entry_src_lisp.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_lisp.c rename to src/vnet/fib/fib_entry_src_lisp.c diff --git a/vnet/vnet/fib/fib_entry_src_mpls.c b/src/vnet/fib/fib_entry_src_mpls.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_mpls.c rename to src/vnet/fib/fib_entry_src_mpls.c diff --git a/vnet/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_rr.c rename to src/vnet/fib/fib_entry_src_rr.c diff --git a/vnet/vnet/fib/fib_entry_src_special.c b/src/vnet/fib/fib_entry_src_special.c similarity index 100% rename from vnet/vnet/fib/fib_entry_src_special.c rename to src/vnet/fib/fib_entry_src_special.c diff --git a/vnet/vnet/fib/fib_internal.h b/src/vnet/fib/fib_internal.h similarity index 100% rename from vnet/vnet/fib/fib_internal.h rename to src/vnet/fib/fib_internal.h diff --git a/vnet/vnet/fib/fib_node.c b/src/vnet/fib/fib_node.c similarity index 100% rename from vnet/vnet/fib/fib_node.c rename to src/vnet/fib/fib_node.c diff --git a/vnet/vnet/fib/fib_node.h b/src/vnet/fib/fib_node.h similarity index 100% rename from vnet/vnet/fib/fib_node.h rename to src/vnet/fib/fib_node.h diff --git a/vnet/vnet/fib/fib_node_list.c b/src/vnet/fib/fib_node_list.c similarity index 100% rename from vnet/vnet/fib/fib_node_list.c rename to src/vnet/fib/fib_node_list.c diff --git a/vnet/vnet/fib/fib_node_list.h b/src/vnet/fib/fib_node_list.h similarity index 100% rename from vnet/vnet/fib/fib_node_list.h rename to src/vnet/fib/fib_node_list.h diff --git a/vnet/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c similarity index 100% rename from vnet/vnet/fib/fib_path.c rename to src/vnet/fib/fib_path.c diff --git a/vnet/vnet/fib/fib_path.h b/src/vnet/fib/fib_path.h similarity index 100% rename from vnet/vnet/fib/fib_path.h rename to src/vnet/fib/fib_path.h diff --git a/vnet/vnet/fib/fib_path_ext.c b/src/vnet/fib/fib_path_ext.c similarity index 100% rename from vnet/vnet/fib/fib_path_ext.c rename to src/vnet/fib/fib_path_ext.c diff --git a/vnet/vnet/fib/fib_path_ext.h b/src/vnet/fib/fib_path_ext.h similarity index 100% rename from vnet/vnet/fib/fib_path_ext.h rename to src/vnet/fib/fib_path_ext.h diff --git a/vnet/vnet/fib/fib_path_list.c b/src/vnet/fib/fib_path_list.c similarity index 100% rename from vnet/vnet/fib/fib_path_list.c rename to src/vnet/fib/fib_path_list.c diff --git a/vnet/vnet/fib/fib_path_list.h b/src/vnet/fib/fib_path_list.h similarity index 100% rename from vnet/vnet/fib/fib_path_list.h rename to src/vnet/fib/fib_path_list.h diff --git a/vnet/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c similarity index 100% rename from vnet/vnet/fib/fib_table.c rename to src/vnet/fib/fib_table.c diff --git a/vnet/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h similarity index 100% rename from vnet/vnet/fib/fib_table.h rename to src/vnet/fib/fib_table.h diff --git a/vnet/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c similarity index 100% rename from vnet/vnet/fib/fib_test.c rename to src/vnet/fib/fib_test.c diff --git a/vnet/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c similarity index 100% rename from vnet/vnet/fib/fib_types.c rename to src/vnet/fib/fib_types.c diff --git a/vnet/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h similarity index 100% rename from vnet/vnet/fib/fib_types.h rename to src/vnet/fib/fib_types.h diff --git a/vnet/vnet/fib/fib_urpf_list.c b/src/vnet/fib/fib_urpf_list.c similarity index 100% rename from vnet/vnet/fib/fib_urpf_list.c rename to src/vnet/fib/fib_urpf_list.c diff --git a/vnet/vnet/fib/fib_urpf_list.h b/src/vnet/fib/fib_urpf_list.h similarity index 100% rename from vnet/vnet/fib/fib_urpf_list.h rename to src/vnet/fib/fib_urpf_list.h diff --git a/vnet/vnet/fib/fib_walk.c b/src/vnet/fib/fib_walk.c similarity index 100% rename from vnet/vnet/fib/fib_walk.c rename to src/vnet/fib/fib_walk.c diff --git a/vnet/vnet/fib/fib_walk.h b/src/vnet/fib/fib_walk.h similarity index 100% rename from vnet/vnet/fib/fib_walk.h rename to src/vnet/fib/fib_walk.h diff --git a/vnet/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c similarity index 100% rename from vnet/vnet/fib/ip4_fib.c rename to src/vnet/fib/ip4_fib.c diff --git a/vnet/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h similarity index 100% rename from vnet/vnet/fib/ip4_fib.h rename to src/vnet/fib/ip4_fib.h diff --git a/vnet/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c similarity index 100% rename from vnet/vnet/fib/ip6_fib.c rename to src/vnet/fib/ip6_fib.c diff --git a/vnet/vnet/fib/ip6_fib.h b/src/vnet/fib/ip6_fib.h similarity index 100% rename from vnet/vnet/fib/ip6_fib.h rename to src/vnet/fib/ip6_fib.h diff --git a/vnet/vnet/fib/mpls_fib.c b/src/vnet/fib/mpls_fib.c similarity index 100% rename from vnet/vnet/fib/mpls_fib.c rename to src/vnet/fib/mpls_fib.c diff --git a/vnet/vnet/fib/mpls_fib.h b/src/vnet/fib/mpls_fib.h similarity index 100% rename from vnet/vnet/fib/mpls_fib.h rename to src/vnet/fib/mpls_fib.h diff --git a/vnet/vnet/flow/flow_report.c b/src/vnet/flow/flow_report.c similarity index 100% rename from vnet/vnet/flow/flow_report.c rename to src/vnet/flow/flow_report.c diff --git a/vnet/vnet/flow/flow_report.h b/src/vnet/flow/flow_report.h similarity index 100% rename from vnet/vnet/flow/flow_report.h rename to src/vnet/flow/flow_report.h diff --git a/vnet/vnet/flow/flow_report_classify.c b/src/vnet/flow/flow_report_classify.c similarity index 100% rename from vnet/vnet/flow/flow_report_classify.c rename to src/vnet/flow/flow_report_classify.c diff --git a/vnet/vnet/flow/flow_report_classify.h b/src/vnet/flow/flow_report_classify.h similarity index 100% rename from vnet/vnet/flow/flow_report_classify.h rename to src/vnet/flow/flow_report_classify.h diff --git a/vnet/vnet/flow/ipfix_info_elements.h b/src/vnet/flow/ipfix_info_elements.h similarity index 100% rename from vnet/vnet/flow/ipfix_info_elements.h rename to src/vnet/flow/ipfix_info_elements.h diff --git a/vnet/vnet/flow/ipfix_packet.h b/src/vnet/flow/ipfix_packet.h similarity index 100% rename from vnet/vnet/flow/ipfix_packet.h rename to src/vnet/flow/ipfix_packet.h diff --git a/vnet/vnet/global_funcs.h b/src/vnet/global_funcs.h similarity index 100% rename from vnet/vnet/global_funcs.h rename to src/vnet/global_funcs.h diff --git a/vnet/vnet/gre/error.def b/src/vnet/gre/error.def similarity index 100% rename from vnet/vnet/gre/error.def rename to src/vnet/gre/error.def diff --git a/vnet/vnet/gre/gre.api b/src/vnet/gre/gre.api similarity index 100% rename from vnet/vnet/gre/gre.api rename to src/vnet/gre/gre.api diff --git a/vnet/vnet/gre/gre.c b/src/vnet/gre/gre.c similarity index 100% rename from vnet/vnet/gre/gre.c rename to src/vnet/gre/gre.c diff --git a/vnet/vnet/gre/gre.h b/src/vnet/gre/gre.h similarity index 100% rename from vnet/vnet/gre/gre.h rename to src/vnet/gre/gre.h diff --git a/vnet/vnet/gre/gre_api.c b/src/vnet/gre/gre_api.c similarity index 100% rename from vnet/vnet/gre/gre_api.c rename to src/vnet/gre/gre_api.c diff --git a/vnet/vnet/gre/interface.c b/src/vnet/gre/interface.c similarity index 100% rename from vnet/vnet/gre/interface.c rename to src/vnet/gre/interface.c diff --git a/vnet/vnet/gre/node.c b/src/vnet/gre/node.c similarity index 100% rename from vnet/vnet/gre/node.c rename to src/vnet/gre/node.c diff --git a/vnet/vnet/gre/packet.h b/src/vnet/gre/packet.h similarity index 100% rename from vnet/vnet/gre/packet.h rename to src/vnet/gre/packet.h diff --git a/vnet/vnet/gre/pg.c b/src/vnet/gre/pg.c similarity index 100% rename from vnet/vnet/gre/pg.c rename to src/vnet/gre/pg.c diff --git a/vnet/vnet/handoff.c b/src/vnet/handoff.c similarity index 100% rename from vnet/vnet/handoff.c rename to src/vnet/handoff.c diff --git a/vnet/vnet/handoff.h b/src/vnet/handoff.h similarity index 100% rename from vnet/vnet/handoff.h rename to src/vnet/handoff.h diff --git a/vnet/vnet/hdlc/error.def b/src/vnet/hdlc/error.def similarity index 100% rename from vnet/vnet/hdlc/error.def rename to src/vnet/hdlc/error.def diff --git a/vnet/vnet/hdlc/hdlc.c b/src/vnet/hdlc/hdlc.c similarity index 100% rename from vnet/vnet/hdlc/hdlc.c rename to src/vnet/hdlc/hdlc.c diff --git a/vnet/vnet/hdlc/hdlc.h b/src/vnet/hdlc/hdlc.h similarity index 100% rename from vnet/vnet/hdlc/hdlc.h rename to src/vnet/hdlc/hdlc.h diff --git a/vnet/vnet/hdlc/node.c b/src/vnet/hdlc/node.c similarity index 100% rename from vnet/vnet/hdlc/node.c rename to src/vnet/hdlc/node.c diff --git a/vnet/vnet/hdlc/packet.h b/src/vnet/hdlc/packet.h similarity index 100% rename from vnet/vnet/hdlc/packet.h rename to src/vnet/hdlc/packet.h diff --git a/vnet/vnet/hdlc/pg.c b/src/vnet/hdlc/pg.c similarity index 100% rename from vnet/vnet/hdlc/pg.c rename to src/vnet/hdlc/pg.c diff --git a/vnet/vnet/interface.api b/src/vnet/interface.api similarity index 100% rename from vnet/vnet/interface.api rename to src/vnet/interface.api diff --git a/vnet/vnet/interface.c b/src/vnet/interface.c similarity index 100% rename from vnet/vnet/interface.c rename to src/vnet/interface.c diff --git a/vnet/vnet/interface.h b/src/vnet/interface.h similarity index 100% rename from vnet/vnet/interface.h rename to src/vnet/interface.h diff --git a/vnet/vnet/interface_api.c b/src/vnet/interface_api.c similarity index 100% rename from vnet/vnet/interface_api.c rename to src/vnet/interface_api.c diff --git a/vnet/vnet/interface_cli.c b/src/vnet/interface_cli.c similarity index 100% rename from vnet/vnet/interface_cli.c rename to src/vnet/interface_cli.c diff --git a/vnet/vnet/interface_format.c b/src/vnet/interface_format.c similarity index 100% rename from vnet/vnet/interface_format.c rename to src/vnet/interface_format.c diff --git a/vnet/vnet/interface_funcs.h b/src/vnet/interface_funcs.h similarity index 100% rename from vnet/vnet/interface_funcs.h rename to src/vnet/interface_funcs.h diff --git a/vnet/vnet/interface_output.c b/src/vnet/interface_output.c similarity index 100% rename from vnet/vnet/interface_output.c rename to src/vnet/interface_output.c diff --git a/vnet/vnet/ip/dir.dox b/src/vnet/ip/dir.dox similarity index 100% rename from vnet/vnet/ip/dir.dox rename to src/vnet/ip/dir.dox diff --git a/vnet/vnet/ip/format.c b/src/vnet/ip/format.c similarity index 100% rename from vnet/vnet/ip/format.c rename to src/vnet/ip/format.c diff --git a/vnet/vnet/ip/format.h b/src/vnet/ip/format.h similarity index 100% rename from vnet/vnet/ip/format.h rename to src/vnet/ip/format.h diff --git a/vnet/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c similarity index 100% rename from vnet/vnet/ip/icmp4.c rename to src/vnet/ip/icmp4.c diff --git a/vnet/vnet/ip/icmp4.h b/src/vnet/ip/icmp4.h similarity index 100% rename from vnet/vnet/ip/icmp4.h rename to src/vnet/ip/icmp4.h diff --git a/vnet/vnet/ip/icmp46_packet.h b/src/vnet/ip/icmp46_packet.h similarity index 100% rename from vnet/vnet/ip/icmp46_packet.h rename to src/vnet/ip/icmp46_packet.h diff --git a/vnet/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c similarity index 100% rename from vnet/vnet/ip/icmp6.c rename to src/vnet/ip/icmp6.c diff --git a/vnet/vnet/ip/icmp6.h b/src/vnet/ip/icmp6.h similarity index 100% rename from vnet/vnet/ip/icmp6.h rename to src/vnet/ip/icmp6.h diff --git a/vnet/vnet/ip/igmp_packet.h b/src/vnet/ip/igmp_packet.h similarity index 100% rename from vnet/vnet/ip/igmp_packet.h rename to src/vnet/ip/igmp_packet.h diff --git a/vnet/vnet/ip/ip.api b/src/vnet/ip/ip.api similarity index 100% rename from vnet/vnet/ip/ip.api rename to src/vnet/ip/ip.api diff --git a/vnet/vnet/ip/ip.h b/src/vnet/ip/ip.h similarity index 100% rename from vnet/vnet/ip/ip.h rename to src/vnet/ip/ip.h diff --git a/vnet/vnet/ip/ip4.h b/src/vnet/ip/ip4.h similarity index 100% rename from vnet/vnet/ip/ip4.h rename to src/vnet/ip/ip4.h diff --git a/vnet/vnet/ip/ip46_cli.c b/src/vnet/ip/ip46_cli.c similarity index 100% rename from vnet/vnet/ip/ip46_cli.c rename to src/vnet/ip/ip46_cli.c diff --git a/vnet/vnet/ip/ip4_error.h b/src/vnet/ip/ip4_error.h similarity index 100% rename from vnet/vnet/ip/ip4_error.h rename to src/vnet/ip/ip4_error.h diff --git a/vnet/vnet/ip/ip4_format.c b/src/vnet/ip/ip4_format.c similarity index 100% rename from vnet/vnet/ip/ip4_format.c rename to src/vnet/ip/ip4_format.c diff --git a/vnet/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c similarity index 100% rename from vnet/vnet/ip/ip4_forward.c rename to src/vnet/ip/ip4_forward.c diff --git a/vnet/vnet/ip/ip4_input.c b/src/vnet/ip/ip4_input.c similarity index 100% rename from vnet/vnet/ip/ip4_input.c rename to src/vnet/ip/ip4_input.c diff --git a/vnet/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c similarity index 100% rename from vnet/vnet/ip/ip4_mtrie.c rename to src/vnet/ip/ip4_mtrie.c diff --git a/vnet/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h similarity index 100% rename from vnet/vnet/ip/ip4_mtrie.h rename to src/vnet/ip/ip4_mtrie.h diff --git a/vnet/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h similarity index 100% rename from vnet/vnet/ip/ip4_packet.h rename to src/vnet/ip/ip4_packet.h diff --git a/vnet/vnet/ip/ip4_pg.c b/src/vnet/ip/ip4_pg.c similarity index 100% rename from vnet/vnet/ip/ip4_pg.c rename to src/vnet/ip/ip4_pg.c diff --git a/vnet/vnet/ip/ip4_source_and_port_range_check.c b/src/vnet/ip/ip4_source_and_port_range_check.c similarity index 100% rename from vnet/vnet/ip/ip4_source_and_port_range_check.c rename to src/vnet/ip/ip4_source_and_port_range_check.c diff --git a/vnet/vnet/ip/ip4_source_check.c b/src/vnet/ip/ip4_source_check.c similarity index 100% rename from vnet/vnet/ip/ip4_source_check.c rename to src/vnet/ip/ip4_source_check.c diff --git a/vnet/vnet/ip/ip4_test.c b/src/vnet/ip/ip4_test.c similarity index 100% rename from vnet/vnet/ip/ip4_test.c rename to src/vnet/ip/ip4_test.c diff --git a/vnet/vnet/ip/ip6.h b/src/vnet/ip/ip6.h similarity index 100% rename from vnet/vnet/ip/ip6.h rename to src/vnet/ip/ip6.h diff --git a/vnet/vnet/ip/ip6_error.h b/src/vnet/ip/ip6_error.h similarity index 100% rename from vnet/vnet/ip/ip6_error.h rename to src/vnet/ip/ip6_error.h diff --git a/vnet/vnet/ip/ip6_format.c b/src/vnet/ip/ip6_format.c similarity index 100% rename from vnet/vnet/ip/ip6_format.c rename to src/vnet/ip/ip6_format.c diff --git a/vnet/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c similarity index 100% rename from vnet/vnet/ip/ip6_forward.c rename to src/vnet/ip/ip6_forward.c diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/src/vnet/ip/ip6_hop_by_hop.c similarity index 100% rename from vnet/vnet/ip/ip6_hop_by_hop.c rename to src/vnet/ip/ip6_hop_by_hop.c diff --git a/vnet/vnet/ip/ip6_hop_by_hop.h b/src/vnet/ip/ip6_hop_by_hop.h similarity index 100% rename from vnet/vnet/ip/ip6_hop_by_hop.h rename to src/vnet/ip/ip6_hop_by_hop.h diff --git a/vnet/vnet/ip/ip6_hop_by_hop_packet.h b/src/vnet/ip/ip6_hop_by_hop_packet.h similarity index 100% rename from vnet/vnet/ip/ip6_hop_by_hop_packet.h rename to src/vnet/ip/ip6_hop_by_hop_packet.h diff --git a/vnet/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c similarity index 100% rename from vnet/vnet/ip/ip6_input.c rename to src/vnet/ip/ip6_input.c diff --git a/vnet/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c similarity index 100% rename from vnet/vnet/ip/ip6_neighbor.c rename to src/vnet/ip/ip6_neighbor.c diff --git a/vnet/vnet/ip/ip6_neighbor.h b/src/vnet/ip/ip6_neighbor.h similarity index 100% rename from vnet/vnet/ip/ip6_neighbor.h rename to src/vnet/ip/ip6_neighbor.h diff --git a/vnet/vnet/ip/ip6_packet.h b/src/vnet/ip/ip6_packet.h similarity index 100% rename from vnet/vnet/ip/ip6_packet.h rename to src/vnet/ip/ip6_packet.h diff --git a/vnet/vnet/ip/ip6_pg.c b/src/vnet/ip/ip6_pg.c similarity index 100% rename from vnet/vnet/ip/ip6_pg.c rename to src/vnet/ip/ip6_pg.c diff --git a/vnet/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c similarity index 100% rename from vnet/vnet/ip/ip_api.c rename to src/vnet/ip/ip_api.c diff --git a/vnet/vnet/ip/ip_checksum.c b/src/vnet/ip/ip_checksum.c similarity index 100% rename from vnet/vnet/ip/ip_checksum.c rename to src/vnet/ip/ip_checksum.c diff --git a/vnet/vnet/ip/ip_frag.c b/src/vnet/ip/ip_frag.c similarity index 100% rename from vnet/vnet/ip/ip_frag.c rename to src/vnet/ip/ip_frag.c diff --git a/vnet/vnet/ip/ip_frag.h b/src/vnet/ip/ip_frag.h similarity index 100% rename from vnet/vnet/ip/ip_frag.h rename to src/vnet/ip/ip_frag.h diff --git a/vnet/vnet/ip/ip_init.c b/src/vnet/ip/ip_init.c similarity index 100% rename from vnet/vnet/ip/ip_init.c rename to src/vnet/ip/ip_init.c diff --git a/vnet/vnet/ip/ip_input_acl.c b/src/vnet/ip/ip_input_acl.c similarity index 100% rename from vnet/vnet/ip/ip_input_acl.c rename to src/vnet/ip/ip_input_acl.c diff --git a/vnet/vnet/ip/ip_packet.h b/src/vnet/ip/ip_packet.h similarity index 100% rename from vnet/vnet/ip/ip_packet.h rename to src/vnet/ip/ip_packet.h diff --git a/vnet/vnet/ip/ip_source_and_port_range_check.h b/src/vnet/ip/ip_source_and_port_range_check.h similarity index 100% rename from vnet/vnet/ip/ip_source_and_port_range_check.h rename to src/vnet/ip/ip_source_and_port_range_check.h diff --git a/vnet/vnet/ip/lookup.c b/src/vnet/ip/lookup.c similarity index 100% rename from vnet/vnet/ip/lookup.c rename to src/vnet/ip/lookup.c diff --git a/vnet/vnet/ip/lookup.h b/src/vnet/ip/lookup.h similarity index 100% rename from vnet/vnet/ip/lookup.h rename to src/vnet/ip/lookup.h diff --git a/vnet/vnet/ip/ping.c b/src/vnet/ip/ping.c similarity index 100% rename from vnet/vnet/ip/ping.c rename to src/vnet/ip/ping.c diff --git a/vnet/vnet/ip/ping.h b/src/vnet/ip/ping.h similarity index 100% rename from vnet/vnet/ip/ping.h rename to src/vnet/ip/ping.h diff --git a/vnet/vnet/ip/ports.def b/src/vnet/ip/ports.def similarity index 100% rename from vnet/vnet/ip/ports.def rename to src/vnet/ip/ports.def diff --git a/vnet/vnet/ip/protocols.def b/src/vnet/ip/protocols.def similarity index 100% rename from vnet/vnet/ip/protocols.def rename to src/vnet/ip/protocols.def diff --git a/vnet/vnet/ip/punt.c b/src/vnet/ip/punt.c similarity index 100% rename from vnet/vnet/ip/punt.c rename to src/vnet/ip/punt.c diff --git a/vnet/vnet/ip/punt.h b/src/vnet/ip/punt.h similarity index 100% rename from vnet/vnet/ip/punt.h rename to src/vnet/ip/punt.h diff --git a/vnet/vnet/ip/punt_error.def b/src/vnet/ip/punt_error.def similarity index 100% rename from vnet/vnet/ip/punt_error.def rename to src/vnet/ip/punt_error.def diff --git a/vnet/vnet/ip/tcp_packet.h b/src/vnet/ip/tcp_packet.h similarity index 100% rename from vnet/vnet/ip/tcp_packet.h rename to src/vnet/ip/tcp_packet.h diff --git a/vnet/vnet/ip/udp.h b/src/vnet/ip/udp.h similarity index 100% rename from vnet/vnet/ip/udp.h rename to src/vnet/ip/udp.h diff --git a/vnet/vnet/ip/udp_error.def b/src/vnet/ip/udp_error.def similarity index 100% rename from vnet/vnet/ip/udp_error.def rename to src/vnet/ip/udp_error.def diff --git a/vnet/vnet/ip/udp_format.c b/src/vnet/ip/udp_format.c similarity index 100% rename from vnet/vnet/ip/udp_format.c rename to src/vnet/ip/udp_format.c diff --git a/vnet/vnet/ip/udp_init.c b/src/vnet/ip/udp_init.c similarity index 100% rename from vnet/vnet/ip/udp_init.c rename to src/vnet/ip/udp_init.c diff --git a/vnet/vnet/ip/udp_local.c b/src/vnet/ip/udp_local.c similarity index 100% rename from vnet/vnet/ip/udp_local.c rename to src/vnet/ip/udp_local.c diff --git a/vnet/vnet/ip/udp_packet.h b/src/vnet/ip/udp_packet.h similarity index 100% rename from vnet/vnet/ip/udp_packet.h rename to src/vnet/ip/udp_packet.h diff --git a/vnet/vnet/ip/udp_pg.c b/src/vnet/ip/udp_pg.c similarity index 100% rename from vnet/vnet/ip/udp_pg.c rename to src/vnet/ip/udp_pg.c diff --git a/vnet/vnet/ipsec-gre/dir.dox b/src/vnet/ipsec-gre/dir.dox similarity index 100% rename from vnet/vnet/ipsec-gre/dir.dox rename to src/vnet/ipsec-gre/dir.dox diff --git a/vnet/vnet/ipsec-gre/error.def b/src/vnet/ipsec-gre/error.def similarity index 100% rename from vnet/vnet/ipsec-gre/error.def rename to src/vnet/ipsec-gre/error.def diff --git a/vnet/vnet/ipsec-gre/interface.c b/src/vnet/ipsec-gre/interface.c similarity index 100% rename from vnet/vnet/ipsec-gre/interface.c rename to src/vnet/ipsec-gre/interface.c diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.api b/src/vnet/ipsec-gre/ipsec_gre.api similarity index 100% rename from vnet/vnet/ipsec-gre/ipsec_gre.api rename to src/vnet/ipsec-gre/ipsec_gre.api diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c similarity index 100% rename from vnet/vnet/ipsec-gre/ipsec_gre.c rename to src/vnet/ipsec-gre/ipsec_gre.c diff --git a/vnet/vnet/ipsec-gre/ipsec_gre.h b/src/vnet/ipsec-gre/ipsec_gre.h similarity index 100% rename from vnet/vnet/ipsec-gre/ipsec_gre.h rename to src/vnet/ipsec-gre/ipsec_gre.h diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c similarity index 100% rename from vnet/vnet/ipsec-gre/ipsec_gre_api.c rename to src/vnet/ipsec-gre/ipsec_gre_api.c diff --git a/vnet/vnet/ipsec-gre/ipsec_gre_doc.md b/src/vnet/ipsec-gre/ipsec_gre_doc.md similarity index 100% rename from vnet/vnet/ipsec-gre/ipsec_gre_doc.md rename to src/vnet/ipsec-gre/ipsec_gre_doc.md diff --git a/vnet/vnet/ipsec-gre/node.c b/src/vnet/ipsec-gre/node.c similarity index 100% rename from vnet/vnet/ipsec-gre/node.c rename to src/vnet/ipsec-gre/node.c diff --git a/vnet/vnet/ipsec/esp.h b/src/vnet/ipsec/esp.h similarity index 100% rename from vnet/vnet/ipsec/esp.h rename to src/vnet/ipsec/esp.h diff --git a/vnet/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c similarity index 100% rename from vnet/vnet/ipsec/esp_decrypt.c rename to src/vnet/ipsec/esp_decrypt.c diff --git a/vnet/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c similarity index 100% rename from vnet/vnet/ipsec/esp_encrypt.c rename to src/vnet/ipsec/esp_encrypt.c diff --git a/vnet/vnet/ipsec/ikev2.c b/src/vnet/ipsec/ikev2.c similarity index 100% rename from vnet/vnet/ipsec/ikev2.c rename to src/vnet/ipsec/ikev2.c diff --git a/vnet/vnet/ipsec/ikev2.h b/src/vnet/ipsec/ikev2.h similarity index 100% rename from vnet/vnet/ipsec/ikev2.h rename to src/vnet/ipsec/ikev2.h diff --git a/vnet/vnet/ipsec/ikev2_cli.c b/src/vnet/ipsec/ikev2_cli.c similarity index 100% rename from vnet/vnet/ipsec/ikev2_cli.c rename to src/vnet/ipsec/ikev2_cli.c diff --git a/vnet/vnet/ipsec/ikev2_crypto.c b/src/vnet/ipsec/ikev2_crypto.c similarity index 100% rename from vnet/vnet/ipsec/ikev2_crypto.c rename to src/vnet/ipsec/ikev2_crypto.c diff --git a/vnet/vnet/ipsec/ikev2_format.c b/src/vnet/ipsec/ikev2_format.c similarity index 100% rename from vnet/vnet/ipsec/ikev2_format.c rename to src/vnet/ipsec/ikev2_format.c diff --git a/vnet/vnet/ipsec/ikev2_payload.c b/src/vnet/ipsec/ikev2_payload.c similarity index 100% rename from vnet/vnet/ipsec/ikev2_payload.c rename to src/vnet/ipsec/ikev2_payload.c diff --git a/vnet/vnet/ipsec/ikev2_priv.h b/src/vnet/ipsec/ikev2_priv.h similarity index 100% rename from vnet/vnet/ipsec/ikev2_priv.h rename to src/vnet/ipsec/ikev2_priv.h diff --git a/vnet/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api similarity index 100% rename from vnet/vnet/ipsec/ipsec.api rename to src/vnet/ipsec/ipsec.api diff --git a/vnet/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c similarity index 100% rename from vnet/vnet/ipsec/ipsec.c rename to src/vnet/ipsec/ipsec.c diff --git a/vnet/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h similarity index 100% rename from vnet/vnet/ipsec/ipsec.h rename to src/vnet/ipsec/ipsec.h diff --git a/vnet/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_api.c rename to src/vnet/ipsec/ipsec_api.c diff --git a/vnet/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_cli.c rename to src/vnet/ipsec/ipsec_cli.c diff --git a/vnet/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_format.c rename to src/vnet/ipsec/ipsec_format.c diff --git a/vnet/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_if.c rename to src/vnet/ipsec/ipsec_if.c diff --git a/vnet/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_if_in.c rename to src/vnet/ipsec/ipsec_if_in.c diff --git a/vnet/vnet/ipsec/ipsec_if_out.c b/src/vnet/ipsec/ipsec_if_out.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_if_out.c rename to src/vnet/ipsec/ipsec_if_out.c diff --git a/vnet/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_input.c rename to src/vnet/ipsec/ipsec_input.c diff --git a/vnet/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c similarity index 100% rename from vnet/vnet/ipsec/ipsec_output.c rename to src/vnet/ipsec/ipsec_output.c diff --git a/vnet/vnet/l2/dir.dox b/src/vnet/l2/dir.dox similarity index 100% rename from vnet/vnet/l2/dir.dox rename to src/vnet/l2/dir.dox diff --git a/vnet/vnet/l2/feat_bitmap.c b/src/vnet/l2/feat_bitmap.c similarity index 100% rename from vnet/vnet/l2/feat_bitmap.c rename to src/vnet/l2/feat_bitmap.c diff --git a/vnet/vnet/l2/feat_bitmap.h b/src/vnet/l2/feat_bitmap.h similarity index 100% rename from vnet/vnet/l2/feat_bitmap.h rename to src/vnet/l2/feat_bitmap.h diff --git a/vnet/vnet/l2/l2.api b/src/vnet/l2/l2.api similarity index 100% rename from vnet/vnet/l2/l2.api rename to src/vnet/l2/l2.api diff --git a/vnet/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c similarity index 100% rename from vnet/vnet/l2/l2_api.c rename to src/vnet/l2/l2_api.c diff --git a/vnet/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c similarity index 100% rename from vnet/vnet/l2/l2_bd.c rename to src/vnet/l2/l2_bd.c diff --git a/vnet/vnet/l2/l2_bd.h b/src/vnet/l2/l2_bd.h similarity index 100% rename from vnet/vnet/l2/l2_bd.h rename to src/vnet/l2/l2_bd.h diff --git a/vnet/vnet/l2/l2_bvi.c b/src/vnet/l2/l2_bvi.c similarity index 100% rename from vnet/vnet/l2/l2_bvi.c rename to src/vnet/l2/l2_bvi.c diff --git a/vnet/vnet/l2/l2_bvi.h b/src/vnet/l2/l2_bvi.h similarity index 100% rename from vnet/vnet/l2/l2_bvi.h rename to src/vnet/l2/l2_bvi.h diff --git a/vnet/vnet/l2/l2_classify.h b/src/vnet/l2/l2_classify.h similarity index 100% rename from vnet/vnet/l2/l2_classify.h rename to src/vnet/l2/l2_classify.h diff --git a/vnet/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c similarity index 100% rename from vnet/vnet/l2/l2_efp_filter.c rename to src/vnet/l2/l2_efp_filter.c diff --git a/vnet/vnet/l2/l2_efp_filter.h b/src/vnet/l2/l2_efp_filter.h similarity index 100% rename from vnet/vnet/l2/l2_efp_filter.h rename to src/vnet/l2/l2_efp_filter.h diff --git a/vnet/vnet/l2/l2_fib.c b/src/vnet/l2/l2_fib.c similarity index 100% rename from vnet/vnet/l2/l2_fib.c rename to src/vnet/l2/l2_fib.c diff --git a/vnet/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h similarity index 100% rename from vnet/vnet/l2/l2_fib.h rename to src/vnet/l2/l2_fib.h diff --git a/vnet/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c similarity index 100% rename from vnet/vnet/l2/l2_flood.c rename to src/vnet/l2/l2_flood.c diff --git a/vnet/vnet/l2/l2_flood.h b/src/vnet/l2/l2_flood.h similarity index 100% rename from vnet/vnet/l2/l2_flood.h rename to src/vnet/l2/l2_flood.h diff --git a/vnet/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c similarity index 100% rename from vnet/vnet/l2/l2_fwd.c rename to src/vnet/l2/l2_fwd.c diff --git a/vnet/vnet/l2/l2_fwd.h b/src/vnet/l2/l2_fwd.h similarity index 100% rename from vnet/vnet/l2/l2_fwd.h rename to src/vnet/l2/l2_fwd.h diff --git a/vnet/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c similarity index 100% rename from vnet/vnet/l2/l2_input.c rename to src/vnet/l2/l2_input.c diff --git a/vnet/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h similarity index 100% rename from vnet/vnet/l2/l2_input.h rename to src/vnet/l2/l2_input.h diff --git a/vnet/vnet/l2/l2_input_acl.c b/src/vnet/l2/l2_input_acl.c similarity index 100% rename from vnet/vnet/l2/l2_input_acl.c rename to src/vnet/l2/l2_input_acl.c diff --git a/vnet/vnet/l2/l2_input_classify.c b/src/vnet/l2/l2_input_classify.c similarity index 100% rename from vnet/vnet/l2/l2_input_classify.c rename to src/vnet/l2/l2_input_classify.c diff --git a/vnet/vnet/l2/l2_input_vtr.c b/src/vnet/l2/l2_input_vtr.c similarity index 100% rename from vnet/vnet/l2/l2_input_vtr.c rename to src/vnet/l2/l2_input_vtr.c diff --git a/vnet/vnet/l2/l2_input_vtr.h b/src/vnet/l2/l2_input_vtr.h similarity index 100% rename from vnet/vnet/l2/l2_input_vtr.h rename to src/vnet/l2/l2_input_vtr.h diff --git a/vnet/vnet/l2/l2_learn.c b/src/vnet/l2/l2_learn.c similarity index 100% rename from vnet/vnet/l2/l2_learn.c rename to src/vnet/l2/l2_learn.c diff --git a/vnet/vnet/l2/l2_learn.h b/src/vnet/l2/l2_learn.h similarity index 100% rename from vnet/vnet/l2/l2_learn.h rename to src/vnet/l2/l2_learn.h diff --git a/vnet/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c similarity index 100% rename from vnet/vnet/l2/l2_output.c rename to src/vnet/l2/l2_output.c diff --git a/vnet/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h similarity index 100% rename from vnet/vnet/l2/l2_output.h rename to src/vnet/l2/l2_output.h diff --git a/vnet/vnet/l2/l2_output_acl.c b/src/vnet/l2/l2_output_acl.c similarity index 100% rename from vnet/vnet/l2/l2_output_acl.c rename to src/vnet/l2/l2_output_acl.c diff --git a/vnet/vnet/l2/l2_output_classify.c b/src/vnet/l2/l2_output_classify.c similarity index 100% rename from vnet/vnet/l2/l2_output_classify.c rename to src/vnet/l2/l2_output_classify.c diff --git a/vnet/vnet/l2/l2_patch.c b/src/vnet/l2/l2_patch.c similarity index 100% rename from vnet/vnet/l2/l2_patch.c rename to src/vnet/l2/l2_patch.c diff --git a/vnet/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c similarity index 100% rename from vnet/vnet/l2/l2_rw.c rename to src/vnet/l2/l2_rw.c diff --git a/vnet/vnet/l2/l2_rw.h b/src/vnet/l2/l2_rw.h similarity index 100% rename from vnet/vnet/l2/l2_rw.h rename to src/vnet/l2/l2_rw.h diff --git a/vnet/vnet/l2/l2_vtr.c b/src/vnet/l2/l2_vtr.c similarity index 100% rename from vnet/vnet/l2/l2_vtr.c rename to src/vnet/l2/l2_vtr.c diff --git a/vnet/vnet/l2/l2_vtr.h b/src/vnet/l2/l2_vtr.h similarity index 100% rename from vnet/vnet/l2/l2_vtr.h rename to src/vnet/l2/l2_vtr.h diff --git a/vnet/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c similarity index 100% rename from vnet/vnet/l2/l2_xcrw.c rename to src/vnet/l2/l2_xcrw.c diff --git a/vnet/vnet/l2/l2_xcrw.h b/src/vnet/l2/l2_xcrw.h similarity index 100% rename from vnet/vnet/l2/l2_xcrw.h rename to src/vnet/l2/l2_xcrw.h diff --git a/vnet/vnet/l2tp/decap.c b/src/vnet/l2tp/decap.c similarity index 100% rename from vnet/vnet/l2tp/decap.c rename to src/vnet/l2tp/decap.c diff --git a/vnet/vnet/l2tp/encap.c b/src/vnet/l2tp/encap.c similarity index 100% rename from vnet/vnet/l2tp/encap.c rename to src/vnet/l2tp/encap.c diff --git a/vnet/vnet/l2tp/l2tp.api b/src/vnet/l2tp/l2tp.api similarity index 100% rename from vnet/vnet/l2tp/l2tp.api rename to src/vnet/l2tp/l2tp.api diff --git a/vnet/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c similarity index 100% rename from vnet/vnet/l2tp/l2tp.c rename to src/vnet/l2tp/l2tp.c diff --git a/vnet/vnet/l2tp/l2tp.h b/src/vnet/l2tp/l2tp.h similarity index 100% rename from vnet/vnet/l2tp/l2tp.h rename to src/vnet/l2tp/l2tp.h diff --git a/vnet/vnet/l2tp/l2tp_api.c b/src/vnet/l2tp/l2tp_api.c similarity index 100% rename from vnet/vnet/l2tp/l2tp_api.c rename to src/vnet/l2tp/l2tp_api.c diff --git a/vnet/vnet/l2tp/packet.h b/src/vnet/l2tp/packet.h similarity index 100% rename from vnet/vnet/l2tp/packet.h rename to src/vnet/l2tp/packet.h diff --git a/vnet/vnet/l2tp/pg.c b/src/vnet/l2tp/pg.c similarity index 100% rename from vnet/vnet/l2tp/pg.c rename to src/vnet/l2tp/pg.c diff --git a/vnet/vnet/l3_types.h b/src/vnet/l3_types.h similarity index 100% rename from vnet/vnet/l3_types.h rename to src/vnet/l3_types.h diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.c b/src/vnet/lawful-intercept/lawful_intercept.c similarity index 100% rename from vnet/vnet/lawful-intercept/lawful_intercept.c rename to src/vnet/lawful-intercept/lawful_intercept.c diff --git a/vnet/vnet/lawful-intercept/lawful_intercept.h b/src/vnet/lawful-intercept/lawful_intercept.h similarity index 100% rename from vnet/vnet/lawful-intercept/lawful_intercept.h rename to src/vnet/lawful-intercept/lawful_intercept.h diff --git a/vnet/vnet/lawful-intercept/node.c b/src/vnet/lawful-intercept/node.c similarity index 100% rename from vnet/vnet/lawful-intercept/node.c rename to src/vnet/lawful-intercept/node.c diff --git a/vnet/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c similarity index 100% rename from vnet/vnet/lisp-cp/control.c rename to src/vnet/lisp-cp/control.c diff --git a/vnet/vnet/lisp-cp/control.h b/src/vnet/lisp-cp/control.h similarity index 100% rename from vnet/vnet/lisp-cp/control.h rename to src/vnet/lisp-cp/control.h diff --git a/vnet/vnet/lisp-cp/gid_dictionary.c b/src/vnet/lisp-cp/gid_dictionary.c similarity index 100% rename from vnet/vnet/lisp-cp/gid_dictionary.c rename to src/vnet/lisp-cp/gid_dictionary.c diff --git a/vnet/vnet/lisp-cp/gid_dictionary.h b/src/vnet/lisp-cp/gid_dictionary.h similarity index 100% rename from vnet/vnet/lisp-cp/gid_dictionary.h rename to src/vnet/lisp-cp/gid_dictionary.h diff --git a/vnet/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api similarity index 100% rename from vnet/vnet/lisp-cp/lisp.api rename to src/vnet/lisp-cp/lisp.api diff --git a/vnet/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c similarity index 100% rename from vnet/vnet/lisp-cp/lisp_api.c rename to src/vnet/lisp-cp/lisp_api.c diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.c b/src/vnet/lisp-cp/lisp_cp_dpo.c similarity index 100% rename from vnet/vnet/lisp-cp/lisp_cp_dpo.c rename to src/vnet/lisp-cp/lisp_cp_dpo.c diff --git a/vnet/vnet/lisp-cp/lisp_cp_dpo.h b/src/vnet/lisp-cp/lisp_cp_dpo.h similarity index 100% rename from vnet/vnet/lisp-cp/lisp_cp_dpo.h rename to src/vnet/lisp-cp/lisp_cp_dpo.h diff --git a/vnet/vnet/lisp-cp/lisp_cp_messages.h b/src/vnet/lisp-cp/lisp_cp_messages.h similarity index 100% rename from vnet/vnet/lisp-cp/lisp_cp_messages.h rename to src/vnet/lisp-cp/lisp_cp_messages.h diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.c b/src/vnet/lisp-cp/lisp_msg_serdes.c similarity index 100% rename from vnet/vnet/lisp-cp/lisp_msg_serdes.c rename to src/vnet/lisp-cp/lisp_msg_serdes.c diff --git a/vnet/vnet/lisp-cp/lisp_msg_serdes.h b/src/vnet/lisp-cp/lisp_msg_serdes.h similarity index 100% rename from vnet/vnet/lisp-cp/lisp_msg_serdes.h rename to src/vnet/lisp-cp/lisp_msg_serdes.h diff --git a/vnet/vnet/lisp-cp/lisp_types.c b/src/vnet/lisp-cp/lisp_types.c similarity index 100% rename from vnet/vnet/lisp-cp/lisp_types.c rename to src/vnet/lisp-cp/lisp_types.c diff --git a/vnet/vnet/lisp-cp/lisp_types.h b/src/vnet/lisp-cp/lisp_types.h similarity index 100% rename from vnet/vnet/lisp-cp/lisp_types.h rename to src/vnet/lisp-cp/lisp_types.h diff --git a/vnet/vnet/lisp-cp/packets.c b/src/vnet/lisp-cp/packets.c similarity index 100% rename from vnet/vnet/lisp-cp/packets.c rename to src/vnet/lisp-cp/packets.c diff --git a/vnet/vnet/lisp-cp/packets.h b/src/vnet/lisp-cp/packets.h similarity index 100% rename from vnet/vnet/lisp-cp/packets.h rename to src/vnet/lisp-cp/packets.h diff --git a/vnet/vnet/lisp-gpe/decap.c b/src/vnet/lisp-gpe/decap.c similarity index 100% rename from vnet/vnet/lisp-gpe/decap.c rename to src/vnet/lisp-gpe/decap.c diff --git a/vnet/vnet/lisp-gpe/dir.dox b/src/vnet/lisp-gpe/dir.dox similarity index 100% rename from vnet/vnet/lisp-gpe/dir.dox rename to src/vnet/lisp-gpe/dir.dox diff --git a/vnet/vnet/lisp-gpe/interface.c b/src/vnet/lisp-gpe/interface.c similarity index 100% rename from vnet/vnet/lisp-gpe/interface.c rename to src/vnet/lisp-gpe/interface.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe.api rename to src/vnet/lisp-gpe/lisp_gpe.api diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.c b/src/vnet/lisp-gpe/lisp_gpe.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe.c rename to src/vnet/lisp-gpe/lisp_gpe.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe.h rename to src/vnet/lisp-gpe/lisp_gpe.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_adjacency.c rename to src/vnet/lisp-gpe/lisp_gpe_adjacency.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h b/src/vnet/lisp-gpe/lisp_gpe_adjacency.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_adjacency.h rename to src/vnet/lisp-gpe/lisp_gpe_adjacency.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_api.c rename to src/vnet/lisp-gpe/lisp_gpe_api.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_error.def b/src/vnet/lisp-gpe/lisp_gpe_error.def similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_error.def rename to src/vnet/lisp-gpe/lisp_gpe_error.def diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.c rename to src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_fwd_entry.h rename to src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_packet.h b/src/vnet/lisp-gpe/lisp_gpe_packet.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_packet.h rename to src/vnet/lisp-gpe/lisp_gpe_packet.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.c rename to src/vnet/lisp-gpe/lisp_gpe_sub_interface.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_sub_interface.h rename to src/vnet/lisp-gpe/lisp_gpe_sub_interface.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.c b/src/vnet/lisp-gpe/lisp_gpe_tenant.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_tenant.c rename to src/vnet/lisp-gpe/lisp_gpe_tenant.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tenant.h b/src/vnet/lisp-gpe/lisp_gpe_tenant.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_tenant.h rename to src/vnet/lisp-gpe/lisp_gpe_tenant.h diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_tunnel.c rename to src/vnet/lisp-gpe/lisp_gpe_tunnel.c diff --git a/vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h b/src/vnet/lisp-gpe/lisp_gpe_tunnel.h similarity index 100% rename from vnet/vnet/lisp-gpe/lisp_gpe_tunnel.h rename to src/vnet/lisp-gpe/lisp_gpe_tunnel.h diff --git a/vnet/vnet/lisp-gpe/rfc.txt b/src/vnet/lisp-gpe/rfc.txt similarity index 100% rename from vnet/vnet/lisp-gpe/rfc.txt rename to src/vnet/lisp-gpe/rfc.txt diff --git a/vnet/vnet/llc/llc.c b/src/vnet/llc/llc.c similarity index 100% rename from vnet/vnet/llc/llc.c rename to src/vnet/llc/llc.c diff --git a/vnet/vnet/llc/llc.h b/src/vnet/llc/llc.h similarity index 100% rename from vnet/vnet/llc/llc.h rename to src/vnet/llc/llc.h diff --git a/vnet/vnet/llc/node.c b/src/vnet/llc/node.c similarity index 100% rename from vnet/vnet/llc/node.c rename to src/vnet/llc/node.c diff --git a/vnet/vnet/llc/pg.c b/src/vnet/llc/pg.c similarity index 100% rename from vnet/vnet/llc/pg.c rename to src/vnet/llc/pg.c diff --git a/vnet/vnet/lldp/dir.dox b/src/vnet/lldp/dir.dox similarity index 100% rename from vnet/vnet/lldp/dir.dox rename to src/vnet/lldp/dir.dox diff --git a/vnet/vnet/lldp/lldp_cli.c b/src/vnet/lldp/lldp_cli.c similarity index 100% rename from vnet/vnet/lldp/lldp_cli.c rename to src/vnet/lldp/lldp_cli.c diff --git a/vnet/vnet/lldp/lldp_doc.md b/src/vnet/lldp/lldp_doc.md similarity index 100% rename from vnet/vnet/lldp/lldp_doc.md rename to src/vnet/lldp/lldp_doc.md diff --git a/vnet/vnet/lldp/lldp_input.c b/src/vnet/lldp/lldp_input.c similarity index 100% rename from vnet/vnet/lldp/lldp_input.c rename to src/vnet/lldp/lldp_input.c diff --git a/vnet/vnet/lldp/lldp_node.c b/src/vnet/lldp/lldp_node.c similarity index 100% rename from vnet/vnet/lldp/lldp_node.c rename to src/vnet/lldp/lldp_node.c diff --git a/vnet/vnet/lldp/lldp_node.h b/src/vnet/lldp/lldp_node.h similarity index 100% rename from vnet/vnet/lldp/lldp_node.h rename to src/vnet/lldp/lldp_node.h diff --git a/vnet/vnet/lldp/lldp_output.c b/src/vnet/lldp/lldp_output.c similarity index 100% rename from vnet/vnet/lldp/lldp_output.c rename to src/vnet/lldp/lldp_output.c diff --git a/vnet/vnet/lldp/lldp_protocol.h b/src/vnet/lldp/lldp_protocol.h similarity index 100% rename from vnet/vnet/lldp/lldp_protocol.h rename to src/vnet/lldp/lldp_protocol.h diff --git a/vnet/vnet/map/examples/gen-rules.py b/src/vnet/map/examples/gen-rules.py similarity index 100% rename from vnet/vnet/map/examples/gen-rules.py rename to src/vnet/map/examples/gen-rules.py diff --git a/vnet/vnet/map/examples/health_check.c b/src/vnet/map/examples/health_check.c similarity index 100% rename from vnet/vnet/map/examples/health_check.c rename to src/vnet/map/examples/health_check.c diff --git a/vnet/vnet/map/examples/test_map.py b/src/vnet/map/examples/test_map.py similarity index 100% rename from vnet/vnet/map/examples/test_map.py rename to src/vnet/map/examples/test_map.py diff --git a/vnet/vnet/map/gen-rules.py b/src/vnet/map/gen-rules.py similarity index 100% rename from vnet/vnet/map/gen-rules.py rename to src/vnet/map/gen-rules.py diff --git a/vnet/vnet/map/ip4_map.c b/src/vnet/map/ip4_map.c similarity index 100% rename from vnet/vnet/map/ip4_map.c rename to src/vnet/map/ip4_map.c diff --git a/vnet/vnet/map/ip4_map_t.c b/src/vnet/map/ip4_map_t.c similarity index 100% rename from vnet/vnet/map/ip4_map_t.c rename to src/vnet/map/ip4_map_t.c diff --git a/vnet/vnet/map/ip6_map.c b/src/vnet/map/ip6_map.c similarity index 100% rename from vnet/vnet/map/ip6_map.c rename to src/vnet/map/ip6_map.c diff --git a/vnet/vnet/map/ip6_map_t.c b/src/vnet/map/ip6_map_t.c similarity index 100% rename from vnet/vnet/map/ip6_map_t.c rename to src/vnet/map/ip6_map_t.c diff --git a/vnet/vnet/map/map.api b/src/vnet/map/map.api similarity index 100% rename from vnet/vnet/map/map.api rename to src/vnet/map/map.api diff --git a/vnet/vnet/map/map.c b/src/vnet/map/map.c similarity index 100% rename from vnet/vnet/map/map.c rename to src/vnet/map/map.c diff --git a/vnet/vnet/map/map.h b/src/vnet/map/map.h similarity index 100% rename from vnet/vnet/map/map.h rename to src/vnet/map/map.h diff --git a/vnet/vnet/map/map_api.c b/src/vnet/map/map_api.c similarity index 100% rename from vnet/vnet/map/map_api.c rename to src/vnet/map/map_api.c diff --git a/vnet/vnet/map/map_doc.md b/src/vnet/map/map_doc.md similarity index 100% rename from vnet/vnet/map/map_doc.md rename to src/vnet/map/map_doc.md diff --git a/vnet/vnet/map/map_dpo.c b/src/vnet/map/map_dpo.c similarity index 100% rename from vnet/vnet/map/map_dpo.c rename to src/vnet/map/map_dpo.c diff --git a/vnet/vnet/map/map_dpo.h b/src/vnet/map/map_dpo.h similarity index 100% rename from vnet/vnet/map/map_dpo.h rename to src/vnet/map/map_dpo.h diff --git a/vnet/vnet/map/test.c b/src/vnet/map/test.c similarity index 100% rename from vnet/vnet/map/test.c rename to src/vnet/map/test.c diff --git a/vnet/vnet/mcast/mcast.c b/src/vnet/mcast/mcast.c similarity index 100% rename from vnet/vnet/mcast/mcast.c rename to src/vnet/mcast/mcast.c diff --git a/vnet/vnet/mcast/mcast.h b/src/vnet/mcast/mcast.h similarity index 100% rename from vnet/vnet/mcast/mcast.h rename to src/vnet/mcast/mcast.h diff --git a/vnet/vnet/mcast/mcast_test.c b/src/vnet/mcast/mcast_test.c similarity index 100% rename from vnet/vnet/mcast/mcast_test.c rename to src/vnet/mcast/mcast_test.c diff --git a/vnet/vnet/misc.c b/src/vnet/misc.c similarity index 100% rename from vnet/vnet/misc.c rename to src/vnet/misc.c diff --git a/vnet/vnet/mpls/error.def b/src/vnet/mpls/error.def similarity index 100% rename from vnet/vnet/mpls/error.def rename to src/vnet/mpls/error.def diff --git a/vnet/vnet/mpls/interface.c b/src/vnet/mpls/interface.c similarity index 100% rename from vnet/vnet/mpls/interface.c rename to src/vnet/mpls/interface.c diff --git a/vnet/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c similarity index 100% rename from vnet/vnet/mpls/mpls.c rename to src/vnet/mpls/mpls.c diff --git a/vnet/vnet/mpls/mpls.h b/src/vnet/mpls/mpls.h similarity index 100% rename from vnet/vnet/mpls/mpls.h rename to src/vnet/mpls/mpls.h diff --git a/vnet/vnet/mpls/mpls_features.c b/src/vnet/mpls/mpls_features.c similarity index 100% rename from vnet/vnet/mpls/mpls_features.c rename to src/vnet/mpls/mpls_features.c diff --git a/vnet/vnet/mpls/mpls_lookup.c b/src/vnet/mpls/mpls_lookup.c similarity index 100% rename from vnet/vnet/mpls/mpls_lookup.c rename to src/vnet/mpls/mpls_lookup.c diff --git a/vnet/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c similarity index 100% rename from vnet/vnet/mpls/mpls_output.c rename to src/vnet/mpls/mpls_output.c diff --git a/vnet/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c similarity index 100% rename from vnet/vnet/mpls/mpls_tunnel.c rename to src/vnet/mpls/mpls_tunnel.c diff --git a/vnet/vnet/mpls/mpls_tunnel.h b/src/vnet/mpls/mpls_tunnel.h similarity index 100% rename from vnet/vnet/mpls/mpls_tunnel.h rename to src/vnet/mpls/mpls_tunnel.h diff --git a/vnet/vnet/mpls/mpls_types.h b/src/vnet/mpls/mpls_types.h similarity index 100% rename from vnet/vnet/mpls/mpls_types.h rename to src/vnet/mpls/mpls_types.h diff --git a/vnet/vnet/mpls/node.c b/src/vnet/mpls/node.c similarity index 100% rename from vnet/vnet/mpls/node.c rename to src/vnet/mpls/node.c diff --git a/vnet/vnet/mpls/packet.h b/src/vnet/mpls/packet.h similarity index 100% rename from vnet/vnet/mpls/packet.h rename to src/vnet/mpls/packet.h diff --git a/vnet/vnet/mpls/pg.c b/src/vnet/mpls/pg.c similarity index 100% rename from vnet/vnet/mpls/pg.c rename to src/vnet/mpls/pg.c diff --git a/vnet/vnet/osi/node.c b/src/vnet/osi/node.c similarity index 100% rename from vnet/vnet/osi/node.c rename to src/vnet/osi/node.c diff --git a/vnet/vnet/osi/osi.c b/src/vnet/osi/osi.c similarity index 100% rename from vnet/vnet/osi/osi.c rename to src/vnet/osi/osi.c diff --git a/vnet/vnet/osi/osi.h b/src/vnet/osi/osi.h similarity index 100% rename from vnet/vnet/osi/osi.h rename to src/vnet/osi/osi.h diff --git a/vnet/vnet/osi/pg.c b/src/vnet/osi/pg.c similarity index 100% rename from vnet/vnet/osi/pg.c rename to src/vnet/osi/pg.c diff --git a/vnet/vnet/pg/cli.c b/src/vnet/pg/cli.c similarity index 100% rename from vnet/vnet/pg/cli.c rename to src/vnet/pg/cli.c diff --git a/vnet/vnet/pg/edit.c b/src/vnet/pg/edit.c similarity index 100% rename from vnet/vnet/pg/edit.c rename to src/vnet/pg/edit.c diff --git a/vnet/vnet/pg/edit.h b/src/vnet/pg/edit.h similarity index 100% rename from vnet/vnet/pg/edit.h rename to src/vnet/pg/edit.h diff --git a/vnet/vnet/pg/example.script b/src/vnet/pg/example.script similarity index 100% rename from vnet/vnet/pg/example.script rename to src/vnet/pg/example.script diff --git a/vnet/vnet/pg/init.c b/src/vnet/pg/init.c similarity index 100% rename from vnet/vnet/pg/init.c rename to src/vnet/pg/init.c diff --git a/vnet/vnet/pg/input.c b/src/vnet/pg/input.c similarity index 100% rename from vnet/vnet/pg/input.c rename to src/vnet/pg/input.c diff --git a/vnet/vnet/pg/output.c b/src/vnet/pg/output.c similarity index 100% rename from vnet/vnet/pg/output.c rename to src/vnet/pg/output.c diff --git a/vnet/vnet/pg/pg.h b/src/vnet/pg/pg.h similarity index 100% rename from vnet/vnet/pg/pg.h rename to src/vnet/pg/pg.h diff --git a/vnet/vnet/pg/stream.c b/src/vnet/pg/stream.c similarity index 100% rename from vnet/vnet/pg/stream.c rename to src/vnet/pg/stream.c diff --git a/vnet/vnet/pipeline.h b/src/vnet/pipeline.h similarity index 100% rename from vnet/vnet/pipeline.h rename to src/vnet/pipeline.h diff --git a/vnet/vnet/plugin/p1.c b/src/vnet/plugin/p1.c similarity index 100% rename from vnet/vnet/plugin/p1.c rename to src/vnet/plugin/p1.c diff --git a/vnet/vnet/plugin/plugin.h b/src/vnet/plugin/plugin.h similarity index 100% rename from vnet/vnet/plugin/plugin.h rename to src/vnet/plugin/plugin.h diff --git a/vnet/vnet/policer/node_funcs.c b/src/vnet/policer/node_funcs.c similarity index 100% rename from vnet/vnet/policer/node_funcs.c rename to src/vnet/policer/node_funcs.c diff --git a/vnet/vnet/policer/police.h b/src/vnet/policer/police.h similarity index 100% rename from vnet/vnet/policer/police.h rename to src/vnet/policer/police.h diff --git a/vnet/vnet/policer/policer.c b/src/vnet/policer/policer.c similarity index 100% rename from vnet/vnet/policer/policer.c rename to src/vnet/policer/policer.c diff --git a/vnet/vnet/policer/policer.h b/src/vnet/policer/policer.h similarity index 100% rename from vnet/vnet/policer/policer.h rename to src/vnet/policer/policer.h diff --git a/vnet/vnet/policer/xlate.c b/src/vnet/policer/xlate.c similarity index 100% rename from vnet/vnet/policer/xlate.c rename to src/vnet/policer/xlate.c diff --git a/vnet/vnet/policer/xlate.h b/src/vnet/policer/xlate.h similarity index 100% rename from vnet/vnet/policer/xlate.h rename to src/vnet/policer/xlate.h diff --git a/vnet/vnet/ppp/error.def b/src/vnet/ppp/error.def similarity index 100% rename from vnet/vnet/ppp/error.def rename to src/vnet/ppp/error.def diff --git a/vnet/vnet/ppp/node.c b/src/vnet/ppp/node.c similarity index 100% rename from vnet/vnet/ppp/node.c rename to src/vnet/ppp/node.c diff --git a/vnet/vnet/ppp/packet.h b/src/vnet/ppp/packet.h similarity index 100% rename from vnet/vnet/ppp/packet.h rename to src/vnet/ppp/packet.h diff --git a/vnet/vnet/ppp/pg.c b/src/vnet/ppp/pg.c similarity index 100% rename from vnet/vnet/ppp/pg.c rename to src/vnet/ppp/pg.c diff --git a/vnet/vnet/ppp/ppp.c b/src/vnet/ppp/ppp.c similarity index 100% rename from vnet/vnet/ppp/ppp.c rename to src/vnet/ppp/ppp.c diff --git a/vnet/vnet/ppp/ppp.h b/src/vnet/ppp/ppp.h similarity index 100% rename from vnet/vnet/ppp/ppp.h rename to src/vnet/ppp/ppp.h diff --git a/vnet/vnet/replication.c b/src/vnet/replication.c similarity index 100% rename from vnet/vnet/replication.c rename to src/vnet/replication.c diff --git a/vnet/vnet/replication.h b/src/vnet/replication.h similarity index 100% rename from vnet/vnet/replication.h rename to src/vnet/replication.h diff --git a/vnet/vnet/rewrite.c b/src/vnet/rewrite.c similarity index 100% rename from vnet/vnet/rewrite.c rename to src/vnet/rewrite.c diff --git a/vnet/vnet/rewrite.h b/src/vnet/rewrite.h similarity index 100% rename from vnet/vnet/rewrite.h rename to src/vnet/rewrite.h diff --git a/vnet/vnet/snap/node.c b/src/vnet/snap/node.c similarity index 100% rename from vnet/vnet/snap/node.c rename to src/vnet/snap/node.c diff --git a/vnet/vnet/snap/pg.c b/src/vnet/snap/pg.c similarity index 100% rename from vnet/vnet/snap/pg.c rename to src/vnet/snap/pg.c diff --git a/vnet/vnet/snap/snap.c b/src/vnet/snap/snap.c similarity index 100% rename from vnet/vnet/snap/snap.c rename to src/vnet/snap/snap.c diff --git a/vnet/vnet/snap/snap.h b/src/vnet/snap/snap.h similarity index 100% rename from vnet/vnet/snap/snap.h rename to src/vnet/snap/snap.h diff --git a/vnet/vnet/span/node.c b/src/vnet/span/node.c similarity index 100% rename from vnet/vnet/span/node.c rename to src/vnet/span/node.c diff --git a/vnet/vnet/span/span.api b/src/vnet/span/span.api similarity index 100% rename from vnet/vnet/span/span.api rename to src/vnet/span/span.api diff --git a/vnet/vnet/span/span.c b/src/vnet/span/span.c similarity index 100% rename from vnet/vnet/span/span.c rename to src/vnet/span/span.c diff --git a/vnet/vnet/span/span.h b/src/vnet/span/span.h similarity index 100% rename from vnet/vnet/span/span.h rename to src/vnet/span/span.h diff --git a/vnet/vnet/span/span.md b/src/vnet/span/span.md similarity index 100% rename from vnet/vnet/span/span.md rename to src/vnet/span/span.md diff --git a/vnet/vnet/span/span_api.c b/src/vnet/span/span_api.c similarity index 100% rename from vnet/vnet/span/span_api.c rename to src/vnet/span/span_api.c diff --git a/vnet/vnet/sr/dir.dox b/src/vnet/sr/dir.dox similarity index 100% rename from vnet/vnet/sr/dir.dox rename to src/vnet/sr/dir.dox diff --git a/vnet/vnet/sr/examples/sr_multicastmap.script b/src/vnet/sr/examples/sr_multicastmap.script similarity index 100% rename from vnet/vnet/sr/examples/sr_multicastmap.script rename to src/vnet/sr/examples/sr_multicastmap.script diff --git a/vnet/vnet/sr/rfc_draft_05.txt b/src/vnet/sr/rfc_draft_05.txt similarity index 100% rename from vnet/vnet/sr/rfc_draft_05.txt rename to src/vnet/sr/rfc_draft_05.txt diff --git a/vnet/vnet/sr/sr.c b/src/vnet/sr/sr.c similarity index 100% rename from vnet/vnet/sr/sr.c rename to src/vnet/sr/sr.c diff --git a/vnet/vnet/sr/sr.h b/src/vnet/sr/sr.h similarity index 100% rename from vnet/vnet/sr/sr.h rename to src/vnet/sr/sr.h diff --git a/vnet/vnet/sr/sr_error.def b/src/vnet/sr/sr_error.def similarity index 100% rename from vnet/vnet/sr/sr_error.def rename to src/vnet/sr/sr_error.def diff --git a/vnet/vnet/sr/sr_fix_dst_error.def b/src/vnet/sr/sr_fix_dst_error.def similarity index 100% rename from vnet/vnet/sr/sr_fix_dst_error.def rename to src/vnet/sr/sr_fix_dst_error.def diff --git a/vnet/vnet/sr/sr_packet.h b/src/vnet/sr/sr_packet.h similarity index 100% rename from vnet/vnet/sr/sr_packet.h rename to src/vnet/sr/sr_packet.h diff --git a/vnet/vnet/sr/sr_replicate.c b/src/vnet/sr/sr_replicate.c similarity index 100% rename from vnet/vnet/sr/sr_replicate.c rename to src/vnet/sr/sr_replicate.c diff --git a/vnet/vnet/srp/format.c b/src/vnet/srp/format.c similarity index 100% rename from vnet/vnet/srp/format.c rename to src/vnet/srp/format.c diff --git a/vnet/vnet/srp/interface.c b/src/vnet/srp/interface.c similarity index 100% rename from vnet/vnet/srp/interface.c rename to src/vnet/srp/interface.c diff --git a/vnet/vnet/srp/node.c b/src/vnet/srp/node.c similarity index 100% rename from vnet/vnet/srp/node.c rename to src/vnet/srp/node.c diff --git a/vnet/vnet/srp/packet.h b/src/vnet/srp/packet.h similarity index 100% rename from vnet/vnet/srp/packet.h rename to src/vnet/srp/packet.h diff --git a/vnet/vnet/srp/pg.c b/src/vnet/srp/pg.c similarity index 100% rename from vnet/vnet/srp/pg.c rename to src/vnet/srp/pg.c diff --git a/vnet/vnet/srp/srp.h b/src/vnet/srp/srp.h similarity index 100% rename from vnet/vnet/srp/srp.h rename to src/vnet/srp/srp.h diff --git a/vnet/vnet/unix/gdb_funcs.c b/src/vnet/unix/gdb_funcs.c similarity index 100% rename from vnet/vnet/unix/gdb_funcs.c rename to src/vnet/unix/gdb_funcs.c diff --git a/vnet/vnet/unix/pcap.c b/src/vnet/unix/pcap.c similarity index 100% rename from vnet/vnet/unix/pcap.c rename to src/vnet/unix/pcap.c diff --git a/vnet/vnet/unix/pcap.h b/src/vnet/unix/pcap.h similarity index 100% rename from vnet/vnet/unix/pcap.h rename to src/vnet/unix/pcap.h diff --git a/vnet/vnet/unix/pcap2pg.c b/src/vnet/unix/pcap2pg.c similarity index 100% rename from vnet/vnet/unix/pcap2pg.c rename to src/vnet/unix/pcap2pg.c diff --git a/vnet/vnet/unix/tap.api b/src/vnet/unix/tap.api similarity index 100% rename from vnet/vnet/unix/tap.api rename to src/vnet/unix/tap.api diff --git a/vnet/vnet/unix/tap_api.c b/src/vnet/unix/tap_api.c similarity index 100% rename from vnet/vnet/unix/tap_api.c rename to src/vnet/unix/tap_api.c diff --git a/vnet/vnet/unix/tapcli.c b/src/vnet/unix/tapcli.c similarity index 100% rename from vnet/vnet/unix/tapcli.c rename to src/vnet/unix/tapcli.c diff --git a/vnet/vnet/unix/tapcli.h b/src/vnet/unix/tapcli.h similarity index 100% rename from vnet/vnet/unix/tapcli.h rename to src/vnet/unix/tapcli.h diff --git a/vnet/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c similarity index 100% rename from vnet/vnet/unix/tuntap.c rename to src/vnet/unix/tuntap.c diff --git a/vnet/vnet/unix/tuntap.h b/src/vnet/unix/tuntap.h similarity index 100% rename from vnet/vnet/unix/tuntap.h rename to src/vnet/unix/tuntap.h diff --git a/vnet/vnet/vnet.h b/src/vnet/vnet.h similarity index 100% rename from vnet/vnet/vnet.h rename to src/vnet/vnet.h diff --git a/vnet/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h similarity index 100% rename from vnet/vnet/vnet_all_api_h.h rename to src/vnet/vnet_all_api_h.h diff --git a/vnet/vnet/vnet_msg_enum.h b/src/vnet/vnet_msg_enum.h similarity index 100% rename from vnet/vnet/vnet_msg_enum.h rename to src/vnet/vnet_msg_enum.h diff --git a/vnet/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c similarity index 100% rename from vnet/vnet/vxlan-gpe/decap.c rename to src/vnet/vxlan-gpe/decap.c diff --git a/vnet/vnet/vxlan-gpe/dir.dox b/src/vnet/vxlan-gpe/dir.dox similarity index 100% rename from vnet/vnet/vxlan-gpe/dir.dox rename to src/vnet/vxlan-gpe/dir.dox diff --git a/vnet/vnet/vxlan-gpe/encap.c b/src/vnet/vxlan-gpe/encap.c similarity index 100% rename from vnet/vnet/vxlan-gpe/encap.c rename to src/vnet/vxlan-gpe/encap.c diff --git a/vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt b/src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan-gpe-rfc.txt rename to src/vnet/vxlan-gpe/vxlan-gpe-rfc.txt diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.api b/src/vnet/vxlan-gpe/vxlan_gpe.api similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe.api rename to src/vnet/vxlan-gpe/vxlan_gpe.api diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe.c rename to src/vnet/vxlan-gpe/vxlan_gpe.c diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe.h rename to src/vnet/vxlan-gpe/vxlan_gpe.h diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_api.c b/src/vnet/vxlan-gpe/vxlan_gpe_api.c similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe_api.c rename to src/vnet/vxlan-gpe/vxlan_gpe_api.c diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_error.def b/src/vnet/vxlan-gpe/vxlan_gpe_error.def similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe_error.def rename to src/vnet/vxlan-gpe/vxlan_gpe_error.def diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h b/src/vnet/vxlan-gpe/vxlan_gpe_packet.h similarity index 100% rename from vnet/vnet/vxlan-gpe/vxlan_gpe_packet.h rename to src/vnet/vxlan-gpe/vxlan_gpe_packet.h diff --git a/vnet/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c similarity index 100% rename from vnet/vnet/vxlan/decap.c rename to src/vnet/vxlan/decap.c diff --git a/vnet/vnet/vxlan/dir.dox b/src/vnet/vxlan/dir.dox similarity index 100% rename from vnet/vnet/vxlan/dir.dox rename to src/vnet/vxlan/dir.dox diff --git a/vnet/vnet/vxlan/encap.c b/src/vnet/vxlan/encap.c similarity index 100% rename from vnet/vnet/vxlan/encap.c rename to src/vnet/vxlan/encap.c diff --git a/vnet/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api similarity index 100% rename from vnet/vnet/vxlan/vxlan.api rename to src/vnet/vxlan/vxlan.api diff --git a/vnet/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c similarity index 100% rename from vnet/vnet/vxlan/vxlan.c rename to src/vnet/vxlan/vxlan.c diff --git a/vnet/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h similarity index 100% rename from vnet/vnet/vxlan/vxlan.h rename to src/vnet/vxlan/vxlan.h diff --git a/vnet/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c similarity index 100% rename from vnet/vnet/vxlan/vxlan_api.c rename to src/vnet/vxlan/vxlan_api.c diff --git a/vnet/vnet/vxlan/vxlan_error.def b/src/vnet/vxlan/vxlan_error.def similarity index 100% rename from vnet/vnet/vxlan/vxlan_error.def rename to src/vnet/vxlan/vxlan_error.def diff --git a/vnet/vnet/vxlan/vxlan_packet.h b/src/vnet/vxlan/vxlan_packet.h similarity index 100% rename from vnet/vnet/vxlan/vxlan_packet.h rename to src/vnet/vxlan/vxlan_packet.h diff --git a/src/vpp-api-test.am b/src/vpp-api-test.am new file mode 100644 index 00000000000..fe25f6e1c73 --- /dev/null +++ b/src/vpp-api-test.am @@ -0,0 +1,64 @@ +# 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_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_LDFLAGS = $(DPDK_LD_FLAGS) +vpp_api_test_LDADD = \ + libvlib.la \ + libvlib_unix.la \ + libvlibmemoryclient.la \ + libsvm.la \ + libvatplugin.la \ + libvppinfra.la \ + libvlibapi.la \ + libvlibmemory.la \ + libvnet.la \ + $(DPDK_LD_ADD) \ + -lpthread -lm -lrt -ldl -lcrypto + +vpp_json_test_LDADD = libvppinfra.la -lm + +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 + +dist_bin_SCRIPTS += scripts/vppctl + +# vi:syntax=automake diff --git a/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am similarity index 70% rename from vpp-api/python/Makefile.am rename to src/vpp-api/python/Makefile.am index 2a578464d0f..b8ca1530dcf 100644 --- a/vpp-api/python/Makefile.am +++ b/src/vpp-api/python/Makefile.am @@ -11,15 +11,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects +AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -Wall +AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir} BUILT_SOURCES = bin_PROGRAMS = CLEANFILES = lib_LTLIBRARIES = -noinst_PROGRAMS = test_pneum +noinst_PROGRAMS = nobase_include_HEADERS = pneum/pneum.h # @@ -27,8 +27,13 @@ nobase_include_HEADERS = pneum/pneum.h # lib_LTLIBRARIES += libpneum.la libpneum_la_SOURCES = pneum/pneum.c -libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \ - -lm -lrt +libpneum_la_LIBADD = \ + $(top_builddir)/libvppinfra.la \ + $(top_builddir)/libvlibmemoryclient.la \ + $(top_builddir)/libvlibapi.la \ + $(top_builddir)/libsvm.la \ + -lpthread -lm -lrt + libpneum_la_LDFLAGS = -module libpneum_la_CPPFLAGS = @@ -38,14 +43,18 @@ install-exec-local: mkdir -p $(prefix)/lib/python2.7/site-packages; \ PYTHONUSERBASE=$(prefix) \ python setup.py build_ext -L $(prefix)/lib64 \ - -I $(prefix)/../vppinfra/include/ install --user + -I $(prefix)/include/ install --user # # Test client # noinst_PROGRAMS += test_pneum test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c -test_pneum_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \ - -lm -lrt +test_pneum_LDADD = \ + $(top_builddir)/libvppinfra.la \ + $(top_builddir)/libvlibmemoryclient.la \ + $(top_builddir)/libvlibapi.la \ + $(top_builddir)/libsvm.la \ + -lpthread -lm -lrt diff --git a/src/vpp-api/python/README.rst b/src/vpp-api/python/README.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/vpp-api/python/pneum/pneum.c b/src/vpp-api/python/pneum/pneum.c similarity index 98% rename from vpp-api/python/pneum/pneum.c rename to src/vpp-api/python/pneum/pneum.c index 6918cc9b404..b805f04b11e 100644 --- a/vpp-api/python/pneum/pneum.c +++ b/src/vpp-api/python/pneum/pneum.c @@ -31,16 +31,16 @@ #include #include -#include +#include #include "pneum.h" #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun vlib_main_t vlib_global_main; diff --git a/vpp-api/python/pneum/pneum.h b/src/vpp-api/python/pneum/pneum.h similarity index 100% rename from vpp-api/python/pneum/pneum.h rename to src/vpp-api/python/pneum/pneum.h diff --git a/vpp-api/python/pneum/test_pneum.c b/src/vpp-api/python/pneum/test_pneum.c similarity index 98% rename from vpp-api/python/pneum/test_pneum.c rename to src/vpp-api/python/pneum/test_pneum.c index e873114fab9..0d55b8a9b8e 100644 --- a/vpp-api/python/pneum/test_pneum.c +++ b/src/vpp-api/python/pneum/test_pneum.c @@ -36,13 +36,13 @@ #include #include -#include +#include #include #include #include "pneum.h" #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs /* we are not linking with vlib */ diff --git a/vpp-api/python/setup.cfg b/src/vpp-api/python/setup.cfg similarity index 100% rename from vpp-api/python/setup.cfg rename to src/vpp-api/python/setup.cfg diff --git a/vpp-api/python/setup.py b/src/vpp-api/python/setup.py similarity index 100% rename from vpp-api/python/setup.py rename to src/vpp-api/python/setup.py diff --git a/vpp-api/python/tests/test_cli.py b/src/vpp-api/python/tests/test_cli.py similarity index 100% rename from vpp-api/python/tests/test_cli.py rename to src/vpp-api/python/tests/test_cli.py diff --git a/vpp-api/python/tests/test_modules.py b/src/vpp-api/python/tests/test_modules.py similarity index 100% rename from vpp-api/python/tests/test_modules.py rename to src/vpp-api/python/tests/test_modules.py diff --git a/vpp-api/python/tests/test_papi.py b/src/vpp-api/python/tests/test_papi.py similarity index 100% rename from vpp-api/python/tests/test_papi.py rename to src/vpp-api/python/tests/test_papi.py diff --git a/vpp-api/python/tests/test_version.py b/src/vpp-api/python/tests/test_version.py similarity index 100% rename from vpp-api/python/tests/test_version.py rename to src/vpp-api/python/tests/test_version.py diff --git a/vpp-api/python/tests/test_vpp_papi2.py b/src/vpp-api/python/tests/test_vpp_papi2.py similarity index 100% rename from vpp-api/python/tests/test_vpp_papi2.py rename to src/vpp-api/python/tests/test_vpp_papi2.py diff --git a/vpp-api/python/vpp_papi/__init__.py b/src/vpp-api/python/vpp_papi/__init__.py similarity index 100% rename from vpp-api/python/vpp_papi/__init__.py rename to src/vpp-api/python/vpp_papi/__init__.py diff --git a/vpp-api/python/vpp_papi/pneum_wrap.c b/src/vpp-api/python/vpp_papi/pneum_wrap.c similarity index 100% rename from vpp-api/python/vpp_papi/pneum_wrap.c rename to src/vpp-api/python/vpp_papi/pneum_wrap.c diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/src/vpp-api/python/vpp_papi/vpp_papi.py similarity index 100% rename from vpp-api/python/vpp_papi/vpp_papi.py rename to src/vpp-api/python/vpp_papi/vpp_papi.py diff --git a/src/vpp.am b/src/vpp.am new file mode 100644 index 00000000000..a02206f83b1 --- /dev/null +++ b/src/vpp.am @@ -0,0 +1,159 @@ +# 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/stats/stats.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 +endif + +# comment out to disable stats upload to gmond + +bin_vpp_CFLAGS = @APICLI@ +bin_vpp_SOURCES += \ + vpp/api/gmon.c + +nobase_include_HEADERS += \ + vpp/api/vpe_all_api_h.h \ + vpp/api/vpe_msg_enum.h \ + vpp/api/vpe.api.h + +API_FILES += vpp/api/vpe.api + +BUILT_SOURCES += vpp/app/version.h + +vpp/app/version.o: vpp/app/version.h + +.PHONY: vpp/app/version.h + +vpp/app/version.h: + @echo " VERSION " $@ + @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@ + @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@ + @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@ + @echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@ + @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@ + +# Generate a plugin configuration script. Misconfiguring a +# plugin can cause very subtle problems. + +bin_SCRIPTS = vpp_plugin_configure + +BUILT_SOURCES += vpp_plugin_configure + +.PHONY: vpp_plugin_configure + +if WITH_DPDK +PLUGIN_DPDK_ARG="--with-dpdk" +else +PLUGIN_DPDK_ARG="" +endif + +vpp_plugin_configure: + @echo "PLUGIN CONFIGURE " $@ + @echo "#!/bin/bash" > $@ + @echo " " >> $@ + @echo "set +eu" >> $@ + @echo " " >> $@ + @echo "if [ -f ./configure ] ; then" >> $@ + @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ + @echo "else" >> $@ + @echo " if [ -f ../configure ] ; then" >> $@ + @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ + @echo " else" >> $@ + @echo " echo Couldnt find ./configure or ../configure " >> $@ + @echo " exit 1" >> $@ + @echo " fi" >> $@ + @echo "fi" >> $@ + +bin_vpp_LDADD = \ + libvlibapi.la \ + libvlibmemory.la \ + libvlib_unix.la \ + libvlib.la \ + libvnet.la \ + libsvm.la \ + libsvmdb.la \ + libvnetplugin.la \ + -lrt + +bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS) +bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD) + +if WITH_IPV6SR + bin_vpp_LDADD += -lcrypto +endif + +noinst_PROGRAMS += bin/test_client + +bin_test_client_SOURCES = \ + vpp/api/test_client.c + +bin_test_client_LDADD = \ + libvlibmemoryclient.la \ + libvlibapi.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 \ + libvlibapi.la \ + libsvmdb.la \ + libsvm.la \ + libvppinfra.la \ + -lpthread -lm -lrt + +noinst_PROGRAMS += bin/summary_stats_client + +bin_summary_stats_client_SOURCES = \ + vpp/api/summary_stats_client.c + +bin_summary_stats_client_LDADD = \ + libvlibmemoryclient.la \ + libvlibapi.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 + +# vi:syntax=automake diff --git a/vpp/vpp-api/api.c b/src/vpp/api/api.c similarity index 99% rename from vpp/vpp-api/api.c rename to src/vpp/api/api.c index 01022608ac6..6289249c4de 100644 --- a/vpp/vpp-api/api.c +++ b/src/vpp/api/api.c @@ -90,14 +90,15 @@ #include #endif -#include -#include +#include +#include + #include #include #include #include #include -#include +#include #include #include #include @@ -108,15 +109,15 @@ #include #include #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_printfun -#include +#include #undef vl_printfun #include #define foreach_vpe_api_msg \ @@ -4899,7 +4900,7 @@ VLIB_CLI_COMMAND (show_ip_arp_nd_events, static) = { /* *INDENT-ON* */ #define vl_msg_name_crc_list -#include +#include #undef vl_msg_name_crc_list static void diff --git a/src/vpp/api/api_format.c b/src/vpp/api/api_format.c new file mode 120000 index 00000000000..cec72cc0d0f --- /dev/null +++ b/src/vpp/api/api_format.c @@ -0,0 +1 @@ +../../vat/api_format.c \ No newline at end of file diff --git a/vpp/vpp-api/api_main.c b/src/vpp/api/api_main.c similarity index 100% rename from vpp/vpp-api/api_main.c rename to src/vpp/api/api_main.c diff --git a/vpp/vpp-api/custom_dump.c b/src/vpp/api/custom_dump.c similarity index 99% rename from vpp/vpp-api/custom_dump.c rename to src/vpp/api/custom_dump.c index bfebf49fdd8..1964533ee17 100644 --- a/vpp/vpp-api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -37,20 +37,20 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) diff --git a/vpp/vpp-api/gmon.c b/src/vpp/api/gmon.c similarity index 99% rename from vpp/vpp-api/gmon.c rename to src/vpp/api/gmon.c index e5cb1271f6b..20deb6a2792 100644 --- a/vpp/vpp-api/gmon.c +++ b/src/vpp/api/gmon.c @@ -42,7 +42,7 @@ #include #include -#include +#include typedef struct { diff --git a/vpp/vpp-api/json_format.c b/src/vpp/api/json_format.c similarity index 100% rename from vpp/vpp-api/json_format.c rename to src/vpp/api/json_format.c diff --git a/vpp/vpp-api/json_format.h b/src/vpp/api/json_format.h similarity index 100% rename from vpp/vpp-api/json_format.h rename to src/vpp/api/json_format.h diff --git a/vpp/vpp-api/summary_stats_client.c b/src/vpp/api/summary_stats_client.c similarity index 98% rename from vpp/vpp-api/summary_stats_client.c rename to src/vpp/api/summary_stats_client.c index 54e16669c86..03999567d96 100644 --- a/vpp/vpp-api/summary_stats_client.c +++ b/src/vpp/api/summary_stats_client.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include @@ -57,17 +57,17 @@ #define f64_print(a,b) #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun vl_shmem_hdr_t *shmem_hdr; diff --git a/vpp/vpp-api/test_client.c b/src/vpp/api/test_client.c similarity index 99% rename from vpp/vpp-api/test_client.c rename to src/vpp/api/test_client.c index e0d7054a686..5c568950499 100644 --- a/vpp/vpp-api/test_client.c +++ b/src/vpp/api/test_client.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include @@ -56,17 +56,17 @@ #define f64_print(a,b) #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun vl_shmem_hdr_t *shmem_hdr; @@ -1509,7 +1509,7 @@ done: #undef vl_api_version #define vl_api_version(n,v) static u32 vpe_api_version = v; -#include +#include #undef vl_api_version void diff --git a/vpp/vpp-api/test_ha.c b/src/vpp/api/test_ha.c similarity index 96% rename from vpp/vpp-api/test_ha.c rename to src/vpp/api/test_ha.c index 91364d8bc63..3264d5f9daf 100644 --- a/vpp/vpp-api/test_ha.c +++ b/src/vpp/api/test_ha.c @@ -46,10 +46,10 @@ #include #include #include -#include -#include +#include +#include -#include +#include #include @@ -57,17 +57,17 @@ #define f64_print(a,b) #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun vl_shmem_hdr_t *shmem_hdr; diff --git a/src/vpp/api/vat.h b/src/vpp/api/vat.h new file mode 120000 index 00000000000..3adbdbae0db --- /dev/null +++ b/src/vpp/api/vat.h @@ -0,0 +1 @@ +../../vat/vat.h \ No newline at end of file diff --git a/vpp/vpp-api/vpe.api b/src/vpp/api/vpe.api similarity index 100% rename from vpp/vpp-api/vpe.api rename to src/vpp/api/vpe.api diff --git a/vpp/vpp-api/vpe_all_api_h.h b/src/vpp/api/vpe_all_api_h.h similarity index 97% rename from vpp/vpp-api/vpe_all_api_h.h rename to src/vpp/api/vpe_all_api_h.h index 98717eaaa24..397cd8074b3 100644 --- a/vpp/vpp-api/vpe_all_api_h.h +++ b/src/vpp/api/vpe_all_api_h.h @@ -26,7 +26,7 @@ #undef included_from_layer_3 /* Include the current layer (third) vpp API definition layer */ -#include +#include /* * fd.io coding-style-patch-verification: ON diff --git a/vpp/vpp-api/vpe_msg_enum.h b/src/vpp/api/vpe_msg_enum.h similarity index 96% rename from vpp/vpp-api/vpe_msg_enum.h rename to src/vpp/api/vpe_msg_enum.h index 1da3ec0c11f..4fcc1c8cd8e 100644 --- a/vpp/vpp-api/vpe_msg_enum.h +++ b/src/vpp/api/vpe_msg_enum.h @@ -21,7 +21,7 @@ typedef enum { VL_ILLEGAL_MESSAGE_ID = 0, -#include +#include VL_MSG_FIRST_AVAILABLE, } vl_msg_id_t; #undef vl_msg_id diff --git a/vpp/vpp-api/vpp_get_metrics.c b/src/vpp/api/vpp_get_metrics.c similarity index 99% rename from vpp/vpp-api/vpp_get_metrics.c rename to src/vpp/api/vpp_get_metrics.c index bbfa605a5e4..3474133da3f 100644 --- a/vpp/vpp-api/vpp_get_metrics.c +++ b/src/vpp/api/vpp_get_metrics.c @@ -44,7 +44,7 @@ #include #include -#include +#include svmdb_client_t *c; volatile int signal_received; diff --git a/vpp/app/l2t.c b/src/vpp/app/l2t.c similarity index 100% rename from vpp/app/l2t.c rename to src/vpp/app/l2t.c diff --git a/vpp/app/l2t_l2.c b/src/vpp/app/l2t_l2.c similarity index 100% rename from vpp/app/l2t_l2.c rename to src/vpp/app/l2t_l2.c diff --git a/vpp/app/sticky_hash.c b/src/vpp/app/sticky_hash.c similarity index 100% rename from vpp/app/sticky_hash.c rename to src/vpp/app/sticky_hash.c diff --git a/vpp/app/version.c b/src/vpp/app/version.c similarity index 98% rename from vpp/app/version.c rename to src/vpp/app/version.c index f8840811ab4..60844c985f7 100644 --- a/vpp/app/version.c +++ b/src/vpp/app/version.c @@ -14,7 +14,7 @@ */ #include #include -#include +#include #if DPDK > 0 #include diff --git a/vpp/app/vpe_cli.c b/src/vpp/app/vpe_cli.c similarity index 100% rename from vpp/app/vpe_cli.c rename to src/vpp/app/vpe_cli.c diff --git a/vpp/conf/80-vpp.conf b/src/vpp/conf/80-vpp.conf similarity index 100% rename from vpp/conf/80-vpp.conf rename to src/vpp/conf/80-vpp.conf diff --git a/vpp/conf/startup.conf b/src/vpp/conf/startup.conf similarity index 100% rename from vpp/conf/startup.conf rename to src/vpp/conf/startup.conf diff --git a/vpp/conf/startup.uiopcigeneric.conf b/src/vpp/conf/startup.uiopcigeneric.conf similarity index 100% rename from vpp/conf/startup.uiopcigeneric.conf rename to src/vpp/conf/startup.uiopcigeneric.conf diff --git a/vpp/oam/oam.c b/src/vpp/oam/oam.c similarity index 99% rename from vpp/oam/oam.c rename to src/vpp/oam/oam.c index 8bf46cda351..07e17b64196 100644 --- a/vpp/oam/oam.c +++ b/src/vpp/oam/oam.c @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #if DPDK > 0 #include diff --git a/vpp/oam/oam.h b/src/vpp/oam/oam.h similarity index 100% rename from vpp/oam/oam.h rename to src/vpp/oam/oam.h diff --git a/vpp/stats/stats.c b/src/vpp/stats/stats.c similarity index 99% rename from vpp/stats/stats.c rename to src/vpp/stats/stats.c index c46e2d5a44e..391e02f61fc 100644 --- a/vpp/stats/stats.c +++ b/src/vpp/stats/stats.c @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include #include @@ -25,23 +25,23 @@ stats_main_t stats_main; #include -#include +#include #define f64_endian(a) #define f64_print(a,b) #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_printfun -#include +#include #undef vl_printfun #define foreach_stats_msg \ diff --git a/vpp/stats/stats.h b/src/vpp/stats/stats.h similarity index 100% rename from vpp/stats/stats.h rename to src/vpp/stats/stats.h diff --git a/vpp/vnet/main.c b/src/vpp/vnet/main.c similarity index 98% rename from vpp/vnet/main.c rename to src/vpp/vnet/main.c index 56790fda1f0..e4695e1ea4c 100644 --- a/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -19,7 +19,7 @@ #include #include -#include +#include #if DPDK #include @@ -124,7 +124,8 @@ main (int argc, char *argv[]) void vlib_set_get_handoff_structure_cb (void *cb); #if __x86_64__ - const char *msg = "ERROR: This binary requires CPU with %s extensions.\n"; + CLIB_UNUSED (const char *msg) + = "ERROR: This binary requires CPU with %s extensions.\n"; #define _(a,b) \ if (!clib_cpu_supports_ ## a ()) \ { \ diff --git a/vppapigen/Makefile.am b/src/vppapigen.am similarity index 65% rename from vppapigen/Makefile.am rename to src/vppapigen.am index 16a4873696c..083ee53755c 100644 --- a/vppapigen/Makefile.am +++ b/src/vppapigen.am @@ -11,19 +11,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign +bin_PROGRAMS += vppapigen -bin_PROGRAMS = vppapigen -bin_SCRIPTS = +BUILT_SOURCES += tools/vppapigen/gram.h -BUILT_SOURCES = gram.h - -gram.h: gram.y - $(YACC) -d @srcdir@/gram.y - mv y.tab.h gram.h +tools/vppapigen/gram.h: tools/vppapigen/gram.y + $(YACC) -d @srcdir@/tools/vppapigen/gram.y + mv y.tab.h tools/vppapigen/gram.h rm y.tab.c -vppapigen_SOURCES = gram.y lex.c node.c -vppapigen_CPPFLAGS = -vppapigen_LDADD = -lvppinfra +vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex.c tools/vppapigen/node.c +vppapigen_LDADD = libvppinfra.la vppapigen_LDFLAGS = -static + +# vi:syntax=automake diff --git a/vppinfra/Makefile.am b/src/vppinfra.am similarity index 98% rename from vppinfra/Makefile.am rename to src/vppinfra.am index 6183cd7a74e..836c7213d62 100644 --- a/vppinfra/Makefile.am +++ b/src/vppinfra.am @@ -10,12 +10,11 @@ # 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_CPPFLAGS = -Wall -Werror +libvppinfradir = ${libdir} if WITH_UNIX - lib_LTLIBRARIES = libvppinfra.la + libvppinfra_LTLIBRARIES = libvppinfra.la endif lib_LIBRARIES = @@ -270,6 +269,8 @@ libvppinfra_la_SOURCES = \ bin_PROGRAMS = elftool -elftool_SOURCES = tools/elftool.c +elftool_SOURCES = tools/elftool/elftool.c elftool_CPPFLAGS = $(AM_CPPFLAGS) elftool_LDADD = libvppinfra.la -lpthread -lrt -lm + +# vi:syntax=automake diff --git a/vppinfra/README b/src/vppinfra/README similarity index 100% rename from vppinfra/README rename to src/vppinfra/README diff --git a/vppinfra/vppinfra/anneal.c b/src/vppinfra/anneal.c similarity index 100% rename from vppinfra/vppinfra/anneal.c rename to src/vppinfra/anneal.c diff --git a/vppinfra/vppinfra/anneal.h b/src/vppinfra/anneal.h similarity index 100% rename from vppinfra/vppinfra/anneal.h rename to src/vppinfra/anneal.h diff --git a/vppinfra/vppinfra/asm_mips.h b/src/vppinfra/asm_mips.h similarity index 100% rename from vppinfra/vppinfra/asm_mips.h rename to src/vppinfra/asm_mips.h diff --git a/vppinfra/vppinfra/asm_x86.c b/src/vppinfra/asm_x86.c similarity index 100% rename from vppinfra/vppinfra/asm_x86.c rename to src/vppinfra/asm_x86.c diff --git a/vppinfra/vppinfra/asm_x86.h b/src/vppinfra/asm_x86.h similarity index 100% rename from vppinfra/vppinfra/asm_x86.h rename to src/vppinfra/asm_x86.h diff --git a/vppinfra/vppinfra/backtrace.c b/src/vppinfra/backtrace.c similarity index 100% rename from vppinfra/vppinfra/backtrace.c rename to src/vppinfra/backtrace.c diff --git a/vppinfra/vppinfra/bihash_24_8.h b/src/vppinfra/bihash_24_8.h similarity index 100% rename from vppinfra/vppinfra/bihash_24_8.h rename to src/vppinfra/bihash_24_8.h diff --git a/vppinfra/vppinfra/bihash_8_8.h b/src/vppinfra/bihash_8_8.h similarity index 100% rename from vppinfra/vppinfra/bihash_8_8.h rename to src/vppinfra/bihash_8_8.h diff --git a/vppinfra/vppinfra/bihash_doc.h b/src/vppinfra/bihash_doc.h similarity index 100% rename from vppinfra/vppinfra/bihash_doc.h rename to src/vppinfra/bihash_doc.h diff --git a/vppinfra/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c similarity index 100% rename from vppinfra/vppinfra/bihash_template.c rename to src/vppinfra/bihash_template.c diff --git a/vppinfra/vppinfra/bihash_template.h b/src/vppinfra/bihash_template.h similarity index 100% rename from vppinfra/vppinfra/bihash_template.h rename to src/vppinfra/bihash_template.h diff --git a/vppinfra/vppinfra/bitmap.h b/src/vppinfra/bitmap.h similarity index 100% rename from vppinfra/vppinfra/bitmap.h rename to src/vppinfra/bitmap.h diff --git a/vppinfra/vppinfra/bitops.h b/src/vppinfra/bitops.h similarity index 100% rename from vppinfra/vppinfra/bitops.h rename to src/vppinfra/bitops.h diff --git a/vppinfra/vppinfra/byte_order.h b/src/vppinfra/byte_order.h similarity index 100% rename from vppinfra/vppinfra/byte_order.h rename to src/vppinfra/byte_order.h diff --git a/vppinfra/vppinfra/cache.h b/src/vppinfra/cache.h similarity index 100% rename from vppinfra/vppinfra/cache.h rename to src/vppinfra/cache.h diff --git a/vppinfra/vppinfra/clib.h b/src/vppinfra/clib.h similarity index 100% rename from vppinfra/vppinfra/clib.h rename to src/vppinfra/clib.h diff --git a/vppinfra/vppinfra/cpu.c b/src/vppinfra/cpu.c similarity index 100% rename from vppinfra/vppinfra/cpu.c rename to src/vppinfra/cpu.c diff --git a/vppinfra/vppinfra/cpu.h b/src/vppinfra/cpu.h similarity index 100% rename from vppinfra/vppinfra/cpu.h rename to src/vppinfra/cpu.h diff --git a/vppinfra/vppinfra/dir.dox b/src/vppinfra/dir.dox similarity index 100% rename from vppinfra/vppinfra/dir.dox rename to src/vppinfra/dir.dox diff --git a/vppinfra/vppinfra/dlist.h b/src/vppinfra/dlist.h similarity index 100% rename from vppinfra/vppinfra/dlist.h rename to src/vppinfra/dlist.h diff --git a/vppinfra/vppinfra/elf.c b/src/vppinfra/elf.c similarity index 99% rename from vppinfra/vppinfra/elf.c rename to src/vppinfra/elf.c index 84d6282f1f7..931fbcccc48 100644 --- a/vppinfra/vppinfra/elf.c +++ b/src/vppinfra/elf.c @@ -1219,7 +1219,7 @@ elf_get_section_contents_with_starting_address (elf_main_t * em, uword elt_size, u32 * section_index_result) { - elf_section_t *s; + elf_section_t *s = 0; clib_error_t *error; error = elf_get_section_by_start_address (em, start_address, &s); @@ -1273,7 +1273,7 @@ elf_parse_dynamic (elf_main_t * em) case ELF_DYNAMIC_ENTRY_SYMBOL_TABLE: { - elf_section_t *s; + elf_section_t *s = 0; clib_error_t *error; error = elf_get_section_by_start_address (em, e->data, &s); @@ -1947,7 +1947,7 @@ error: clib_error_t * elf_delete_named_section (elf_main_t * em, char *section_name) { - elf_section_t *s; + elf_section_t *s = 0; clib_error_t *error; error = elf_get_section_by_name (em, section_name, &s); diff --git a/vppinfra/vppinfra/elf.h b/src/vppinfra/elf.h similarity index 100% rename from vppinfra/vppinfra/elf.h rename to src/vppinfra/elf.h diff --git a/vppinfra/vppinfra/elf_clib.c b/src/vppinfra/elf_clib.c similarity index 100% rename from vppinfra/vppinfra/elf_clib.c rename to src/vppinfra/elf_clib.c diff --git a/vppinfra/vppinfra/elf_clib.h b/src/vppinfra/elf_clib.h similarity index 100% rename from vppinfra/vppinfra/elf_clib.h rename to src/vppinfra/elf_clib.h diff --git a/vppinfra/vppinfra/elog.c b/src/vppinfra/elog.c similarity index 100% rename from vppinfra/vppinfra/elog.c rename to src/vppinfra/elog.c diff --git a/vppinfra/vppinfra/elog.h b/src/vppinfra/elog.h similarity index 100% rename from vppinfra/vppinfra/elog.h rename to src/vppinfra/elog.h diff --git a/vppinfra/vppinfra/error.c b/src/vppinfra/error.c similarity index 100% rename from vppinfra/vppinfra/error.c rename to src/vppinfra/error.c diff --git a/vppinfra/vppinfra/error.h b/src/vppinfra/error.h similarity index 100% rename from vppinfra/vppinfra/error.h rename to src/vppinfra/error.h diff --git a/vppinfra/vppinfra/error_bootstrap.h b/src/vppinfra/error_bootstrap.h similarity index 100% rename from vppinfra/vppinfra/error_bootstrap.h rename to src/vppinfra/error_bootstrap.h diff --git a/vppinfra/vppinfra/fheap.c b/src/vppinfra/fheap.c similarity index 100% rename from vppinfra/vppinfra/fheap.c rename to src/vppinfra/fheap.c diff --git a/vppinfra/vppinfra/fheap.h b/src/vppinfra/fheap.h similarity index 100% rename from vppinfra/vppinfra/fheap.h rename to src/vppinfra/fheap.h diff --git a/vppinfra/vppinfra/fifo.c b/src/vppinfra/fifo.c similarity index 100% rename from vppinfra/vppinfra/fifo.c rename to src/vppinfra/fifo.c diff --git a/vppinfra/vppinfra/fifo.h b/src/vppinfra/fifo.h similarity index 100% rename from vppinfra/vppinfra/fifo.h rename to src/vppinfra/fifo.h diff --git a/vppinfra/vppinfra/format.c b/src/vppinfra/format.c similarity index 100% rename from vppinfra/vppinfra/format.c rename to src/vppinfra/format.c diff --git a/vppinfra/vppinfra/format.h b/src/vppinfra/format.h similarity index 100% rename from vppinfra/vppinfra/format.h rename to src/vppinfra/format.h diff --git a/vppinfra/vppinfra/graph.c b/src/vppinfra/graph.c similarity index 100% rename from vppinfra/vppinfra/graph.c rename to src/vppinfra/graph.c diff --git a/vppinfra/vppinfra/graph.h b/src/vppinfra/graph.h similarity index 100% rename from vppinfra/vppinfra/graph.h rename to src/vppinfra/graph.h diff --git a/vppinfra/vppinfra/hash.c b/src/vppinfra/hash.c similarity index 100% rename from vppinfra/vppinfra/hash.c rename to src/vppinfra/hash.c diff --git a/vppinfra/vppinfra/hash.h b/src/vppinfra/hash.h similarity index 100% rename from vppinfra/vppinfra/hash.h rename to src/vppinfra/hash.h diff --git a/vppinfra/vppinfra/heap.c b/src/vppinfra/heap.c similarity index 100% rename from vppinfra/vppinfra/heap.c rename to src/vppinfra/heap.c diff --git a/vppinfra/vppinfra/heap.h b/src/vppinfra/heap.h similarity index 100% rename from vppinfra/vppinfra/heap.h rename to src/vppinfra/heap.h diff --git a/vppinfra/vppinfra/longjmp.S b/src/vppinfra/longjmp.S similarity index 100% rename from vppinfra/vppinfra/longjmp.S rename to src/vppinfra/longjmp.S diff --git a/vppinfra/vppinfra/longjmp.h b/src/vppinfra/longjmp.h similarity index 100% rename from vppinfra/vppinfra/longjmp.h rename to src/vppinfra/longjmp.h diff --git a/vppinfra/vppinfra/macros.c b/src/vppinfra/macros.c similarity index 100% rename from vppinfra/vppinfra/macros.c rename to src/vppinfra/macros.c diff --git a/vppinfra/vppinfra/macros.h b/src/vppinfra/macros.h similarity index 100% rename from vppinfra/vppinfra/macros.h rename to src/vppinfra/macros.h diff --git a/vppinfra/vppinfra/math.h b/src/vppinfra/math.h similarity index 100% rename from vppinfra/vppinfra/math.h rename to src/vppinfra/math.h diff --git a/vppinfra/vppinfra/md5.c b/src/vppinfra/md5.c similarity index 100% rename from vppinfra/vppinfra/md5.c rename to src/vppinfra/md5.c diff --git a/vppinfra/vppinfra/md5.h b/src/vppinfra/md5.h similarity index 100% rename from vppinfra/vppinfra/md5.h rename to src/vppinfra/md5.h diff --git a/vppinfra/vppinfra/mem.h b/src/vppinfra/mem.h similarity index 100% rename from vppinfra/vppinfra/mem.h rename to src/vppinfra/mem.h diff --git a/vppinfra/vppinfra/mem_mheap.c b/src/vppinfra/mem_mheap.c similarity index 100% rename from vppinfra/vppinfra/mem_mheap.c rename to src/vppinfra/mem_mheap.c diff --git a/vppinfra/vppinfra/memcheck.h b/src/vppinfra/memcheck.h similarity index 100% rename from vppinfra/vppinfra/memcheck.h rename to src/vppinfra/memcheck.h diff --git a/vppinfra/vppinfra/memcpy_avx.h b/src/vppinfra/memcpy_avx.h similarity index 100% rename from vppinfra/vppinfra/memcpy_avx.h rename to src/vppinfra/memcpy_avx.h diff --git a/vppinfra/vppinfra/memcpy_sse3.h b/src/vppinfra/memcpy_sse3.h similarity index 100% rename from vppinfra/vppinfra/memcpy_sse3.h rename to src/vppinfra/memcpy_sse3.h diff --git a/vppinfra/vppinfra/mhash.c b/src/vppinfra/mhash.c similarity index 100% rename from vppinfra/vppinfra/mhash.c rename to src/vppinfra/mhash.c diff --git a/vppinfra/vppinfra/mhash.h b/src/vppinfra/mhash.h similarity index 100% rename from vppinfra/vppinfra/mhash.h rename to src/vppinfra/mhash.h diff --git a/vppinfra/vppinfra/mheap.c b/src/vppinfra/mheap.c similarity index 100% rename from vppinfra/vppinfra/mheap.c rename to src/vppinfra/mheap.c diff --git a/vppinfra/vppinfra/mheap.h b/src/vppinfra/mheap.h similarity index 100% rename from vppinfra/vppinfra/mheap.h rename to src/vppinfra/mheap.h diff --git a/vppinfra/vppinfra/mheap_bootstrap.h b/src/vppinfra/mheap_bootstrap.h similarity index 100% rename from vppinfra/vppinfra/mheap_bootstrap.h rename to src/vppinfra/mheap_bootstrap.h diff --git a/vppinfra/vppinfra/mod_test_hash.c b/src/vppinfra/mod_test_hash.c similarity index 100% rename from vppinfra/vppinfra/mod_test_hash.c rename to src/vppinfra/mod_test_hash.c diff --git a/vppinfra/vppinfra/os.h b/src/vppinfra/os.h similarity index 100% rename from vppinfra/vppinfra/os.h rename to src/vppinfra/os.h diff --git a/vppinfra/vppinfra/pfhash.c b/src/vppinfra/pfhash.c similarity index 100% rename from vppinfra/vppinfra/pfhash.c rename to src/vppinfra/pfhash.c diff --git a/vppinfra/vppinfra/pfhash.h b/src/vppinfra/pfhash.h similarity index 100% rename from vppinfra/vppinfra/pfhash.h rename to src/vppinfra/pfhash.h diff --git a/vppinfra/vppinfra/phash.c b/src/vppinfra/phash.c similarity index 100% rename from vppinfra/vppinfra/phash.c rename to src/vppinfra/phash.c diff --git a/vppinfra/vppinfra/phash.h b/src/vppinfra/phash.h similarity index 100% rename from vppinfra/vppinfra/phash.h rename to src/vppinfra/phash.h diff --git a/vppinfra/vppinfra/pipeline.h b/src/vppinfra/pipeline.h similarity index 100% rename from vppinfra/vppinfra/pipeline.h rename to src/vppinfra/pipeline.h diff --git a/vppinfra/vppinfra/pool.h b/src/vppinfra/pool.h similarity index 100% rename from vppinfra/vppinfra/pool.h rename to src/vppinfra/pool.h diff --git a/vppinfra/vppinfra/ptclosure.c b/src/vppinfra/ptclosure.c similarity index 100% rename from vppinfra/vppinfra/ptclosure.c rename to src/vppinfra/ptclosure.c diff --git a/vppinfra/vppinfra/ptclosure.h b/src/vppinfra/ptclosure.h similarity index 100% rename from vppinfra/vppinfra/ptclosure.h rename to src/vppinfra/ptclosure.h diff --git a/vppinfra/vppinfra/qhash.c b/src/vppinfra/qhash.c similarity index 100% rename from vppinfra/vppinfra/qhash.c rename to src/vppinfra/qhash.c diff --git a/vppinfra/vppinfra/qhash.h b/src/vppinfra/qhash.h similarity index 100% rename from vppinfra/vppinfra/qhash.h rename to src/vppinfra/qhash.h diff --git a/vppinfra/vppinfra/qsort.c b/src/vppinfra/qsort.c similarity index 100% rename from vppinfra/vppinfra/qsort.c rename to src/vppinfra/qsort.c diff --git a/vppinfra/vppinfra/random.c b/src/vppinfra/random.c similarity index 100% rename from vppinfra/vppinfra/random.c rename to src/vppinfra/random.c diff --git a/vppinfra/vppinfra/random.h b/src/vppinfra/random.h similarity index 100% rename from vppinfra/vppinfra/random.h rename to src/vppinfra/random.h diff --git a/vppinfra/vppinfra/random_buffer.c b/src/vppinfra/random_buffer.c similarity index 100% rename from vppinfra/vppinfra/random_buffer.c rename to src/vppinfra/random_buffer.c diff --git a/vppinfra/vppinfra/random_buffer.h b/src/vppinfra/random_buffer.h similarity index 100% rename from vppinfra/vppinfra/random_buffer.h rename to src/vppinfra/random_buffer.h diff --git a/vppinfra/vppinfra/random_isaac.c b/src/vppinfra/random_isaac.c similarity index 100% rename from vppinfra/vppinfra/random_isaac.c rename to src/vppinfra/random_isaac.c diff --git a/vppinfra/vppinfra/random_isaac.h b/src/vppinfra/random_isaac.h similarity index 100% rename from vppinfra/vppinfra/random_isaac.h rename to src/vppinfra/random_isaac.h diff --git a/vppinfra/vppinfra/serialize.c b/src/vppinfra/serialize.c similarity index 100% rename from vppinfra/vppinfra/serialize.c rename to src/vppinfra/serialize.c diff --git a/vppinfra/vppinfra/serialize.h b/src/vppinfra/serialize.h similarity index 100% rename from vppinfra/vppinfra/serialize.h rename to src/vppinfra/serialize.h diff --git a/vppinfra/vppinfra/slist.c b/src/vppinfra/slist.c similarity index 100% rename from vppinfra/vppinfra/slist.c rename to src/vppinfra/slist.c diff --git a/vppinfra/vppinfra/slist.h b/src/vppinfra/slist.h similarity index 100% rename from vppinfra/vppinfra/slist.h rename to src/vppinfra/slist.h diff --git a/vppinfra/vppinfra/smp.c b/src/vppinfra/smp.c similarity index 100% rename from vppinfra/vppinfra/smp.c rename to src/vppinfra/smp.c diff --git a/vppinfra/vppinfra/smp.h b/src/vppinfra/smp.h similarity index 100% rename from vppinfra/vppinfra/smp.h rename to src/vppinfra/smp.h diff --git a/vppinfra/vppinfra/smp_fifo.c b/src/vppinfra/smp_fifo.c similarity index 100% rename from vppinfra/vppinfra/smp_fifo.c rename to src/vppinfra/smp_fifo.c diff --git a/vppinfra/vppinfra/smp_fifo.h b/src/vppinfra/smp_fifo.h similarity index 100% rename from vppinfra/vppinfra/smp_fifo.h rename to src/vppinfra/smp_fifo.h diff --git a/vppinfra/vppinfra/socket.c b/src/vppinfra/socket.c similarity index 100% rename from vppinfra/vppinfra/socket.c rename to src/vppinfra/socket.c diff --git a/vppinfra/vppinfra/socket.h b/src/vppinfra/socket.h similarity index 100% rename from vppinfra/vppinfra/socket.h rename to src/vppinfra/socket.h diff --git a/vppinfra/vppinfra/sparse_vec.h b/src/vppinfra/sparse_vec.h similarity index 100% rename from vppinfra/vppinfra/sparse_vec.h rename to src/vppinfra/sparse_vec.h diff --git a/vppinfra/vppinfra/std-formats.c b/src/vppinfra/std-formats.c similarity index 100% rename from vppinfra/vppinfra/std-formats.c rename to src/vppinfra/std-formats.c diff --git a/vppinfra/vppinfra/string.c b/src/vppinfra/string.c similarity index 100% rename from vppinfra/vppinfra/string.c rename to src/vppinfra/string.c diff --git a/vppinfra/vppinfra/string.h b/src/vppinfra/string.h similarity index 100% rename from vppinfra/vppinfra/string.h rename to src/vppinfra/string.h diff --git a/vppinfra/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c similarity index 100% rename from vppinfra/vppinfra/test_bihash_template.c rename to src/vppinfra/test_bihash_template.c diff --git a/vppinfra/vppinfra/test_dlist.c b/src/vppinfra/test_dlist.c similarity index 100% rename from vppinfra/vppinfra/test_dlist.c rename to src/vppinfra/test_dlist.c diff --git a/vppinfra/vppinfra/test_elf.c b/src/vppinfra/test_elf.c similarity index 100% rename from vppinfra/vppinfra/test_elf.c rename to src/vppinfra/test_elf.c diff --git a/vppinfra/vppinfra/test_elog.c b/src/vppinfra/test_elog.c similarity index 100% rename from vppinfra/vppinfra/test_elog.c rename to src/vppinfra/test_elog.c diff --git a/vppinfra/vppinfra/test_fifo.c b/src/vppinfra/test_fifo.c similarity index 100% rename from vppinfra/vppinfra/test_fifo.c rename to src/vppinfra/test_fifo.c diff --git a/vppinfra/vppinfra/test_format.c b/src/vppinfra/test_format.c similarity index 100% rename from vppinfra/vppinfra/test_format.c rename to src/vppinfra/test_format.c diff --git a/vppinfra/vppinfra/test_hash.c b/src/vppinfra/test_hash.c similarity index 100% rename from vppinfra/vppinfra/test_hash.c rename to src/vppinfra/test_hash.c diff --git a/vppinfra/vppinfra/test_heap.c b/src/vppinfra/test_heap.c similarity index 100% rename from vppinfra/vppinfra/test_heap.c rename to src/vppinfra/test_heap.c diff --git a/vppinfra/vppinfra/test_longjmp.c b/src/vppinfra/test_longjmp.c similarity index 100% rename from vppinfra/vppinfra/test_longjmp.c rename to src/vppinfra/test_longjmp.c diff --git a/vppinfra/vppinfra/test_macros.c b/src/vppinfra/test_macros.c similarity index 100% rename from vppinfra/vppinfra/test_macros.c rename to src/vppinfra/test_macros.c diff --git a/vppinfra/vppinfra/test_md5.c b/src/vppinfra/test_md5.c similarity index 100% rename from vppinfra/vppinfra/test_md5.c rename to src/vppinfra/test_md5.c diff --git a/vppinfra/vppinfra/test_mheap.c b/src/vppinfra/test_mheap.c similarity index 100% rename from vppinfra/vppinfra/test_mheap.c rename to src/vppinfra/test_mheap.c diff --git a/vppinfra/vppinfra/test_pfhash.c b/src/vppinfra/test_pfhash.c similarity index 100% rename from vppinfra/vppinfra/test_pfhash.c rename to src/vppinfra/test_pfhash.c diff --git a/vppinfra/vppinfra/test_phash.c b/src/vppinfra/test_phash.c similarity index 100% rename from vppinfra/vppinfra/test_phash.c rename to src/vppinfra/test_phash.c diff --git a/vppinfra/vppinfra/test_pool.c b/src/vppinfra/test_pool.c similarity index 100% rename from vppinfra/vppinfra/test_pool.c rename to src/vppinfra/test_pool.c diff --git a/vppinfra/vppinfra/test_pool_iterate.c b/src/vppinfra/test_pool_iterate.c similarity index 100% rename from vppinfra/vppinfra/test_pool_iterate.c rename to src/vppinfra/test_pool_iterate.c diff --git a/vppinfra/vppinfra/test_ptclosure.c b/src/vppinfra/test_ptclosure.c similarity index 100% rename from vppinfra/vppinfra/test_ptclosure.c rename to src/vppinfra/test_ptclosure.c diff --git a/vppinfra/vppinfra/test_qhash.c b/src/vppinfra/test_qhash.c similarity index 100% rename from vppinfra/vppinfra/test_qhash.c rename to src/vppinfra/test_qhash.c diff --git a/vppinfra/vppinfra/test_random.c b/src/vppinfra/test_random.c similarity index 100% rename from vppinfra/vppinfra/test_random.c rename to src/vppinfra/test_random.c diff --git a/vppinfra/vppinfra/test_random_isaac.c b/src/vppinfra/test_random_isaac.c similarity index 100% rename from vppinfra/vppinfra/test_random_isaac.c rename to src/vppinfra/test_random_isaac.c diff --git a/vppinfra/vppinfra/test_serialize.c b/src/vppinfra/test_serialize.c similarity index 100% rename from vppinfra/vppinfra/test_serialize.c rename to src/vppinfra/test_serialize.c diff --git a/vppinfra/vppinfra/test_slist.c b/src/vppinfra/test_slist.c similarity index 100% rename from vppinfra/vppinfra/test_slist.c rename to src/vppinfra/test_slist.c diff --git a/vppinfra/vppinfra/test_socket.c b/src/vppinfra/test_socket.c similarity index 100% rename from vppinfra/vppinfra/test_socket.c rename to src/vppinfra/test_socket.c diff --git a/vppinfra/vppinfra/test_time.c b/src/vppinfra/test_time.c similarity index 100% rename from vppinfra/vppinfra/test_time.c rename to src/vppinfra/test_time.c diff --git a/vppinfra/vppinfra/test_timing_wheel.c b/src/vppinfra/test_timing_wheel.c similarity index 100% rename from vppinfra/vppinfra/test_timing_wheel.c rename to src/vppinfra/test_timing_wheel.c diff --git a/vppinfra/vppinfra/test_vec.c b/src/vppinfra/test_vec.c similarity index 100% rename from vppinfra/vppinfra/test_vec.c rename to src/vppinfra/test_vec.c diff --git a/vppinfra/vppinfra/test_vec.h b/src/vppinfra/test_vec.h similarity index 100% rename from vppinfra/vppinfra/test_vec.h rename to src/vppinfra/test_vec.h diff --git a/vppinfra/vppinfra/test_vhash.c b/src/vppinfra/test_vhash.c similarity index 100% rename from vppinfra/vppinfra/test_vhash.c rename to src/vppinfra/test_vhash.c diff --git a/vppinfra/vppinfra/test_zvec.c b/src/vppinfra/test_zvec.c similarity index 100% rename from vppinfra/vppinfra/test_zvec.c rename to src/vppinfra/test_zvec.c diff --git a/vppinfra/vppinfra/time.c b/src/vppinfra/time.c similarity index 100% rename from vppinfra/vppinfra/time.c rename to src/vppinfra/time.c diff --git a/vppinfra/vppinfra/time.h b/src/vppinfra/time.h similarity index 100% rename from vppinfra/vppinfra/time.h rename to src/vppinfra/time.h diff --git a/vppinfra/vppinfra/timer.c b/src/vppinfra/timer.c similarity index 100% rename from vppinfra/vppinfra/timer.c rename to src/vppinfra/timer.c diff --git a/vppinfra/vppinfra/timer.h b/src/vppinfra/timer.h similarity index 100% rename from vppinfra/vppinfra/timer.h rename to src/vppinfra/timer.h diff --git a/vppinfra/vppinfra/timing_wheel.c b/src/vppinfra/timing_wheel.c similarity index 100% rename from vppinfra/vppinfra/timing_wheel.c rename to src/vppinfra/timing_wheel.c diff --git a/vppinfra/vppinfra/timing_wheel.h b/src/vppinfra/timing_wheel.h similarity index 100% rename from vppinfra/vppinfra/timing_wheel.h rename to src/vppinfra/timing_wheel.h diff --git a/vppinfra/vppinfra/types.h b/src/vppinfra/types.h similarity index 100% rename from vppinfra/vppinfra/types.h rename to src/vppinfra/types.h diff --git a/vppinfra/vppinfra/unformat.c b/src/vppinfra/unformat.c similarity index 100% rename from vppinfra/vppinfra/unformat.c rename to src/vppinfra/unformat.c diff --git a/vppinfra/vppinfra/unix-formats.c b/src/vppinfra/unix-formats.c similarity index 100% rename from vppinfra/vppinfra/unix-formats.c rename to src/vppinfra/unix-formats.c diff --git a/vppinfra/vppinfra/unix-kelog.c b/src/vppinfra/unix-kelog.c similarity index 100% rename from vppinfra/vppinfra/unix-kelog.c rename to src/vppinfra/unix-kelog.c diff --git a/vppinfra/vppinfra/unix-misc.c b/src/vppinfra/unix-misc.c similarity index 100% rename from vppinfra/vppinfra/unix-misc.c rename to src/vppinfra/unix-misc.c diff --git a/vppinfra/vppinfra/unix.h b/src/vppinfra/unix.h similarity index 100% rename from vppinfra/vppinfra/unix.h rename to src/vppinfra/unix.h diff --git a/vppinfra/unix_error.def b/src/vppinfra/unix_error.def similarity index 100% rename from vppinfra/unix_error.def rename to src/vppinfra/unix_error.def diff --git a/vppinfra/vppinfra/valgrind.h b/src/vppinfra/valgrind.h similarity index 100% rename from vppinfra/vppinfra/valgrind.h rename to src/vppinfra/valgrind.h diff --git a/vppinfra/vppinfra/vec.c b/src/vppinfra/vec.c similarity index 100% rename from vppinfra/vppinfra/vec.c rename to src/vppinfra/vec.c diff --git a/vppinfra/vppinfra/vec.h b/src/vppinfra/vec.h similarity index 100% rename from vppinfra/vppinfra/vec.h rename to src/vppinfra/vec.h diff --git a/vppinfra/vppinfra/vec_bootstrap.h b/src/vppinfra/vec_bootstrap.h similarity index 100% rename from vppinfra/vppinfra/vec_bootstrap.h rename to src/vppinfra/vec_bootstrap.h diff --git a/vppinfra/vppinfra/vector.c b/src/vppinfra/vector.c similarity index 100% rename from vppinfra/vppinfra/vector.c rename to src/vppinfra/vector.c diff --git a/vppinfra/vppinfra/vector.h b/src/vppinfra/vector.h similarity index 100% rename from vppinfra/vppinfra/vector.h rename to src/vppinfra/vector.h diff --git a/vppinfra/vppinfra/vector_altivec.h b/src/vppinfra/vector_altivec.h similarity index 100% rename from vppinfra/vppinfra/vector_altivec.h rename to src/vppinfra/vector_altivec.h diff --git a/vppinfra/vppinfra/vector_funcs.h b/src/vppinfra/vector_funcs.h similarity index 100% rename from vppinfra/vppinfra/vector_funcs.h rename to src/vppinfra/vector_funcs.h diff --git a/vppinfra/vppinfra/vector_iwmmxt.h b/src/vppinfra/vector_iwmmxt.h similarity index 100% rename from vppinfra/vppinfra/vector_iwmmxt.h rename to src/vppinfra/vector_iwmmxt.h diff --git a/vppinfra/vppinfra/vector_neon.h b/src/vppinfra/vector_neon.h similarity index 100% rename from vppinfra/vppinfra/vector_neon.h rename to src/vppinfra/vector_neon.h diff --git a/vppinfra/vppinfra/vector_sse2.h b/src/vppinfra/vector_sse2.h similarity index 100% rename from vppinfra/vppinfra/vector_sse2.h rename to src/vppinfra/vector_sse2.h diff --git a/vppinfra/vppinfra/vhash.c b/src/vppinfra/vhash.c similarity index 100% rename from vppinfra/vppinfra/vhash.c rename to src/vppinfra/vhash.c diff --git a/vppinfra/vppinfra/vhash.h b/src/vppinfra/vhash.h similarity index 100% rename from vppinfra/vppinfra/vhash.h rename to src/vppinfra/vhash.h diff --git a/vppinfra/vppinfra/vm_linux_kernel.h b/src/vppinfra/vm_linux_kernel.h similarity index 100% rename from vppinfra/vppinfra/vm_linux_kernel.h rename to src/vppinfra/vm_linux_kernel.h diff --git a/vppinfra/vppinfra/vm_standalone.h b/src/vppinfra/vm_standalone.h similarity index 100% rename from vppinfra/vppinfra/vm_standalone.h rename to src/vppinfra/vm_standalone.h diff --git a/vppinfra/vppinfra/vm_unix.h b/src/vppinfra/vm_unix.h similarity index 100% rename from vppinfra/vppinfra/vm_unix.h rename to src/vppinfra/vm_unix.h diff --git a/vppinfra/vppinfra/xxhash.h b/src/vppinfra/xxhash.h similarity index 100% rename from vppinfra/vppinfra/xxhash.h rename to src/vppinfra/xxhash.h diff --git a/vppinfra/vppinfra/xy.h b/src/vppinfra/xy.h similarity index 100% rename from vppinfra/vppinfra/xy.h rename to src/vppinfra/xy.h diff --git a/vppinfra/vppinfra/zvec.c b/src/vppinfra/zvec.c similarity index 100% rename from vppinfra/vppinfra/zvec.c rename to src/vppinfra/zvec.c diff --git a/vppinfra/vppinfra/zvec.h b/src/vppinfra/zvec.h similarity index 100% rename from vppinfra/vppinfra/zvec.h rename to src/vppinfra/zvec.h diff --git a/svm/configure.ac b/svm/configure.ac deleted file mode 100644 index 40b09606477..00000000000 --- a/svm/configure.ac +++ /dev/null @@ -1,7 +0,0 @@ -AC_INIT(svm, 1.0) -LT_INIT -AM_INIT_AUTOMAKE - -AM_SILENT_RULES([yes]) - -AC_OUTPUT([Makefile]) diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac deleted file mode 100644 index f0aa308346b..00000000000 --- a/vlib-api/configure.ac +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(vlibapi, 1.0) -LT_INIT -AM_INIT_AUTOMAKE - -AM_SILENT_RULES([yes]) - -AC_PROG_CC - -AC_OUTPUT([Makefile]) diff --git a/vlib-api/suffix-rules.mk b/vlib-api/suffix-rules.mk deleted file mode 120000 index f609840001f..00000000000 --- a/vlib-api/suffix-rules.mk +++ /dev/null @@ -1 +0,0 @@ -../build-data/suffix-rules.mk \ No newline at end of file diff --git a/vlib/.gitignore b/vlib/.gitignore deleted file mode 100644 index b25c15b81fa..00000000000 --- a/vlib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/vlib/configure.ac b/vlib/configure.ac deleted file mode 100644 index f7079e64dbd..00000000000 --- a/vlib/configure.ac +++ /dev/null @@ -1,25 +0,0 @@ -AC_INIT(vlib, 1.1) -LT_INIT -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_CC - -AC_ARG_WITH(dpdk, - AC_HELP_STRING([--with-dpdk],[Use DPDK]), - [with_dpdk=1], - [with_dpdk=0]) - -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(WITH_DPDK, test "$with_dpdk" = "1") -AC_SUBST(DPDK,[-DDPDK=${with_dpdk}]) -AC_SUBST(PRE_DATA_SIZE,[$with_pre_data]) - -AC_OUTPUT([Makefile]) diff --git a/vlib/dir.dox b/vlib/dir.dox deleted file mode 100644 index 99027f6c1eb..00000000000 --- a/vlib/dir.dox +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * Copyright (c) 2016 Comcast Cable Communications Management, LLC. - * - * 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. - */ -/* Doxygen directory documentation */ -/** -@dir -@brief VLIB application library. -*/ diff --git a/vnet/.gitignore b/vnet/.gitignore deleted file mode 100644 index b25c15b81fa..00000000000 --- a/vnet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/vnet/configure.ac b/vnet/configure.ac deleted file mode 100644 index 6a5281b0986..00000000000 --- a/vnet/configure.ac +++ /dev/null @@ -1,49 +0,0 @@ -AC_INIT(vnet, 1.1) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADERS(config/config.h) -LT_INIT -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_CC - -AC_ARG_WITH(dpdk, - AC_HELP_STRING([--with-dpdk],[Use DPDK]), - [with_dpdk=1], - [with_dpdk=0]) - -AC_ARG_WITH(dpdk_crypto, - AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]), - [with_dpdk_crypto=1], - [with_dpdk_crypto=0]) - -AC_ARG_WITH(ipsec, - AC_HELP_STRING([--without-ipsec],[Disable ipsec]), - [with_ipsec=0], - [with_ipsec=1]) - -AC_ARG_WITH(ipv6sr, - AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]), - [with_ipv6sr=0], - [with_ipv6sr=1]) - -AC_ARG_ENABLE(tests, - AC_HELP_STRING([--enable-tests], [Build unit tests]), - [enable_tests=1], - [enable_tests=0]) - -AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1") -AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}]) - -AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") -AC_SUBST(DPDK,[-DDPDK=${with_dpdk}]) - -AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1") -AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}]) - -AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1") -AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}]) - -AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1") - -AC_OUTPUT([Makefile]) diff --git a/vnet/suffix-rules.mk b/vnet/suffix-rules.mk deleted file mode 120000 index f609840001f..00000000000 --- a/vnet/suffix-rules.mk +++ /dev/null @@ -1 +0,0 @@ -../build-data/suffix-rules.mk \ No newline at end of file diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am deleted file mode 100644 index 27466fad2ca..00000000000 --- a/vpp-api-test/Makefile.am +++ /dev/null @@ -1,37 +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. - -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall @Q_PLATFORM_DEFINE@ @Q_PLATFORM_PLUGPATH@ @DPDK@ @DPDK_CRYPTO@ - -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 = -lvlibmemoryclient -lvlibapi -lsvm \ - -lvppinfra -lpthread -lm \ - -lrt -ldl libvatplugin.la -vpp_json_test_LDADD = -lvppinfra -lm -nobase_include_HEADERS = vat/vat.h vat/json_format.h - -vpp_restart_SOURCES = vat/restart.c -vpp_restart_LDADD = -lsvmdb -lsvm -lvppinfra -lpthread -lrt - -dist_bin_SCRIPTS = scripts/vppctl diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac deleted file mode 100644 index cf0af125253..00000000000 --- a/vpp-api-test/configure.ac +++ /dev/null @@ -1,40 +0,0 @@ -AC_INIT(vpp-api-test, 1.0) -LT_INIT -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_CC - -AC_ARG_WITH(q-plugin-prefix, - AC_HELP_STRING([--with-q-plugin-prefix],[vlib plugin prefix]), - [case $with_q_plugin_prefix in - *) ;; - esac]) - -AC_ARG_WITH(q-platform, - AC_HELP_STRING([--with-q-platform],[Build version for given platform (qnative)]), - [case $with_q_platform in - qnative) ;; - vpp) with_q_platform=vpp;; - *) with_q_platform=qnative;; - esac]) - -AC_ARG_WITH(dpdk, - AC_HELP_STRING([--with-dpdk],[Use DPDK]), - [with_dpdk=1], - [with_dpdk=0]) - -AC_ARG_WITH(dpdk_crypto, - AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]), - [with_dpdk_crypto=1], - [with_dpdk_crypto=0]) - -AC_SUBST(Q_PLATFORM_DEFINE,[-DQ_PLATFORM_${with_q_platform}]) -AC_SUBST(Q_PLATFORM_PLUGPATH,[-DQ_PLUGIN_PREFIX=${with_q_plugin_prefix}]) -AC_SUBST(DPDK,[-DDPDK=${with_dpdk}]) -AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") -AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}]) -AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1") - - -AC_OUTPUT([Makefile]) diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am index 1812b63765c..b50522ef3e3 100644 --- a/vpp-api/Makefile.am +++ b/vpp-api/Makefile.am @@ -1,2 +1,4 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = python java +SUBDIRS = java + +# vi:syntax=automake diff --git a/vpp-api/configure.ac b/vpp-api/configure.ac index 3d7bf251108..278041c78ed 100644 --- a/vpp-api/configure.ac +++ b/vpp-api/configure.ac @@ -7,7 +7,6 @@ AM_SILENT_RULES([yes]) AC_PROG_CC -AC_OUTPUT([python/Makefile]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index 92b8c264158..b055196510b 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -84,8 +84,7 @@ packagedir_jvpp_core = io/fd/vpp/jvpp/core BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h JSON_FILES = \ - $(prefix)/../vpp/vpp-api/vpe.api.json \ - $(wildcard $(prefix)/../vnet/vnet/*.api.json) + $(wildcard $(prefix)/../vpp/share/vpp/api/core/*.api.json) jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \ jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h \ diff --git a/vpp-api/java/jvpp-core/jvpp_core.c b/vpp-api/java/jvpp-core/jvpp_core.c index 107fa78880c..ef4cb8e3e7e 100644 --- a/vpp-api/java/jvpp-core/jvpp_core.c +++ b/vpp-api/java/jvpp-core/jvpp_core.c @@ -15,18 +15,18 @@ #include -#include +#include #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun -#include +#include #undef vl_endianfun #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun #include diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c index 7e199b81777..cbd5e0ab39a 100644 --- a/vpp-api/java/jvpp-registry/jvpp_registry.c +++ b/vpp-api/java/jvpp-registry/jvpp_registry.c @@ -16,7 +16,7 @@ #include #define vl_api_version(n,v) static u32 vpe_api_version = (v); -#include +#include #undef vl_api_version @@ -25,19 +25,19 @@ #include "io_fd_vpp_jvpp_VppJNIConnection.h" #include "io_fd_vpp_jvpp_JVppRegistryImpl.h" -#include +#include #define vl_typedefs /* define message structures */ -#include +#include #undef vl_typedefs #define vl_endianfun -#include +#include #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include +#include #undef vl_printfun vlib_main_t vlib_global_main; diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py index b1cd84c4ad1..5f8df2a9602 100755 --- a/vpp-api/java/jvpp/gen/jvpp_gen.py +++ b/vpp-api/java/jvpp/gen/jvpp_gen.py @@ -30,6 +30,8 @@ from jvppgen import jvpp_impl_gen from jvppgen import jvpp_c_gen from jvppgen import util +blacklist = [ "memclnt.api", "flowperpkt.api" ] + # Invocation: # ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp # ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py @@ -55,6 +57,9 @@ print "plugin_name %s" % plugin_name cfg = {} for inputfile in args.inputfiles: + if any(substring in inputfile for substring in blacklist): + print "WARNING: Imput file %s blacklisted" % inputfile + continue _cfg = json.load(open(inputfile, 'r')) if 'types' in cfg: cfg['types'].extend(_cfg['types']) diff --git a/vpp/Makefile.am b/vpp/Makefile.am deleted file mode 100644 index 25d72749f3d..00000000000 --- a/vpp/Makefile.am +++ /dev/null @@ -1,166 +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. - -AUTOMAKE_OPTIONS = foreign subdir-objects - -AM_CFLAGS = -Wall @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @VCGN@ @IPV6SR@ @APICLI@ - -noinst_PROGRAMS = -BUILT_SOURCES = -bin_PROGRAMS = -CLEANFILES = - -bin_PROGRAMS += vpp - -vpp_SOURCES = \ - vnet/main.c \ - app/vpe_cli.c \ - app/version.c \ - oam/oam.c \ - stats/stats.c - -vpp_SOURCES += \ - vpp-api/api.c \ - vpp-api/custom_dump.c \ - vpp-api/json_format.c - -if WITH_APICLI - vpp_SOURCES += \ - vpp-api/api_format.c \ - vpp-api/api_main.c -endif - - -# comment out to disable stats upload to gmond - -vpp_SOURCES += \ - vpp-api/gmon.c - -nobase_include_HEADERS = \ - vpp-api/vpe_all_api_h.h \ - vpp-api/vpe_msg_enum.h \ - vpp-api/vpe.api.h - -# install the API definition, so we can produce java bindings, etc. - -apidir = $(prefix)/vpp-api -api_DATA = vpp-api/vpe.api.json - -BUILT_SOURCES += vpp-api/vpe.api.h app/version.h vpp-api/vpe.api.json - -app/version.o: app/version.h - -.PHONY: app/version.h - -app/version.h: - @echo " VERSION " $@ - @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@ - @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@ - @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@ - @echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@ - @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@ - -# Generate a plugin configuration script. Misconfiguring a -# plugin can cause very subtle problems. - -bin_SCRIPTS = vpp_plugin_configure - -BUILT_SOURCES += vpp_plugin_configure - -.PHONY: vpp_plugin_configure - -if WITH_DPDK -PLUGIN_DPDK_ARG="--with-dpdk" -else -PLUGIN_DPDK_ARG="" -endif - -vpp_plugin_configure: - @echo "PLUGIN CONFIGURE " $@ - @echo "#!/bin/bash" > $@ - @echo " " >> $@ - @echo "set +eu" >> $@ - @echo " " >> $@ - @echo "if [ -f ./configure ] ; then" >> $@ - @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ - @echo "else" >> $@ - @echo " if [ -f ../configure ] ; then" >> $@ - @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ - @echo " else" >> $@ - @echo " echo Couldnt find ./configure or ../configure " >> $@ - @echo " exit 1" >> $@ - @echo " fi" >> $@ - @echo "fi" >> $@ - -vpp_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib - -vpp_LDADD += -lvnet - -vpp_LDADD += -lsvm -lsvmdb -lrt - -vpp_LDADD += -lvnetplugin - -if WITH_DPDK -vpp_LDFLAGS = -Wl,--whole-archive -if ENABLE_DPDK_SHARED -vpp_LDFLAGS += -ldpdk -else -vpp_LDFLAGS += -l:libdpdk.a -endif -vpp_LDFLAGS += -Wl,--no-whole-archive -if WITH_DPDK_CRYPTO -vpp_LDADD += -L$(AESNI_MULTI_BUFFER_LIB_PATH) -lIPSec_MB -endif -if WITH_DPDK_MLX5_PMD -vpp_LDFLAGS += -libverbs -lmlx5 -lnuma -endif -endif - -vpp_LDADD += -lvppinfra -lm -lpthread -ldl - -if WITH_IPV6SR - vpp_LDADD += -lcrypto -endif - -# Set the suffix list -SUFFIXES = .api.h .api .api.json - -# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk -# and requires a symbolic link at the top of the vpp source tree - -include $(top_srcdir)/suffix-rules.mk - -noinst_PROGRAMS += test_client - -test_client_SOURCES = vpp-api/test_client.c -test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ - -lpthread -lm -lrt - -noinst_PROGRAMS += test_client test_ha - -test_ha_SOURCES = vpp-api/test_ha.c -test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \ - -lpthread -lm -lrt - - -noinst_PROGRAMS += summary_stats_client - -summary_stats_client_SOURCES = vpp-api/summary_stats_client.c -summary_stats_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ - -lpthread -lm -lrt - -bin_PROGRAMS += vpp_get_metrics - -vpp_get_metrics_SOURCES = vpp-api/vpp_get_metrics.c -vpp_get_metrics_LDADD = -lsvmdb -lsvm -lvppinfra \ - -lpthread -lm -lrt diff --git a/vpp/configure.ac b/vpp/configure.ac deleted file mode 100644 index 8c333fd1679..00000000000 --- a/vpp/configure.ac +++ /dev/null @@ -1,80 +0,0 @@ -AC_INIT(vpp, 1.1) -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_CC - -AC_ARG_WITH(dpdk, - AC_HELP_STRING([--with-dpdk],[Use DPDK]), - [with_dpdk=1], - [with_dpdk=0]) - -AC_ARG_WITH(dpdk_crypto, - AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]), - [with_dpdk_crypto=1], - [with_dpdk_crypto=0]) - -AC_ARG_WITH(dpdk_mlx5_pmd, - AC_HELP_STRING([--with-dpdk-mlx5-pmd],[Use Mellanox ConnetxX-4 DPDK PMD]), - [with_dpdk_mlx5_pmd=1], - [with_dpdk_mlx5_pmd=0]) - -AC_ARG_ENABLE(dpdk-shared, - AC_HELP_STRING([--enable-dpdk-shared],[Link with DPDK shared lib]), - [enable_dpdk_shared=1], - [enable_dpdk_shared=0]) - -AC_ARG_WITH(ipsec, - AC_HELP_STRING([--without-ipsec],[Disable ipsec]), - [with_ipsec=0], - [with_ipsec=1]) - -AC_ARG_WITH(vcgn, - AC_HELP_STRING([--without-vcgn],[Disable vcgn]), - [with_vcgn=0], - [with_vcgn=1]) - -AC_ARG_WITH(ipv6sr, - AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]), - [with_ipv6sr=0], - [with_ipv6sr=1]) - -AC_ARG_WITH(apicli, - AC_HELP_STRING([--without-apicli],[Disable binary api CLI]), - [with_apicli=0], - [with_apicli=1]) - -AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1") -AM_CONDITIONAL(ENABLE_DPDK_SHARED, test "$enable_dpdk_shared" = "1") -AC_SUBST(DPDK,["-DDPDK=${with_dpdk} -DDPDK_SHARED_LIB=${enable_dpdk_shared}"]) -AM_CONDITIONAL(WITH_DPDK_CRYPTO, test "$with_dpdk_crypto" = "1") -AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}]) -AM_CONDITIONAL(WITH_DPDK_MLX5_PMD, test "$with_dpdk_mlx5_pmd" = "1") - -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])], - ) - ], -) - -AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1") -AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}]) - -AM_CONDITIONAL(WITH_VCGN, test "$with_vcgn" = "1") -AC_SUBST(VCGN,[-DVCGN=${with_vcgn}]) - -AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1") -AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}]) - -AM_CONDITIONAL(WITH_APICLI, test "$with_apicli" = "1") -AC_SUBST(APICLI,[-DVPP_API_TEST_BUILTIN=${with_apicli}]) - -AC_OUTPUT([Makefile]) diff --git a/vpp/suffix-rules.mk b/vpp/suffix-rules.mk deleted file mode 120000 index f609840001f..00000000000 --- a/vpp/suffix-rules.mk +++ /dev/null @@ -1 +0,0 @@ -../build-data/suffix-rules.mk \ No newline at end of file diff --git a/vpp/vpp-api/api_format.c b/vpp/vpp-api/api_format.c deleted file mode 120000 index f37e6575b2d..00000000000 --- a/vpp/vpp-api/api_format.c +++ /dev/null @@ -1 +0,0 @@ -../../vpp-api-test/vat/api_format.c \ No newline at end of file diff --git a/vpp/vpp-api/vat.h b/vpp/vpp-api/vat.h deleted file mode 120000 index b7a00e900f5..00000000000 --- a/vpp/vpp-api/vat.h +++ /dev/null @@ -1 +0,0 @@ -../../vpp-api-test/vat/vat.h \ No newline at end of file diff --git a/vppinfra/.gitignore b/vppinfra/.gitignore deleted file mode 100644 index b25c15b81fa..00000000000 --- a/vppinfra/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/vppinfra/INSTALL b/vppinfra/INSTALL deleted file mode 100644 index 23e5f25d0e5..00000000000 --- a/vppinfra/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/vppinfra/Make.defs b/vppinfra/Make.defs deleted file mode 100644 index dcb51e16ab7..00000000000 --- a/vppinfra/Make.defs +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (c) 2001, 2002 Eliot Dresselhaus -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# Basic toolchain defines. -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld -AR = $(CROSS_COMPILE)ar -RANLIB = $(CROSS_COMPILE)ranlib -INSTALL = install - -ifneq ($(origin CROSS_COMPILE), undefined) - IS_CROSS_COMPILE=yes -endif - -CLIB_ARCH = $(shell $(CC) -dumpmachine) - -# Where to get linux kernel includes. -# By default get linux includes from /usr/include/linux... -KERNEL_PREFIX ?= /usr - -# Where to find compiler include directory (since we may -# be using -nostdinc). -CC_PREFIX = $(shell dirname `$(CC) --print-libgcc-file-name`) - -# Where to get LIBC includes for cross compiles -LIBC_PREFIX ?= $(CC_PREFIX)/../../../../$(CLIB_ARCH) - -# Where to find CLIB includes/libraries for cross compiles -CLIB_PREFIX ?= /usr/local/$(CLIB_ARCH) - -OBJ = $(CLIB_ARCH).o -SHARED_OBJ = shared.$(OBJ) -KERNEL_OBJ = kernel.$(OBJ) -MODULE_OBJ = module.$(OBJ) - -DEP = $(CLIB_ARCH).d -SHARED_DEP = shared.$(DEP) -KERNEL_DEP = kernel.$(DEP) - -STATIC_LIB = $(CLIB_ARCH).a -SHARED_LIB = $(CLIB_ARCH).so -KERNEL_LIB = kernel.$(CLIB_ARCH).a - -STATIC_CFLAGS = $(DEFAULT_CFLAGS) -SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC - -# Compile flags common to user/kernel -CLIB_COMMON_CFLAGS += -Wall - -DEBUG ?= no -ifeq ($(DEBUG),yes) - COPTS ?= -g -O0 - CLIB_COMMON_CFLAGS += -DDEBUG -else - COPTS ?= -O2 -endif - -CLIB_COMMON_CFLAGS += $(COPTS) - -CLIB_USER_CFLAGS = $(CLIB_COMMON_CFLAGS) - -ifeq ($(IS_CROSS_COMPILE),yes) - CLIB_USER_CFLAGS += -nostdinc - CLIB_USER_CFLAGS += -idirafter $(CC_PREFIX)/include - CLIB_USER_CFLAGS += -idirafter $(KERNEL_PREFIX)/include - CLIB_USER_CFLAGS += -idirafter $(LIBC_PREFIX)/include - CLIB_COMMON_CFLAGS += -idirafter $(CLIB_PREFIX)/include -endif - -STATIC_CFLAGS = $(CLIB_USER_CFLAGS) -SHARED_CFLAGS = $(STATIC_CFLAGS) -fPIC - -%.$(SHARED_OBJ): %.c - $(CC) -c $(SHARED_CFLAGS) -o $@ $< - -%.$(OBJ): %.c - $(CC) -c $(STATIC_CFLAGS) -o $@ $< - -# Kernel version of clib - -CLIB_KERNEL_CFLAGS = $(CLIB_COMMON_CFLAGS) - -CLIB_KERNEL_CFLAGS += -nostdinc -CLIB_KERNEL_CFLAGS += -idirafter $(CC_PREFIX)/include -CLIB_KERNEL_CFLAGS += -idirafter $(KERNEL_PREFIX)/include - -# Kernel always uses mheap allocator (no malloc) -CLIB_KERNEL_CFLAGS += -DCLIB_MEM_MHEAP - -CLIB_KERNEL_CFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB - -CLIB_KERNEL_CFLAGS += -fno-common -fomit-frame-pointer -fno-strict-aliasing - -ifeq ($(findstring mips,$(CLIB_ARCH)),mips) - CLIB_KERNEL_CFLAGS += -G0 \ - -mno-abicalls -fno-pic -mlong-calls \ - -mcpu=r8000 -mips2 -Wa,--trap -endif - -%.$(KERNEL_OBJ): %.c - $(CC) $(CLIB_KERNEL_CFLAGS) -c -o $@ $< - -# Dependencies -%.$(DEP): %.c - $(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(OBJ):/ > $@ - -%.$(SHARED_DEP): %.c - $(CC) $(CLIB_USER_CFLAGS) -c -M $< | sed -e s/.o:/.$(SHARED_OBJ):/ > $@ - -%.$(KERNEL_DEP): %.c - $(CC) $(CLIB_KERNEL_CFLAGS) -c -M $< | sed -e s/.o:/.$(KERNEL_OBJ):/ > $@ diff --git a/vppinfra/configure.ac b/vppinfra/configure.ac deleted file mode 100644 index 88939383057..00000000000 --- a/vppinfra/configure.ac +++ /dev/null @@ -1,52 +0,0 @@ -# Process this file with autoconf to produce a configure script. -AC_INIT(libvppinfra,1.0,) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADERS(config/config.h) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2]) -AM_SILENT_RULES([yes]) - -# Checks for programs. -AC_PROG_CC -AM_PROG_AS -AM_PROG_LIBTOOL - -###################################################################### - -dnl ------------ -dnl Check CFLAGS, CC -dnl ------------ -AC_ARG_WITH(cc, - AC_HELP_STRING([--with-cc],[Set CC for use as C compiler.]), - [CC="$with_cc"]) - -AC_ARG_WITH(cflags, - AC_HELP_STRING([--with-cflags],[Set CFLAGS for use by C compiler.]), - [CFLAGS="$with_cflags"]) - -AC_ARG_WITH(ldflags, - AC_HELP_STRING([--with-ldflags],[Set LDFLAGS for linking.]), - [LDFLAGS="$with_ldflags"]) - -###################################################################### - -AC_ARG_ENABLE(tests, - AC_HELP_STRING([--enable-tests],[Enable unit tests]), - [enable_tests=1], - [enable_tests=0]) - -AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1") - -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_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/vppinfra/dir.dox b/vppinfra/dir.dox deleted file mode 100644 index dee0cd9cd43..00000000000 --- a/vppinfra/dir.dox +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2016 Cisco and/or its affiliates. - * Copyright (c) 2016 Comcast Cable Communications Management, LLC. - * - * 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. - */ -/** @dir - * @brief VPP infrastructure library and tools. - */ diff --git a/vppinfra/mkinstalldirs b/vppinfra/mkinstalldirs deleted file mode 100755 index d2d5f21b611..00000000000 --- a/vppinfra/mkinstalldirs +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here