X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=0ea903c3d8f1691a2951137d3a8e7c6e55f18b64;hb=c03742346f0f3f08b83b0d2944bf72e19ea26191;hp=9782a2dc70ebc09c2d7e014f2e6c12e714f306ca;hpb=9d7a7ba3666c9d3a8e4bc06f6b22dc8267604c45;p=vpp.git

diff --git a/Makefile b/Makefile
index 9782a2dc70e..0ea903c3d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ ifneq ($(SAMPLE_PLUGIN),no)
 TARGETS += sample-plugin
 endif
 
-.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
+.PHONY: help wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
@@ -156,7 +156,6 @@ endif
 
 help:
 	@echo "Make Targets:"
-	@echo " bootstrap           - prepare tree for build"
 	@echo " install-dep         - install software dependencies"
 	@echo " wipe                - wipe all products of debug build "
 	@echo " wipe-release        - wipe all products of release build "
@@ -225,7 +224,7 @@ help:
 	@echo " SAMPLE_PLUGIN     = $(SAMPLE_PLUGIN)"
 	@echo " DISABLED_PLUGINS  = $(DISABLED_PLUGINS)"
 
-$(BR)/.bootstrap.ok:
+$(BR)/.deps.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
 	make install-dep
 endif
@@ -248,30 +247,11 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 	  exit 1 ; \
 	fi ; \
 	exit 0
-endif
-	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
-	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
-	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
-	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
-	@echo 'export CCACHE_DIR=$(CCACHE_DIR)'           >> $(BR)/path_setup
-
-ifeq ("$(wildcard /usr/bin/ccache )","")
-	@echo "WARNING: Please install ccache AYEC and re-run this script"
-else
-	@rm -rf $(BR)/tools/ccache-bin
-	@mkdir -p $(BR)/tools/ccache-bin
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/clang
-	@ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/clang++
-	@mkdir -p $(BR)/tools/bin
-	@rm -f $(BR)/tools/bin/vppapigen
-	@ln -s $(WS_ROOT)/src/tools/vppapigen/vppapigen \
-	       $(BR)/tools/bin/vppapigen
 endif
 	@touch $@
 
-bootstrap: $(BR)/.bootstrap.ok
+bootstrap:
+	@echo "'make bootstrap' is not needed anymore"
 
 install-dep:
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
@@ -331,21 +311,21 @@ dist:
 	@$(RM) $(BR)/vpp-latest.tar.xz
 	@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
-build: $(BR)/.bootstrap.ok
+build: $(BR)/.deps.ok
 	$(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
 
 wipedist:
 	@$(RM) $(BR)/*.tar.xz
 
-wipe: wipedist test-wipe $(BR)/.bootstrap.ok
+wipe: wipedist test-wipe $(BR)/.deps.ok
 	$(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
 
 rebuild: wipe build
 
-build-release: $(BR)/.bootstrap.ok
+build-release: $(BR)/.deps.ok
 	$(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
 
-wipe-release: test-wipe $(BR)/.bootstrap.ok
+wipe-release: test-wipe $(BR)/.deps.ok
 	$(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
 
 rebuild-release: wipe-release build-release
@@ -371,17 +351,17 @@ define test
 	  $(3)
 endef
 
-test: bootstrap
+test:
 	$(call test,vpp,vpp,test)
 
-test-debug: bootstrap
+test-debug:
 	$(call test,vpp,vpp_debug,test)
 
-test-all: bootstrap
+test-all:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp,test)
 
-test-all-debug: bootstrap
+test-all-debug:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_debug,test)
 
@@ -391,10 +371,10 @@ test-help:
 test-wipe:
 	@make -C test wipe
 
-test-shell: bootstrap
+test-shell:
 	$(call test,vpp,vpp,shell)
 
-test-shell-debug: bootstrap
+test-shell-debug:
 	$(call test,vpp,vpp_debug,shell)
 
 test-doc:
@@ -403,7 +383,7 @@ test-doc:
 test-wipe-doc:
 	@make -C test wipe-doc
 
-test-cov: bootstrap
+test-cov:
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_gcov,cov)
 
@@ -521,7 +501,7 @@ define banner
 	@echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
+verify: install-dep $(BR)/.deps.ok dpdk-install-dev
 	$(call banner,"Building for PLATFORM=vpp using gcc")
 	@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)