build: fix docs/doxygen targets

- Add missing dependencies
- Fix clean/wipe to remove generated files
- Fix doxygen src variable

Type: fix

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: If6b2797e8af3f2e735759fab5841a0b4576ed7cc

diff --git a/Makefile b/Makefile
index dc7583e..c13c564 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -680,7 +680,7 @@ bootstrap-doxygen:
        $(call make-doxy)
 
 .PHONY: doxygen
-doxygen:
+doxygen: bootstrap-doxygen
        $(call make-doxy)
 
 .PHONY: wipe-doxygen
@@ -697,12 +697,13 @@ docs-venv:
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv)
 
 .PHONY: docs
-docs: $(DOCS_DIR)
+docs: $(DOCS_DIR) docs-venv
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html)
 
 .PHONY: docs-clean
 docs-clean:
-       @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
+       @rm -rf $(DOCS_DIR)/_build
+       @rm -rf $(VENV_DIR)
 
 .PHONY: pkg-verify
 pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps

diff --git a/doxygen/Makefile b/doxygen/Makefile
index 3922ab3..4064614 100644 (file)
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -43,7 +43,7 @@ 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) \
@@ -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