From 1dd2388defdbf05fb13f15ce69a3d92219d0dc60 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Wed, 10 Apr 2024 15:26:35 -0600
Subject: [PATCH 1/2] doc: fix Makefile dependencies

---
 doc/Makefile | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index adbfb8a2..2d373437 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -10,10 +10,12 @@ VENV          = .sphinx/venv/bin/activate
 
 
 # Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+help: install
+	@. $(VENV); $(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-install:
+install: .sphinx/venv
+
+.sphinx/venv: .sphinx/requirements.txt
 	@echo "... setting up virtualenv"
 	python3 -m venv .sphinx/venv
 	. $(VENV); pip install --upgrade -r .sphinx/requirements.txt
@@ -30,16 +32,20 @@ install:
                 "* check links: make linkcheck \n" \
                 "* check inclusive language: make woke \n" \
 		"--------------------------------------------------------------- \n"
-run:
+
+.sphinx/requirements.txt:
+	:
+
+run: install
 	. $(VENV); sphinx-autobuild -c . -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)"
 
-html:
+html: install
 	. $(VENV); $(SPHINXBUILD) -c . -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" -w .sphinx/warnings.txt
 
-epub:
+epub: install
 	. $(VENV); $(SPHINXBUILD) -c . -b epub "$(SOURCEDIR)" "$(BUILDDIR)" -w .sphinx/warnings.txt
 
-serve:
+serve: run
 	cd "$(BUILDDIR)"; python3 -m http.server 8000
 
 clean: clean-doc
@@ -48,17 +54,17 @@ clean: clean-doc
 clean-doc:
 	git clean -fx "$(BUILDDIR)"
 
-spelling: html
+spelling: install html
 	. $(VENV) ; python3 -m pyspelling -c .sphinx/spellingcheck.yaml
 
-linkcheck:
+linkcheck: install
 	. $(VENV) ; $(SPHINXBUILD) -c . -b linkcheck  "$(SOURCEDIR)" "$(BUILDDIR)"
 
 woke:
 	type woke >/dev/null 2>&1 || { sudo snap install woke || exit 1; }
 	woke *.rst **/*.rst -c https://github.com/canonical-web-and-design/Inclusive-naming/raw/main/config.yml
 
-.PHONY: help Makefile
+.PHONY: help Makefile install
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

From 13d68ecf89f135e504fd79dbbf0204b20b666a37 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Wed, 10 Apr 2024 15:27:16 -0600
Subject: [PATCH 2/2] pre-commit: simplify spelling invocation

---
 .pre-commit-config.yaml    | 2 +-
 doc/pre-commit-spell-check | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100755 doc/pre-commit-spell-check

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b4eb8a7a..d1d53f89 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,5 +16,5 @@ repos:
       - id: doc-spelling
         name: doc-spelling
         language: system
-        entry: bash -c "cd doc/ && ./pre-commit-spell-check"
+        entry: make -C doc spelling
         files: "doc/.*rst"
diff --git a/doc/pre-commit-spell-check b/doc/pre-commit-spell-check
deleted file mode 100755
index dea67a2b..00000000
--- a/doc/pre-commit-spell-check
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Setup sphinx virtual env if it's not already
-if [ ! -d .sphinx/venv ]; then
-    make install
-fi
-
-make spelling