From a13d69113af7c028949d88911a4738e99afd0448 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 6 Jun 2012 11:34:33 +0200
Subject: [PATCH] Fix parallel build failures
This is the 2.5 version of the "fix build failures":
- man/%.gen could be left over even in case of failure, due to
automake bug
- make man/%.gen runs RUN_IN_TEMPDIR, so let's depend on it, since
that target has the proper dependencies (create needed dirs)
- man/%.gen depends on a number of built sources, but the dependency
was not declared
Furthermore, wraps a long comment.
Tested with -j4/-j16, after `make maintainer-clean'.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
Makefile.am | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 806b9d631..669e6147e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,8 +151,8 @@ CLEANFILES = \
.hpc/*.mix htools/*.tix \
doc/hs-lint.html
-# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
-# it'll cause the target to rebuild every time.
+# BUILT_SOURCES should only be used as a dependency on phony
+# targets. Otherwise it'll cause the target to rebuild every time.
BUILT_SOURCES = \
ganeti \
stamp-srclinks \
@@ -830,8 +830,12 @@ man/footer.html: man/footer.rst
{ echo 'pandoc' not found during configure; exit 1; }
$(PANDOC) -f rst -t html -o $@ $<
-man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py
- PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@
+man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
+ | $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
+ set -e ; \
+ trap 'echo auto-removing $@; rm $@' EXIT; \
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+ trap - EXIT
man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
@test -n "$(PANDOC)" || \
--
GitLab