Skip to content

Commit e5da0e3

Browse files
Makefile: Combine gen_images and gen_examples
gen_images and gen_examples are never called on their own, CI scripts call make -C docs directly. Since calling them both in parallel seems to cause issues, let's not do that, and instead combine them into a singular `make docs/gen`. This should resolve the parallelism problems by making them sequential while still retaining the -j support.
1 parent 5d14c30 commit e5da0e3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Makefile

+4-7
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,9 @@ docs/source/cell/word_add.rst: $(TARGETS) $(EXTRA_TARGETS)
996996
docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
997997
$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
998998

999-
PHONY: docs/gen_examples docs/gen_images docs/guidelines docs/usage docs/reqs
1000-
docs/gen_examples: $(TARGETS)
1001-
$(Q) $(MAKE) -C docs examples
1002-
1003-
docs/gen_images: $(TARGETS)
1004-
$(Q) $(MAKE) -C docs images
999+
PHONY: docs/gen docs/guidelines docs/usage docs/reqs
1000+
docs/gen: $(TARGETS)
1001+
$(Q) $(MAKE) -C docs gen
10051002

10061003
DOCS_GUIDELINE_FILES := GettingStarted CodingStyle
10071004
DOCS_GUIDELINE_SOURCE := $(addprefix guidelines/,$(DOCS_GUIDELINE_FILES))
@@ -1037,7 +1034,7 @@ docs/reqs:
10371034
$(Q) $(MAKE) -C docs reqs
10381035

10391036
.PHONY: docs/prep
1040-
docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen_examples docs/gen_images docs/guidelines docs/usage
1037+
docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen docs/guidelines docs/usage
10411038

10421039
DOC_TARGET ?= html
10431040
docs: docs/prep

docs/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,11 @@ images:
252252
$(MAKE) -C source/_images
253253
$(MAKE) -C source/_images convert
254254

255+
.PHONY: gen
256+
gen:
257+
$(MAKE) examples
258+
$(MAKE) images
259+
255260
.PHONY: reqs
256261
reqs:
257262
$(PYTHON) -m pip install -r source/requirements.txt

0 commit comments

Comments
 (0)