* Makefile.in ${SUBDIR}: Pass additional BOOTSTRAPEMACS argument.

* Makefile.in (${lisp} ${SOME_MACHINE_LISP}, ../lisp/loaddefs.el):
Use $(BOOTSTRAPEMACS) rather than witness-emacs.
(bootstrap-emacs${EXEEXT}): Merge witness-emacs into it.
(witness-emacs): Remove.
(lisp, shortlisp): Move loaddefs.el earlier.
(mostlyclean): Forget about witness-emacs.
* Makefile.in (COMPILE_FIRST): Trim down and add autoload.el.

2 files changed, 8 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd261b239d6..9fa1098b70b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (COMPILE_FIRST): Trim down and add autoload.el.
+
 2008-06-21  John Paul Wallington  <jpw@pobox.com>
 
         * emacs-lisp/derived.el (define-derived-mode): Add `doc-string' decl.
@@ -21,8 +25,8 @@
 
         * emacs-lisp/debug.el (help-xref-interned): Declare.
 
-        * emacs-lisp/easy-mmode.el (easy-mmode-set-keymap-parents): Evaluate
-        definition when compiling.
+        * emacs-lisp/easy-mmode.el (easy-mmode-set-keymap-parents):
+        Evaluate definition when compiling.
 
         * progmodes/bug-reference.el (bug-reference-map): Bind down-mouse-1
         rather than mouse-1.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d391080f493..7a94886735c 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -63,18 +63,11 @@ AUTOGENEL = loaddefs.el \
 
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.
-# Why `subr.elc'?  It's dumped so byte-compiling it early shouldn't make
-# any difference!?  --Stef
-# Some CC files are compiled first because CC mode tweaks the compilation
-# process, and requiring cc-mode when it is not compiled doesn't work during
-# the bootstrapping.
 
 COMPILE_FIRST = \
         $(lisp)/emacs-lisp/bytecomp.elc \
         $(lisp)/emacs-lisp/byte-opt.elc \
-        $(lisp)/subr.elc \
-        $(lisp)/progmodes/cc-mode.elc \
-        $(lisp)/progmodes/cc-vars.elc
+        $(lisp)/emacs-lisp/autoload.elc
 
 # The actual Emacs command run in the targets below.
 
@@ -145,7 +138,7 @@ autoloads: $(LOADDEFS) doit
         echo Directories: $$wins; \
         $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
 
-# This is required by the witness-emacs target in ../src/Makefile, so
+# 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.
 $(lisp)/subdirs.el:
         $(MAKE) $(MFLAGS) update-subdirs