debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc: Fix parallel build of roff files

Browse source 
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.
This commit is contained in:
Austin Clements 2014-04-17 16:34:57 -04:00 committed by David Bremner
parent 55926bcb2c
commit 59c6103e1c
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/Makefile.local
View file

@ -35,7 +35,13 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})
# Use the man page converter that is available. We should never depend # Use the man page converter that is available. We should never depend
# on MAN_ROFF_FILES if a converter is not available. # 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) ifeq ($(HAVE_SPHINX),1)
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man
for section in 1 5 7; do \ for section in 1 5 7; do \
@ -48,6 +54,7 @@ else
@echo "Fatal: build dependency fail." @echo "Fatal: build dependency fail."
@false @false
endif endif
touch ${MAN_ROFF_FILES} $@
# Do not try to build or install man pages if a man page converter is # Do not try to build or install man pages if a man page converter is
# not available. # not available.
@ -70,5 +77,5 @@ endif
$(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py
$(mkdocdeps) $(srcdir)/doc $(DOCBUILDDIR) $@ $(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) CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES)