[Emacs-diffs] emacs/lisp makefile.w32-in

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/29 00:55:02

Modified files:
        lisp           : makefile.w32-in 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/makefile.w32-in?cvsroot=emacs&r1=1.90&r2=1.91

Patches:
Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/makefile.w32-in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- makefile.w32-in     26 Sep 2009 18:43:22 -0000      1.90
+++ makefile.w32-in     29 Sep 2009 00:55:01 -0000      1.91
@@ -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