(WINS_BASIC): Fix last change.

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index a64dda722020f3fc1228959827a4a9d2aaf59776..ed1b8906fecd1834bc3e5c9dff540f0c8676e3aa 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -60,7 +60,9 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
 
 AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \
        $(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el \
-       $(lisp)/calc/calc-loaddefs.el $(lisp)/nxml/subdirs.el
+       $(lisp)/calc/calc-loaddefs.el $(lisp)/nxml/subdirs.el \
+       $(lisp)/cedet/semantic/loaddefs.el $(lisp)/cedet/ede/loaddefs.el \
+       $(lisp)/cedet/srecode/loaddefs.el
 
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.  The CC files are compiled first
@@ -83,19 +85,22 @@ COMPILE_FIRST = \
 emacs = "$(EMACS)" $(EMACSOPT)
 
 # Have to define the list of subdirs manually when not using sh.
-WINS_ALMOST=\
-       calc \
-       calendar \
+WINS_CEDET=\
        cedet \
        cedet/ede \
        cedet/semantic \
+       cedet/srecode
+
+WINS_CEDET_SUBDIRS=\
        cedet/semantic/analyze \
        cedet/semantic/bovine \
        cedet/semantic/decorate \
        cedet/semantic/symref \
-       cedet/semantic/wisent \
-       cedet/srecode \
-       eieio \
+       cedet/semantic/wisent
+
+WINS_BASIC=\
+       calc \
+       calendar \
        emacs-lisp \
        emulation \
        erc \
@@ -113,6 +118,12 @@ WINS_ALMOST=\
        textmodes \
        url
 
+WINS_ALMOST=$(WINS_BASIC) \
+       $(WINS_CEDET)
+
+WINS_SUBDIR=$(WINS_BASIC) \
+       obsolete
+
 WINS= $(WINS_ALMOST) \
        term \
        obsolete
@@ -208,12 +219,12 @@ 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) cedet) do echo "%%d">> $(lisp)/subdirs.el
        echo ))>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
        $(srcdir)/update-subdirs $(lisp); \
-       for file in $(WINS); do \
+       for file in $(WINS_SUBDIR); do \
           $(srcdir)/update-subdirs $$file; \
        done;
 
@@ -407,11 +418,12 @@ bootstrap-clean:
 bootstrap-clean-CMD:
 #      if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads
        -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g
+       -for %%f in ($(WINS_CEDET_SUBDIRS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g
 
 bootstrap-clean-SH:
 #      if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi
 #      -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
-       -for dir in . $(WINS); do rm -f $$dir/*.elc; done
+       -for dir in . $(WINS)  $(WINS_CEDET_SUBDIRS); do rm -f $$dir/*.elc $$dir/*/*.elc $$dir/*/*/*.elc; done
 
 # Generate/update files for the bootstrap process.
 # When done, remove bootstrap-emacs from ../bin, so that