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

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/10/07 09:31:35

Modified files:
        lisp           : ChangeLog makefile.w32-in 

Log message:
        * makefile.w32-in (WINS_UPDATES): New macro.
          (custom-deps, finder-data, autoloads): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16379&r2=1.16380
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/makefile.w32-in?cvsroot=emacs&r1=1.97&r2=1.98

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16379
retrieving revision 1.16380
diff -u -b -r1.16379 -r1.16380
--- ChangeLog   7 Oct 2009 07:19:07 -0000       1.16379
+++ ChangeLog   7 Oct 2009 09:31:32 -0000       1.16380
@@ -1,3 +1,8 @@
+2009-10-07  Juanma Barranquero  <address@hidden>
+
+       * makefile.w32-in (WINS_UPDATES): New macro.
+       (custom-deps, finder-data, autoloads): Use it.
+
 2009-10-07  Glenn Morris  <address@hidden>
 
        * Makefile.in (autoloads): Revert previous change.

Index: makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/makefile.w32-in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- makefile.w32-in     2 Oct 2009 19:52:49 -0000       1.97
+++ makefile.w32-in     7 Oct 2009 09:31:35 -0000       1.98
@@ -118,12 +118,19 @@
        textmodes \
        url
 
+# Directories with lisp files to compile
 WINS_ALMOST=$(WINS_BASIC) \
        $(WINS_CEDET)
 
+# Directories to extract data from (customs, autoloads, etc.)
+WINS_UPDATES=$(WIN_ALMOST) \
+       $(WINS_CEDET_SUBDIRS)
+
+# Directories to add to subdirs.el
 WINS_SUBDIR=$(WINS_BASIC) \
        obsolete
 
+# All directories, except CEDET subdirs
 WINS= $(WINS_ALMOST) \
        term \
        obsolete
@@ -158,12 +165,13 @@
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
 custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
-       @echo Directories: $(WINS_ALMOST)
-       -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook 
nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS_ALMOST)
+       @echo Directories: $(WINS_UPDATES)
+       -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook 
nil)$(ARGQUOTE) \
+                 -f custom-make-dependencies $(lisp) $(WINS_UPDATES)
 
 finder-data: $(lisp)/loaddefs.el doit
-       @echo Directories: $(WINS_ALMOST)
-       $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) 
$(WINS_ALMOST)
+       @echo Directories: $(WINS_UPDATES)
+       $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) 
$(WINS_UPDATES)
 
 $(lisp)/loaddefs.el:
        $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)
@@ -203,10 +211,10 @@
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
 autoloads: $(lisp)/loaddefs.el $(LOADDEFS) doit
-       @echo Directories: . $(WINS_ALMOST)
+       @echo Directories: . $(WINS_UPDATES)
        $(emacs) -l autoload \
                --eval $(ARGQUOTE)(setq find-file-hook nil 
find-file-suppress-same-file-warnings t)$(ARGQUOTE) \
-               -f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . 
$(WINS_ALMOST)
+               -f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . 
$(WINS_UPDATES)
 
 $(lisp)/subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs