(autoloads): Revert previous change.

2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 387ddb72c9f..d6610f6e34b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 61f4d51461c..78e95900b72 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -145,16 +145,13 @@ 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'.
-# 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.