[Emacs-diffs] emacs/lisp ChangeLog Makefile.in

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/06 03:12:58

Modified files:
        lisp           : ChangeLog Makefile.in 

Log message:
        (autoloads): Skip preloaded files.  (Bug#4446)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16372&r2=1.16373
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/Makefile.in?cvsroot=emacs&r1=1.200&r2=1.201

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16372
retrieving revision 1.16373
diff -u -b -r1.16372 -r1.16373
--- ChangeLog   6 Oct 2009 02:50:44 -0000       1.16372
+++ ChangeLog   6 Oct 2009 03:12:55 -0000       1.16373
@@ -1,5 +1,11 @@
 2009-10-06  Glenn Morris  <address@hidden>
 
+       * emacs-lisp/autoload.el (autoload-excludes): New variable.
+       (autoload-generate-file-autoloads): Skip files in autoload-excludes.
+       (batch-update-autoloads): Process a string value of autoload-excludes,
+       set during the build process.
+       * Makefile.in (autoloads): Skip preloaded files.  (Bug#4446)
+
        * net/tramp.el (tramp-handle-start-file-process): Move tramp-error call
        inside with-parsed...  macro so that `v' is defined.
 

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- Makefile.in 1 Oct 2009 17:49:04 -0000       1.200
+++ Makefile.in 6 Oct 2009 03:12:58 -0000       1.201
@@ -145,13 +145,16 @@
 
 # The chmod +w is to handle env var CVSREAD=1.  Files named
 # are identified by being the value of `generated-autoload-file'.
-autoloads: $(LOADDEFS) doit
+# The Makefile dependency is to make any missing-file error more explicit.
+autoloads: $(LOADDEFS) ../src/Makefile doit
        chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \
          $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \
          $(lisp)/dired.el $(lisp)/ibuffer.el
        wd=$(lisp); $(setwins_almost); \
        echo Directories: $$wins; \
-       $(emacs) -l autoload --eval '(setq generated-autoload-file 
"$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
+       preload=`sed -n -e '/^lisp=/ s/$${lispsource}//g p' ../src/Makefile | \
+         sed 's/^lisp= //'`; \
+       $(emacs) -l autoload --eval "(setq generated-autoload-file 
\"$(lisp)/loaddefs.el\" autoload-excludes \"$${preload}\")" -f 
batch-update-autoloads $$wins
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
 # we know that if we have an emacs executable, we also have a subdirs.el.