More fixes in lisp/ for parallel builds on MS-Windows.

 lisp/makefile.w32-in (custom-deps, finder-data, updates, compile)
 (compile-always, compile-first)
 ($(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, bootstrap)
 ($(lisp)/progmodes/cc-mode.elc): Depend on $(lisp)subdirs.el,
 instead of on update-subdirs.
 (bootstrap-clean): Delete $(lisp)/subdirs.el.

2 files changed, 27 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 410a23592df..d8e8575db89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (custom-deps, finder-data, updates, compile)
+        (compile-always, compile-first)
+        ($(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, bootstrap)
+        ($(lisp)/progmodes/cc-mode.elc): Depend on $(lisp)subdirs.el,
+        instead of on update-subdirs.
+        (bootstrap-clean): Delete $(lisp)/subdirs.el.
+
 2012-07-28  Chong Yidong  <cyd@gnu.org>
 
         * simple.el (delete-trailing-lines): New option.
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 92d939af018..c7d883e4295 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -168,12 +168,12 @@ $(lisp)/cus-load.el:
 
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
-custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
+custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el $(lisp)/subdirs.el doit
         @echo Directories: $(WINS_UPDATES)
         -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) \
                   -f custom-make-dependencies $(lisp) $(WINS_UPDATES)
 
-finder-data: $(lisp)/loaddefs.el doit
+finder-data: $(lisp)/loaddefs.el $(lisp)/subdirs.el doit
         @echo Directories: $(WINS_UPDATES)
         $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS_UPDATES)
 
@@ -243,7 +243,7 @@ update-subdirs-SH: doit
            $(srcdir)/build-aux/update-subdirs $$file; \
         done;
 
-updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
+updates: $(lisp)/subdirs.el autoloads mh-autoloads finder-data custom-deps
 
 # This is useful after "bzr up".
 bzr-update: recompile autoloads finder-data custom-deps
@@ -311,7 +311,7 @@ TAGS-LISP-CMD: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsf
 # compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: update-subdirs compile-$(SHELLTYPE) doit
+compile: $(lisp)/subdirs.el compile-$(SHELLTYPE) doit
 
 compile-CMD: autoloads
 #       -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
@@ -340,7 +340,7 @@ compile-SH: autoloads
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 
-compile-always: update-subdirs compile-always-$(SHELLTYPE) doit
+compile-always: $(lisp)/subdirs.el compile-always-$(SHELLTYPE) doit
 
 compile-always-CMD:
 #       -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
@@ -383,7 +383,7 @@ backup-compiled-files:
 compile-after-backup: backup-compiled-files compile-always
 
 compile-first:  $(lisp)/emacs-lisp/bytecomp.elc $(lisp)/emacs-lisp/byte-opt.elc \
-        $(lisp)/emacs-lisp/autoload.elc
+        $(lisp)/emacs-lisp/autoload.elc $(lisp)/subdirs.el
 
 # Recompile all Lisp files which are newer than their .elc files.
 # Note that this doesn't create .elc files.  It only recompiles if an
@@ -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: update-subdirs
+$(lisp)/calendar/cal-loaddefs.el: $(lisp)/subdirs.el
         "$(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: update-subdirs
            -f w32-batch-update-autoloads "$(lisp)/calendar/cal-loaddefs.el" \
               $(MAKE) ./calendar
 
-$(lisp)/calendar/diary-loaddefs.el: update-subdirs
+$(lisp)/calendar/diary-loaddefs.el: $(lisp)/subdirs.el
         "$(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: update-subdirs
            -f w32-batch-update-autoloads $(lisp)/calendar/diary-loaddefs.el \
               $(MAKE) ./calendar
 
-$(lisp)/calendar/hol-loaddefs.el: update-subdirs
+$(lisp)/calendar/hol-loaddefs.el: $(lisp)/subdirs.el
         "$(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) update-subdirs
+$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) $(lisp)/subdirs.el
         "$(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) update-subdirs
+$(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC) $(lisp)/subdirs.el
         "$(EMACS)" $(EMACSOPT) \
            -l autoload \
            --eval $(ARGQUOTE)(setq generate-autoload-cookie $(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \
@@ -481,6 +481,7 @@ $(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC) update-subdirs
 # Need separate version for sh and native cmd.exe
 bootstrap-clean:
         - $(DEL) $(lisp)/loaddefs.el
+        - $(DEL) $(lisp)/subdirs.el
         $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE)
 
 bootstrap-clean-CMD:
@@ -496,7 +497,7 @@ bootstrap-clean-SH:
 # When done, remove bootstrap-emacs from ../bin, so that
 # it will not be mistaken for an installed binary.
 
-bootstrap: update-subdirs compile finder-data custom-deps
+bootstrap: $(lisp)/subdirs.el compile finder-data custom-deps
         - $(DEL) "$(EMACS)"
 
 #
@@ -600,7 +601,8 @@ $(lisp)/progmodes/cc-langs.elc: $(lisp)/progmodes/cc-vars.elc \
 $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
    $(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \
    $(lisp)/progmodes/cc-styles.elc $(lisp)/progmodes/cc-cmds.elc \
-   $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-menus.elc
+   $(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-menus.elc \
+   $(lisp)/subdirs.el
 
 $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
    $(lisp)/progmodes/cc-align.elc