changeset 105502:7f17857bf0eb

(autoloads): Revert previous change.
author Glenn Morris <rgm@gnu.org>
date Wed, 07 Oct 2009 07:19:07 +0000
parents e3e540de3898
children 33c51c8b86b5
files lisp/ChangeLog lisp/Makefile.in
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Oct 07 07:18:53 2009 +0000
+++ b/lisp/ChangeLog	Wed Oct 07 07:19:07 2009 +0000
@@ -1,5 +1,10 @@
 2009-10-07  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (autoloads): Revert previous change.
+	* emacs-lisp/autoload.el (batch-update-autoloads): Rather than having
+	the list of preloaded files passed on the command-line, get
+	it from src/Makefile.
+
 	* calendar/calendar.el (calendar-basic-setup): In the wide frame case,
 	show the original buffer rather than a random one.
 
--- a/lisp/Makefile.in	Wed Oct 07 07:18:53 2009 +0000
+++ b/lisp/Makefile.in	Wed Oct 07 07:19:07 2009 +0000
@@ -145,16 +145,13 @@
 
 # The chmod +w is to handle env var CVSREAD=1.  Files named
 # are identified by being the value of `generated-autoload-file'.
-# The Makefile dependency is to make any missing-file error more explicit.
-autoloads: $(LOADDEFS) ../src/Makefile doit
+autoloads: $(LOADDEFS) 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; \
-	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
+	$(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -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.