lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 25 Jan 2013 00:24:13 -0500 From: Mike Frysinger <vapier@...too.org> To: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org> Cc: netdev@...r.kernel.org Subject: [PATCH [iputils] 4/6] doc: fix parallel build of html/man pages 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 <vapier@...too.org> --- 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 -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists