X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=ad604765637c9e167cbecebd41ca1999337fb8f6;hb=1b1ee4f2e550d2cf98e5e5f718ad5543389c8c37;hp=d3088d241616755019c716456047d2925bc146a5;hpb=3535222f979742d65c28a312d415aa6831f816d6;p=vpp.git

diff --git a/Makefile b/Makefile
index d3088d24161..ad604765637 100644
--- a/Makefile
+++ b/Makefile
@@ -49,11 +49,12 @@ endif
 
 ifeq ($(findstring y,$(UNATTENDED)),y)
 CONFIRM=-y
+FORCE=--force-yes
 endif
 
 .PHONY: help bootstrap 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 doxygen wipe-doxygen
+.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release
 
 help:
 	@echo "Make Targets:"
@@ -128,11 +129,11 @@ bootstrap: $(BR)/.bootstrap.ok
 install-dep:
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
-	@sudo -E apt-get $(CONFIRM) install software-properties-common
-	@sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
+	@sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
 	@sudo -E apt-get update
 endif
-	@sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo yum install $(CONFIRM) $(RPM_DEPENDS)
@@ -163,20 +164,22 @@ wipe-release: $(BR)/.bootstrap.ok
 rebuild-release: wipe-release build-release
 
 plugins: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM)_debug,sample-plugin-install)
+	$(call make,$(PLATFORM)_debug,plugins-install)
 
 plugins-release: $(BR)/.bootstrap.ok
-	$(call make,$(PLATFORM),sample-plugin-install)
+	$(call make,$(PLATFORM),plugins-install)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
 	@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
 	@echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
+	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
 	@cd $(STARTUP_DIR) && sudo $(1) $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
+	@sudo rm -f /dev/shm/vpe-api /dev/shm/db /dev/shm/global_vm
 	@cd $(STARTUP_DIR) && sudo $(1) -c $(STARTUP_CONF)
 endef
 endif
@@ -216,6 +219,9 @@ ctags: ctags.files
 	@ctags --totals --tag-relative -L $<
 	@rm $<
 
+gtags: ctags
+	@gtags --gtagslabel=ctags
+
 cscope: cscope.files
 	@cscope -b -q -v