Skip to contentSkip to conversation

Makefile: remove unused O variable

PATCH Applied Antonin Godard 2 participants 3 messages Aug 21 – Sep 14

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: remove unused O variable

This variable isn't set or used anywhere, remove it and remove the misleading comment.

---
 documentation/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
documentation/Makefile +3 -5
index 87a6f8a8b..2df23ebf4 100644
@@ -19,7 +19,7 @@ endif
 
 # Put it first so that "make" without argument is like "make help".
 help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
 
 .PHONY: all checks help Makefile clean stylecheck publish latexpdf
 
@@ -51,12 +51,10 @@ sphinx-lint:
 #   Unable to read an entire line---bufsize=200000. Please increase buf_size in texmf.cnf.
 latexpdf:
 	$(SOURCEDIR)/set_versions.py
-	buf_size=10000000 LATEXMKOPTS="-silent" $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	buf_size=10000000 LATEXMKOPTS="-silent" $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
 
 all: html epub latexpdf
 
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %:
 	$(SOURCEDIR)/set_versions.py
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)

---
base-commit: 3660b8085a5e790c1ea8bf75236fff4b216fe19c
change-id: 20260821-remove-o-makefile-e0f4d44e3fbb

author Applied
#1 lore raw

Applied, thanks!

[1/1] Makefile: remove unused O variable

      commit: 95cd0999707926ce1e1cae6c4f58caee7286ac36
#2 lore raw
In reply to Antonin Godard

Hi Antonin,

Quoted 23 lines · Antonin Godard via lists.yoctoproject.org

This variable isn't set or used anywhere, remove it and remove the misleading comment.

---
  documentation/Makefile | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
documentation/Makefile +1 -1
index 87a6f8a8b..2df23ebf4 100644
@@ -19,7 +19,7 @@ endif
 
  # Put it first so that "make" without argument is like "make help".
  help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
 
  .PHONY: all checks help Makefile clean stylecheck publish latexpdf
 

documentation/Makefile sphinx-lint: · line 59

Quoted 10 lines
documentation/Makefile +1 -3
@@ -51,12 +51,10 @@ sphinx-lint:
  #   Unable to read an entire line---bufsize=200000. Please increase buf_size in texmf.cnf.
  latexpdf:
  	$(SOURCEDIR)/set_versions.py
-	buf_size=10000000 LATEXMKOPTS="-silent" $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	buf_size=10000000 LATEXMKOPTS="-silent" $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
 
  all: html epub latexpdf
 
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

This was actually a useful comment (aside from the last sentence). It is a catch-all command we redirect to pass to sphinx-build as the builder. That's how we can run make html, singlehtml and epub without having those make targets defined!

Cheers,
Quentin