diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2019-11-15 16:58:48 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2019-11-15 16:58:48 -0500 |
| commit | 47e092733cc049e736abf3f125d144c7922cda81 (patch) | |
| tree | f1585eb8111387409b0ffab4a75af40a6bfbc0a7 | |
| parent | e7906906079ca2d67bf67cfa9939523213230b56 (diff) | |
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
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | doxygen/Makefile | 7 |
2 files changed, 9 insertions, 5 deletions
@@ -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 3922ab33e76..40646148ec6 100644 --- 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 |