VPP-61 Patch1/2 - Remove NSH from VPP

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f9a9543..2dd38fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,12 +28,19 @@ OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
+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
+       DEB_DEPENDS += default-jdk-headless
+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 graphviz
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -46,7 +53,7 @@ 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
 
 help:
        @echo "Make Targets:"
@@ -68,6 +75,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"
@@ -119,16 +128,16 @@ 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) install software-properties-common
+       @sudo -E add-apt-repository $(CONFIRM) ppa:openjdk-r/ppa
+       @sudo -E apt-get update
 endif
-       @sudo apt-get $(CONFIRM) install $(DEB_DEPENDS)
+       @sudo -E apt-get $(CONFIRM) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
        @sudo yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
-       @sudo debuginfo-install glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+       @sudo debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
 else
        $(error "This option currently works only on Ubuntu or Centos systems")
 endif
@@ -204,3 +213,29 @@ ctags: ctags.files
 cscope: cscope.files
        @cscope -b -q -v
 
+
+#
+# Build the documentation
+#
+
+DOXY_INPUT = \
+       README.md \
+       vppinfra \
+       svm \
+       vlib \
+       vlib-api \
+       vnet \
+       vpp \
+       vpp-api
+
+doxygen:
+       @mkdir -p "$(BR)/docs"
+       ROOT="$(WS_ROOT)" \
+            BUILD_ROOT="$(BR)" \
+            INPUT="$(addprefix $(WS_ROOT)/,$(DOXY_INPUT))" \
+            HTML=YES \
+            VERSION="`git describe --tags --dirty`" \
+            doxygen doxygen/doxygen.cfg
+
+wipe-doxygen:
+       rm -rf "$(BR)/docs"