From: Glenn Morris <rgm@gnu.org>
Date: Tue, 6 Oct 2009 03:12:55 +0000 (+0000)
Subject: (autoloads): Skip preloaded files.  (Bug#4446)
X-Git-Tag: emacs-pretest-23.1.90~906
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3405d98c33c2467e533bf4dc10fb1adc7a05ebff;p=emacs.git

(autoloads): Skip preloaded files.  (Bug#4446)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50c6e57bccd..d7a4f85f4ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 78e95900b72..61f4d51461c 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -145,13 +145,16 @@ finder-data: doit
 
 # 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.