[Emacs-diffs] trunk r117709: Add dependencies to fix loaddefs race during parallel builds.

[Paul Eggert]

------------------------------------------------------------
revno: 117709
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2014-08-16 09:50:32 -0700
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-16 15:47:38 +0000
+++ b/lisp/ChangeLog    2014-08-16 16:50:32 +0000
@@ -1,3 +1,15 @@
+2014-08-16  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * scroll-bar.el (scroll-bar-horizontal-drag-1): Use cdr of

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-06-30 18:26:34 +0000
+++ b/lisp/Makefile.in  2014-08-16 16:50:32 +0000
@@ -455,13 +455,13 @@
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -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 \"address@hidden")))" \
           -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 \"address@hidden")))" \