X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=doxygen%2FMakefile;h=40646148ec6ae8fde0523881268c1faddc4caa78;hb=refs%2Fchanges%2F25%2F26325%2F5;hp=9caa40799807bbcfc57e8243f486eaf73cbf4c37;hpb=4521afa9a643983c789b6b3a77b14c0a95d5e0b2;p=vpp.git

diff --git a/doxygen/Makefile b/doxygen/Makefile
index 9caa4079980..40646148ec6 100644
--- 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,14 +43,15 @@ 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 \
@@ -61,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))
@@ -72,9 +74,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/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')))
@@ -204,6 +204,7 @@ $(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \
 		cd "$(WS_ROOT)"; \
 		find "$$input" -type f \
 			\( -name '*.[ch]' -or -name '*.dox' \) -print \
+			| grep -v -E '^src/examples/' \
 			| grep -v -E '^$(DOXY_EXCLUDE_REGEXP)' \
 			>> $(SIPHON_INPUT)/files; \
 	done
@@ -263,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