nat: use correct data types for memory sizes

[vpp.git] / doxygen / Makefile

diff --git a/doxygen/Makefile b/doxygen/Makefile
index b6ba588..4064614 100644 (file)
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -33,9 +33,9 @@ endif
 OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
-DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing python-jinja2
-DOC_RPM_DEPENDS = doxygen graphviz pyparsing python-jinja2
-DOC_SUSE_RPM_DEPENDS = doxygen graphviz python-pyparsing python-Jinja2
+DOC_DEB_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2
+DOC_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2
+DOC_SUSE_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-Jinja2
 DOC_MAC_BIN_DEPENDS = doxygen dot git
 DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
@@ -43,18 +43,18 @@ DOC_MAC_PY_DEPENDS = pyparsing jinja2
 DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 # Primary source directories
-DOXY_SRC ?= src
+DOXY_SRC ?= $(WS_ROOT)/src
 DOXY_SRC_DIRECTORIES = \
+       $(shell find $(DOXY_SRC) -name '*.md' -print | xargs dirname \
+       | sort | uniq) \
        $(DOXY_SRC)/vppinfra \
        $(DOXY_SRC)/svm \
        $(DOXY_SRC)/vlib \
        $(DOXY_SRC)/vlibapi \
        $(DOXY_SRC)/vlibmemory \
-       $(DOXY_SRC)/vlibsocket \
        $(DOXY_SRC)/vnet \
        $(DOXY_SRC)/vpp \
        $(DOXY_SRC)/vpp-api \
-       $(DOXY_SRC)/uri \
        $(DOXY_SRC)/examples
 
 # Input directories and files
@@ -62,7 +62,8 @@ DOXY_INPUT ?= \
        $(wildcard $(WS_ROOT)/*.md) \
        $(wildcard $(DOXY_DIR)/*.md) \
        $(DOXY_SRC_DIRECTORIES) \
-       $(DOXY_SRC)/plugins
+       $(DOXY_SRC)/plugins \
+       extras
 
 # Strip leading workspace path from input names
 DOXY_INPUT := $(subst $(WS_ROOT)/,,$(DOXY_INPUT))
@@ -73,7 +74,6 @@ DOXY_INPUT := $(subst $(WS_ROOT)/,,$(DOXY_INPUT))
 # there's a DPDK equivalent that conflicts.
 # These must be left-anchored paths for the regexp below to work.
 DOXY_EXCLUDE ?= \
-       $(DOXY_SRC)/vlib/buffer.c \
        $(DOXY_SRC)/vpp-api/lua
 
 # Generate a regexp for filenames to exclude
@@ -264,7 +264,10 @@ doxygen: $(SIPHON_DOCS)
 
 .PHONY: wipe-doxygen
 wipe-doxygen:
-       rm -rf "$(BR)/docs" "$(BR)/.doxygen-siphon.d"
+       @rm -rf $(BR)/docs
+       @rm -rf $(BR)/.doxygen-siphon.dep
+       @rm -rf $(BR)/.doxygen-bootstrap.ok
+       @rm -rf $(DOXY_DIR)/siphon/__pycache__
 
 .PHONY: clean
 clean: wipe-doxygen