* src/Makefile.in (emacs${EXEEXT}): Depend on the machine-specific files.

(bootstrap-clean): New target that keeps TAGS around.
(../lisp/subdirs.el, ../lisp/loaddefs.el): New targets.
(bootstrap-emacs${EXEEXT}): Depend on subdirs.el.
* lisp/Makefile.in (all): New target.
(bootstrap-prepare): Remove.
* Makefile.in (SUBDIR): Include `lisp'.
(lisp): Depend on `src'.
(top_distclean): Don't remove config.status.
(bootstrap-clean): New target.
(maintainer-clean): Use it.
(bootstrap): Use bootstrap-clean.  Re-run config.status.
(src/bootstrap-emacs${EXEEXT}): New target.
(bootstrap-build): Use it.  Don't use bootstrap-prepare because
src/Makefile now takes care of it.
(bootfast, bootstrap-clean-before, bootstrap-clean-before-fast): Remove.

2 files changed, 23 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4434b1d45e1..791ea6dcaa5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,17 @@
+2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (emacs${EXEEXT}): Depend on the machine-specific files.
+        (bootstrap-clean): New target that keeps TAGS around.
+        (../lisp/subdirs.el, ../lisp/loaddefs.el): New targets.
+        (bootstrap-emacs${EXEEXT}): Depend on subdirs.el.
+
 2008-06-20  Jason Rumney  <jasonr@gnu.org>
 
-        * w32fns.c, w32term.c, w32term.h, w32gui.h [OLD_FONT]: Remove
-        obsolete font code.
+        * w32fns.c, w32term.c, w32term.h, w32gui.h [OLD_FONT]:
+        Remove obsolete font code.
 
-        * w32font.c (font_matches_spec): Use csb bitfield from font signature
-        to determine language support.
+        * w32font.c (font_matches_spec): Use csb bitfield from font signature
+        to determine language support.
 
 2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/src/Makefile.in b/src/Makefile.in
index a64ff668bdd..85b1c6c0f34 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -906,7 +906,7 @@ RUN_TEMACS = `/bin/pwd`/temacs
 
 all: emacs${EXEEXT} OTHER_FILES
 
-emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp}
+emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
 #ifdef CANNOT_DUMP
         rm -f emacs${EXEEXT}
         ln temacs${EXEEXT} emacs${EXEEXT}
@@ -1284,6 +1284,10 @@ distclean: clean
         mv ./.gdbinit ./.gdbinit.save
         if test -f "${srcdir}/.gdbinit"; then rm -f ./.gdbinit.save; \
         else mv ./.gdbinit.save ./.gdbinit; fi
+/* bootstrap-clean is used to clean up just before a bootstrap.
+   It should remove all files generated during a compilation/bootstrap,
+   but not things like config.status or TAGS.  */
+bootstrap-clean: distclean
 maintainer-clean: distclean
         @echo "This command is intended for maintainers to use;"
         @echo "it deletes files that may require special tools to rebuild."
@@ -1318,10 +1322,16 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS
 
 bootstrap: bootstrap-emacs${EXEEXT}
 
+../lisp/subdirs.el:
+        cd $(lispsource); $(MAKE) update-subdirs
+
+../lisp/loaddefs.el: bootstrap-emacs${EXEEXT}
+        cd $(lispsource); $(MAKE) autoloads EMACS=../src/bootstrap-emacs${EXEEXT}
+
 /* Dump an Emacs executable named bootstrap-emacs containing the
    files from loadup.el in source form.  */
 
-bootstrap-emacs${EXEEXT}: temacs${EXEEXT} ${lispsource}international/charprop.el
+bootstrap-emacs${EXEEXT}: temacs${EXEEXT} ${lispsource}international/charprop.el ../lisp/subdirs.el
 #ifdef CANNOT_DUMP
         ln temacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #else