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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/11 16:48:05

Modified files:
        lisp           : ChangeLog makefile.w32-in 

Log message:
        * makefile.w32-in: Ensure that Lisp files in CEDET subdirectories
        are compiled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16890&r2=1.16891
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/makefile.w32-in?cvsroot=emacs&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16890
retrieving revision 1.16891
diff -u -b -r1.16890 -r1.16891
--- ChangeLog   11 Dec 2009 02:31:49 -0000      1.16890
+++ ChangeLog   11 Dec 2009 16:48:02 -0000      1.16891
@@ -1,3 +1,8 @@
+2009-12-11  Chong Yidong  <address@hidden>
+
+       * makefile.w32-in: Ensure that Lisp files in CEDET subdirectories
+       are compiled.
+
 2009-12-11  Michael McNamara  <address@hidden>
 
        * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re,

Index: makefile.w32-in
===================================================================
RCS file: /sources/emacs/emacs/lisp/makefile.w32-in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- makefile.w32-in     20 Nov 2009 14:05:22 -0000      1.101
+++ makefile.w32-in     11 Dec 2009 16:48:05 -0000      1.102
@@ -89,9 +89,7 @@
        cedet \
        cedet/ede \
        cedet/semantic \
-       cedet/srecode
-
-WINS_CEDET_SUBDIRS=\
+       cedet/srecode \
        cedet/semantic/analyze \
        cedet/semantic/bovine \
        cedet/semantic/decorate \
@@ -118,20 +116,17 @@
        textmodes \
        url
 
-# Directories with lisp files to compile
-WINS_ALMOST=$(WINS_BASIC) \
+# Directories with lisp files to compile, and to extract data from
+# (customs, autoloads, etc.)
+WINS_UPDATES=$(WINS_BASIC) \
        $(WINS_CEDET)
 
-# Directories to extract data from (customs, autoloads, etc.)
-WINS_UPDATES=$(WINS_ALMOST) \
-       $(WINS_CEDET_SUBDIRS)
-
 # Directories to add to subdirs.el
 WINS_SUBDIR=$(WINS_BASIC) \
        obsolete
 
-# All directories, except CEDET subdirs
-WINS= $(WINS_ALMOST) \
+# All directories
+WINS= $(WINS_UPDATES) \
        term \
        obsolete
 
@@ -426,12 +421,11 @@
 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) $(WINS_CEDET_SUBDIRS); do rm -f $$dir/*.elc 
$$dir/*/*.elc $$dir/*/*/*.elc; done
+       -for dir in . $(WINS); 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