From patchwork Sat Apr 19 14:43:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 340488 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E7D661400E8 for ; Sun, 20 Apr 2014 00:43:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754902AbaDSOnh (ORCPT ); Sat, 19 Apr 2014 10:43:37 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:48260 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751516AbaDSOnS (ORCPT ); Sat, 19 Apr 2014 10:43:18 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id BCF0B3404E3; Sat, 19 Apr 2014 14:43:17 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org, David Heidelberger Subject: [PATCH [iputils] 2/5] doc: fix parallel build of html/man pages Date: Sat, 19 Apr 2014 10:43:14 -0400 Message-Id: <1397918597-8680-2-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1397918597-8680-1-git-send-email-vapier@gentoo.org> References: <1397918597-8680-1-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The use of the same tempdir prevents building of these files in parallel. So build all of them in unique tempdirs so we can do them in parallel. Signed-off-by: Mike Frysinger --- doc/Makefile | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 7ec4f1c..a9c303e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,29 +12,40 @@ man: $(MANFILES) # lots of some strange temporary junk directories and files. # So, scope it to a temporary dir and clean all after each run. -$(HTMLFILES): index.db - @-rm -rf tmp.db2html - @mkdir tmp.db2html - @set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html .. - @-rm -rf tmp.db2html +SETUP_TMPDIR = \ + t="tmp.db2html.$@"; \ + rm -rf $$t; \ + mkdir $$t; \ + pushd $$t >/dev/null +CLEAN_TMPDIR = \ + popd >/dev/null; \ + rm -rf $$t + +MAKE_HTML = \ + @set -e; \ + $(SETUP_TMPDIR); \ + docbook2html ../$<; \ + mv *.html ..; \ + $(CLEAN_TMPDIR) +$(HTMLFILES): index.db + $(MAKE_HTML) iputils.html: iputils.db - @-rm -rf tmp.db2html - @mkdir tmp.db2html - @set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ .. - @-rm -rf tmp.db2html + $(MAKE_HTML) # docbook2man produces utterly ugly output and I did not find # any way to customize this but hacking backend perl script a little. # Well, hence... $(MANFILES): index.db - @-mkdir tmp.db2man - @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. - @-rm -rf tmp.db2man + @set -e; \ + $(SETUP_TMPDIR); \ + nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \ + mv $@ ..; \ + $(CLEAN_TMPDIR) clean: - @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man + @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man* snapshot: @date "+%y%m%d" > snapshot.db