* makefile.w32-in (WINS_CEDET, WINS_BASIC, WINS_SUBDIR): New macros.

  (WINS_ALMOST): Set from WINS_BASIC and WINS_CEDET.
  (update-subdirs-CMD): Use WINS_SUBDIR, not WINS_ALMOST.

1 files changed, 13 insertions, 6 deletions

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index fa22f1d5209..99511f4544d 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -83,14 +83,15 @@ COMPILE_FIRST = \
 emacs = "$(EMACS)" $(EMACSOPT)
 
 # Have to define the list of subdirs manually when not using sh.
-WINS_ALMOST=\
+WINS_CEDET=\
+        cedet/ede \
+        cedet/semantic \
+        cedet/srecode
+
+WINS_BASIC=\
         calc \
         calendar \
         cedet \
-        cedet/ede \
-        cedet/semantic \
-        cedet/srecode \
-        eieio \
         emacs-lisp \
         emulation \
         erc \
@@ -108,6 +109,12 @@ WINS_ALMOST=\
         textmodes \
         url
 
+WINS_ALMOST=$(WINS_BASIC) \
+        $(WINS_CEDET)
+
+WINS_SUBDIR=$(WINS_BASIC) \
+        obsolete
+
 WINS= $(WINS_ALMOST) \
         term \
         obsolete
@@ -203,7 +210,7 @@ update-subdirs-CMD: doit
         echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el
         echo ;; certain of its subdirectories.  Here we specify them.>> $(lisp)/subdirs.el
         echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
-        @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> $(lisp)/subdirs.el
+        @for %%d in ($(WINS_SUBDIR)) do echo "%%d">> $(lisp)/subdirs.el
         echo ))>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit