* 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.

1 files changed, 11 insertions, 4 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>