[Emacs-diffs] /srv/bzr/emacs/trunk r109218: Fix parallel bootstrap in lisp/ on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109218
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-26 20:10:21 +0300
message:
  Fix parallel bootstrap in lisp/ on MS-Windows.
  
   lisp/makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el)
   ($(lisp)/calendar/diary-loaddefs.el)
   ($(lisp)/calendar/hol-loaddefs.el, $(lisp)/mh-e/mh-loaddefs.el)
   ($(lisp)/net/tramp-loaddefs.el): Depend on update-subdirs.  Fixes
   failures in parallel bootstrap because subdirs.el is being
   rewritten while the autoload files are built at the same time,
   which needs to load subdirs.el.
modified:
  lisp/ChangeLog
  lisp/makefile.w32-in

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-26 08:32:25 +0000
+++ b/lisp/ChangeLog    2012-07-26 17:10:21 +0000
@@ -1,3 +1,13 @@
+2012-07-26  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el)
+       ($(lisp)/calendar/diary-loaddefs.el)
+       ($(lisp)/calendar/hol-loaddefs.el, $(lisp)/mh-e/mh-loaddefs.el)
+       ($(lisp)/net/tramp-loaddefs.el): Depend on update-subdirs.  Fixes
+       failures in parallel bootstrap because subdirs.el is being
+       rewritten while the autoload files are built at the same time,
+       which needs to load subdirs.el.
+
 2012-07-26  Martin Rudalics  <address@hidden>
 
        * mouse.el (popup-menu): Fix doc-string and re-indent code.

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2012-06-26 16:57:54 +0000
+++ b/lisp/makefile.w32-in      2012-07-26 17:10:21 +0000
@@ -393,7 +393,7 @@
 recompile: compile-first autoloads doit $(lisp)/progmodes/cc-mode.elc
        $(emacs) --eval $(ARGQUOTE)(batch-byte-recompile-directory 
0)$(ARGQUOTE) $(lisp)
 
-$(lisp)/calendar/cal-loaddefs.el:
+$(lisp)/calendar/cal-loaddefs.el: update-subdirs
        "$(EMACS)" $(EMACSOPT) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
           --eval "(setq find-file-suppress-same-file-warnings t)" \
@@ -401,7 +401,7 @@
           -f w32-batch-update-autoloads "$(lisp)/calendar/cal-loaddefs.el" \
              $(MAKE) ./calendar
 
-$(lisp)/calendar/diary-loaddefs.el:
+$(lisp)/calendar/diary-loaddefs.el: update-subdirs
        "$(EMACS)" $(EMACSOPT) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
           --eval "(setq find-file-suppress-same-file-warnings t)" \
@@ -409,7 +409,7 @@
           -f w32-batch-update-autoloads $(lisp)/calendar/diary-loaddefs.el \
              $(MAKE) ./calendar
 
-$(lisp)/calendar/hol-loaddefs.el:
+$(lisp)/calendar/hol-loaddefs.el: update-subdirs
        "$(EMACS)" $(EMACSOPT) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
           --eval "(setq find-file-suppress-same-file-warnings t)" \
@@ -437,7 +437,7 @@
 # See the commentary for autoloads above for why we use ./mh-e below
 # instead of $(lisp)/mh-e.
 mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
-$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
+$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) update-subdirs
        "$(EMACS)" $(EMACSOPT) \
           -l autoload \
           --eval $(ARGQUOTE)(setq generate-autoload-cookie 
$(DQUOTE);;;###mh-autoload$(DQUOTE))$(ARGQUOTE) \
@@ -456,7 +456,7 @@
        $(lisp)/net/tramp-smb.el  $(lisp)/net/tramp-uu.el     \
        $(lisp)/net/trampver.el
 
-$(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC)
+$(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC) update-subdirs
        "$(EMACS)" $(EMACSOPT) \
           -l autoload \
           --eval $(ARGQUOTE)(setq generate-autoload-cookie 
$(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \