diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2014-04-17 16:34:57 -0400 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2014-04-19 05:55:30 +0900 |
| commit | 59c6103e1c169c3b65e8d63dc2211c6ad0e24841 (patch) | |
| tree | 2fe53b5c091aa335046c7b815c8562f317af0383 /doc/Makefile.local | |
| parent | 55926bcb2c0d61ffaf9f46ba4e1529a7f4584cbc (diff) | |
doc: Fix parallel build of roff files
The roff build rule builds all of the roff files in a single command.
Previously, this was expressed as a multi-target rule, but since this
is equivalent to specifying a copy of the rule for each target, make
-jN could start up to N parallel instances of this command. Fix this
by bottlenecking this rule through a single stamp file.
This also removes the unused man.stamp from CLEAN.
Diffstat (limited to 'doc/Makefile.local')
| -rw-r--r-- | doc/Makefile.local | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/Makefile.local b/doc/Makefile.local index 0980c71c..d4207972 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -35,7 +35,13 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) # Use the man page converter that is available. We should never depend # on MAN_ROFF_FILES if a converter is not available. -${MAN_ROFF_FILES}: ${MAN_RST_FILES} +${MAN_ROFF_FILES}: $(DOCBUILDDIR)/.roff.stamp + +# By using $(DOCBUILDDIR)/.roff.stamp instead of ${MAN_ROFF_FILES}, we +# convey to make that a single invocation of this recipe builds all +# of the roff files. This prevents parallel make from starting an +# instance of this recipe for each roff file. +$(DOCBUILDDIR)/.roff.stamp: ${MAN_RST_FILES} ifeq ($(HAVE_SPHINX),1) $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man for section in 1 5 7; do \ @@ -48,6 +54,7 @@ else @echo "Fatal: build dependency fail." @false endif + touch ${MAN_ROFF_FILES} $@ # Do not try to build or install man pages if a man page converter is # not available. @@ -70,5 +77,5 @@ endif $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py $(mkdocdeps) $(srcdir)/doc $(DOCBUILDDIR) $@ -CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(dir)/man.stamp +CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(DOCBUILDDIR)/.roff.stamp CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) |