1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 95105431FBD
\r
6 for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 00:13:39 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id NItDBZ653P6o for <notmuch@notmuchmail.org>;
\r
16 Fri, 18 Apr 2014 00:13:31 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 7650F431FAE
\r
19 for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 00:13:31 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 13A4610008F;
\r
22 Fri, 18 Apr 2014 10:13:24 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH] doc: Fix parallel build of roff files
\r
26 In-Reply-To: <1397766897-14475-1-git-send-email-amdragon@mit.edu>
\r
27 References: <1397766897-14475-1-git-send-email-amdragon@mit.edu>
\r
28 User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1
\r
29 (x86_64-unknown-linux-gnu)
\r
30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
31 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
32 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
33 Date: Fri, 18 Apr 2014 10:13:23 +0300
\r
34 Message-ID: <m2wqen3yb0.fsf@guru.guru-group.fi>
\r
36 Content-Type: text/plain
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Fri, 18 Apr 2014 07:13:39 -0000
\r
51 On Thu, Apr 17 2014, Austin Clements <amdragon@MIT.EDU> wrote:
\r
53 > The roff build rule builds all of the roff files in a single command.
\r
54 > Previously, this was expressed as a multi-target rule, but since this
\r
55 > is equivalent to specifying a copy of the rule for each target, make
\r
56 > -jN could start up to N parallel instances of this command. Fix this
\r
57 > by bottlenecking this rule through a single stamp file.
\r
59 > This also removes the unused man.stamp from CLEAN.
\r
61 > doc/Makefile.local | 11 +++++++++--
\r
62 > 1 file changed, 9 insertions(+), 2 deletions(-)
\r
64 > diff --git a/doc/Makefile.local b/doc/Makefile.local
\r
65 > index 0980c71..5cf140d 100644
\r
66 > --- a/doc/Makefile.local
\r
67 > +++ b/doc/Makefile.local
\r
68 > @@ -35,7 +35,13 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})
\r
70 > # Use the man page converter that is available. We should never depend
\r
71 > # on MAN_ROFF_FILES if a converter is not available.
\r
72 > -${MAN_ROFF_FILES}: ${MAN_RST_FILES}
\r
73 > +${MAN_ROFF_FILES}: $(DOCBUILDDIR)/.roff.stamp
\r
75 > +# By using $(DOCBUILDDIR)/roff.stamp instead of ${MAN_ROFF_FILES}, we
\r
76 > +# convey to make that a single invocation of this receipe builds all
\r
78 LGTM. This 'receipe' could be amended to recipe(?:)
\r
80 > +# of the roff files. This prevents parallel make from starting an
\r
81 > +# instance of this recipe for each roff file.
\r
82 > +$(DOCBUILDDIR)/.roff.stamp: ${MAN_RST_FILES}
\r
83 > ifeq ($(HAVE_SPHINX),1)
\r
84 > $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man
\r
85 > for section in 1 5 7; do \
\r
86 > @@ -48,6 +54,7 @@ else
\r
87 > @echo "Fatal: build dependency fail."
\r
90 > + touch ${MAN_ROFF_FILES} $@
\r
92 > # Do not try to build or install man pages if a man page converter is
\r
94 > @@ -70,5 +77,5 @@ endif
\r
95 > $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py
\r
96 > $(mkdocdeps) $(srcdir)/doc $(DOCBUILDDIR) $@
\r
98 > -CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(dir)/man.stamp
\r
99 > +CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(DOCBUILDDIR)/.roff.stamp
\r
100 > CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES)
\r
104 > _______________________________________________
\r
105 > notmuch mailing list
\r
106 > notmuch@notmuchmail.org
\r
107 > http://notmuchmail.org/mailman/listinfo/notmuch
\r