X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=94ba90d0821c82ea79febadaf3b46b284df41f64;hb=889178c02a711fbc66d83415a88608f704fbc561;hp=dee25667db6bbf3a5d4422341fa41f0c9b8fc716;hpb=b585097048884e063ac25aecc26a6802ee3faa4d;p=vpp.git

diff --git a/Makefile b/Makefile
index dee25667db6..94ba90d0821 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed
 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 += doxygen graphviz
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -39,9 +40,8 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-#RPM_DEPENDS += doxygen # TODO
+RPM_DEPENDS += doxygen graphviz
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
-#EPEL_DEPENDS += graphviz # TODO
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -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
+.PHONY: ctags cscope doxygen wipe-doxygen plugins plugins-release
 
 help:
 	@echo "Make Targets:"
@@ -75,6 +76,8 @@ help:
 	@echo " pkg-rpm             - build RPM packages"
 	@echo " ctags               - (re)generate ctags database"
 	@echo " cscope              - (re)generate cscope database"
+	@echo " doxygen             - (re)generate documentation"
+	@echo " wipe-doxygen        - wipe all generated documentation"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
@@ -104,7 +107,7 @@ ifeq ($(OS_ID),ubuntu)
 	fi ; \
 	exit 0
 endif
-	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
+	@echo "SOURCE_PATH = $(WS_ROOT) $(WS_ROOT)/plugins"> $(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
@@ -126,11 +129,11 @@ bootstrap: $(BR)/.bootstrap.ok
 install-dep:
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),14.04)
-	@sudo apt-get $(CONFIRM) install software-properties-common
-	@sudo add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
-	@sudo apt-get update
+	@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 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)
@@ -160,15 +163,23 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
+plugins: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM)_debug,plugins-install)
+
+plugins-release: $(BR)/.bootstrap.ok
+	$(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
@@ -212,6 +223,10 @@ cscope: cscope.files
 	@cscope -b -q -v
 
 
+#
+# Build the documentation
+#
+
 DOXY_INPUT = \
 	README.md \
 	vppinfra \
@@ -222,7 +237,6 @@ DOXY_INPUT = \
 	vpp \
 	vpp-api
 
-.PHONY: doxygen
 doxygen:
 	@mkdir -p "$(BR)/docs"
 	ROOT="$(WS_ROOT)" \