From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Aug 2014 16:50:32 +0000 (-0700)
Subject: Add dependencies to fix loaddefs race during parallel builds.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~462
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3bcff29cea902c92c2ddb20f992d2744fb404d12;p=emacs.git

Add dependencies to fix loaddefs race during parallel builds.

Without this, for example, 'make -j bootstrap' can fail and report
"Opening input file: no such file or directory,
.../lisp/calendar/diary-loaddefs.el ... recipe for target
'calendar/hol-loaddefs.el' failed", where the hol-loaddefs.el rule
got confused because diary-loaddefs.el was being built in parallel.
* Makefile.in ($(CAL_DIR)/diary-loaddefs.el):
Depend on $(CAL_DIR)/cal-loaddefs.el.
($(CAL_DIR)/hol-loaddefs.el): Depend on $(CAL_DIR)/diary-loaddefs.el.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b474e87caa1..458ab57d011 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add dependencies to fix loaddefs race during parallel builds.
+	Without this, for example, 'make -j bootstrap' can fail and report
+	"Opening input file: no such file or directory,
+	.../lisp/calendar/diary-loaddefs.el ... recipe for target
+	'calendar/hol-loaddefs.el' failed", where the hol-loaddefs.el rule
+	got confused because diary-loaddefs.el was being built in parallel.
+	* Makefile.in ($(CAL_DIR)/diary-loaddefs.el):
+	Depend on $(CAL_DIR)/cal-loaddefs.el.
+	($(CAL_DIR)/hol-loaddefs.el): Depend on $(CAL_DIR)/diary-loaddefs.el.
+
 2014-08-16  Martin Rudalics  <rudalics@gmx.at>
 
 	* scroll-bar.el (scroll-bar-horizontal-drag-1): Use cdr of
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index eba63666ddb..633551387e6 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -455,13 +455,13 @@ $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
 	   --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
 	   -f batch-update-autoloads $(CAL_DIR)
 
-$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
+$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
 	   --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
 	   -f batch-update-autoloads $(CAL_DIR)
 
-$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
+$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
 	   --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \