Skip to content

Commit 0dd3f8d

Browse files
Geoffroy Van Cutsemjren1
authored andcommitted
Documentation Makefile: rename $(O) into $(OPTS)
This patch renames $(O) used in the documentation Makefile (doc/Makefile) into $(OPTS) in order to avoid a namespace conflict with $(O) used in the top-level Makefile. This is in preparation to a new target called 'doc' that will allow to build the documentation directly from the top-level Makefile. This is required in order *not* to break setting a specific build directory, e.g. 'make O=build-test'. Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
1 parent a167f44 commit 0dd3f8d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

doc/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PUBLISHDIR = ../../projectacrn.github.io/$(RELEASE)
2020

2121
# Put it first so that "make" without argument is like "make help".
2222
help:
23-
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
23+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(OPTS)
2424
@echo ""
2525
@echo "make publish"
2626
@echo " publish generated html to projectacrn.github.io site:"
@@ -39,7 +39,7 @@ content:
3939
$(Q)scripts/extract_content.py
4040

4141
html: doxy content
42-
-$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b html -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(O) >> doc.log 2>&1
42+
-$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b html -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) >> doc.log 2>&1
4343
$(Q)./scripts/filter-doc-log.sh doc.log
4444

4545

@@ -61,6 +61,6 @@ publish:
6161

6262

6363
# Catch-all target: route all unknown targets to Sphinx using the new
64-
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
64+
# "make mode" option. $(OPTS) is meant as a shortcut for $(SPHINXOPTS).
6565
%: Makefile doxy
66-
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
66+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(OPTS)

0 commit comments

Comments
 (0)