X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=doxygen%2FMakefile;h=e399b404a260d9d11d9234bd4f208cdd0c3844ce;hb=4b8011e72ea22d17942f2e57a34a4fa3a3d81af5;hp=abaca185d74f0df3022db83afd9ca0a070644374;hpb=3335693cc1afe6742e9a5e726a682dd28b0ce4d4;p=vpp.git

diff --git a/doxygen/Makefile b/doxygen/Makefile
index abaca185d74..e399b404a26 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -33,9 +33,8 @@ 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_MAC_BIN_DEPENDS = doxygen dot git
 DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
@@ -43,18 +42,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 +61,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,9 +73,7 @@ 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 \
-	$(DOXY_SRC)/examples/sample-plugin
+	$(DOXY_SRC)/vpp-api/lua
 
 # Generate a regexp for filenames to exclude
 DOXY_EXCLUDE_REGEXP = ($(subst .,\.,$(shell echo '$(strip $(DOXY_EXCLUDE))' | sed -e 's/ /|/g')))
@@ -157,8 +155,6 @@ else ifeq ($(OS_ID),darwin)
 			false; \
 		); \
 	done
-else ifeq ($(OS_ID),opensuse)
-	@sudo zypper install $(CONFIRM) $(DOC_SUSE_RPM_DEPENDS)
 else
 	$(error "Building documentation currently works only on Ubuntu, CentOS, MacOS and OpenSUSE systems.")
 endif
@@ -265,7 +261,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