# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1254185701 0
# Node ID 5652135eb5b362fddeda58c8c5cab803bc60e85c
# Parent  e2a8152a5eba7457ad4d537d0aa02206aee2cb63
* 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.

diff -r e2a8152a5eba -r 5652135eb5b3 lisp/makefile.w32-in
--- a/lisp/makefile.w32-in	Mon Sep 28 23:24:55 2009 +0000
+++ b/lisp/makefile.w32-in	Tue Sep 29 00:55:01 2009 +0000
@@ -83,14 +83,15 @@
 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 @@
 	textmodes \
 	url
 
+WINS_ALMOST=$(WINS_BASIC) \
+	$(WINS_CEDET)
+
+WINS_SUBDIR=$(WINS_BASIC) \
+	obsolete
+
 WINS= $(WINS_ALMOST) \
 	term \
 	obsolete
@@ -203,7 +210,7 @@
 	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