diff options
| author | Eli Zaretskii <[email protected]> | 2012-07-26 20:10:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2012-07-26 20:10:21 +0300 |
| commit | f8b91036c9ce5e524ca3d21badee83a3c6794941 (patch) | |
| tree | 229f25228ecddc544190377b63adeb1f7fcfbf41 | |
| parent | d6749401cb9c267fb0d168bc63c6527966f39335 (diff) | |
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.
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c23079e183..5e848134cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2012-07-26 Eli Zaretskii <[email protected]> + + * 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 <[email protected]> * mouse.el (popup-menu): Fix doc-string and re-indent code. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 0c021cec77..92d939af01 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -393,7 +393,7 @@ compile-first: $(lisp)/emacs-lisp/bytecomp.elc $(lisp)/emacs-lisp/byte-opt.elc 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 @@ $(lisp)/calendar/cal-loaddefs.el: -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 @@ $(lisp)/calendar/diary-loaddefs.el: -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 @@ MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \ # 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 @@ TRAMP_SRC = $(lisp)/net/tramp.el $(lisp)/net/tramp-cache.el \ $(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) \ |