Reorganize source tree to use single autotools instance

Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23
Signed-off-by: Damjan Marion <damarion@cisco.com>

22 files changed, 23 insertions, 332 deletions

diff --git a/build-data/packages/cavium-dpdk.mk b/build-data/packages/cavium-dpdk.mk
deleted file mode 100644
index ce8ee228..00000000
--- 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 258eff1d..9b760e63 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 a6ba42d0..6fa7e0f1 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 300f902b..e582c316 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 44a8e2bd..b4d67a28 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/build-data/packages/src.mk b/build-data/packages/src.mk
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/build-data/packages/src.mk
diff --git a/build-data/packages/svm.mk b/build-data/packages/svm.mk
deleted file mode 100644
index 3971fe82..00000000
--- 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 7a4fe2cd..00000000
--- 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 29b0d17d..00000000
--- 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 0f2f132d..00000000
--- 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 2172708d..00000000
--- 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 4c35b04d..00000000
--- 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 e352317f..00000000
--- 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 c9eae367..00000000
--- 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 4937023a..d9e8d72e 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 704e3a95..00000000
--- 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 a3d60528..fe68cd82 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 6ca6eb24..00000000
--- 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 a568c7a0..88dd3ed8 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 97ddc57d..513a4db4 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 ef2ec444..55805d10 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-data/suffix-rules.mk b/build-data/suffix-rules.mk
deleted file mode 100644
index e3eeb922..00000000
--- a/build-data/suffix-rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Shared suffix rules
-# Please do not set "SUFFIXES = .api.h .api" here
-
-%.api.h: %.api
-	@echo "  APIGEN  " $@ ;					\
-	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 $@