changeset 105485:73071baff669

(autoloads): Skip preloaded files. (Bug#4446)
author Glenn Morris <rgm@gnu.org>
date Tue, 06 Oct 2009 03:12:55 +0000
parents fe4228529c23
children dfa034d34546
files lisp/ChangeLog lisp/Makefile.in
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Oct 06 03:12:32 2009 +0000
+++ b/lisp/ChangeLog	Tue Oct 06 03:12:55 2009 +0000
@@ -1,5 +1,11 @@
 2009-10-06  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
 
--- a/lisp/Makefile.in	Tue Oct 06 03:12:32 2009 +0000
+++ b/lisp/Makefile.in	Tue Oct 06 03:12:55 2009 +0000
@@ -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.