(bootstrap-clean): Run autogen-clean.

(maintainer-clean): No need to run autogen-clean now it is included in
bootstrap-clean.

2 files changed, 25 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5174018a68..67da7b82c0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2008-06-07  Glenn Morris  <rgm@gnu.org>
+
+        * finder.el (finder-compile-keywords): Use lm-keywords-list rather than
+        lm-keywords.
+
+        * mail/sendmail.el (mail-interactive): Add :version.
+
+        * term/linux.el (terminal-init-linux): Use gpm-mouse-mode rather than
+        obsolete alias.
+
+        * ediff-merg.el, strokes.el, wid-edit.el, emacs-lisp/lisp-mnt.el:
+        * emulation/edt-mapper.el, eshell/em-dirs.el, eshell/em-glob.el:
+        * eshell/em-ls.el, eshell/em-unix.el, eshell/esh-cmd.el:
+        * eshell/esh-io.el, eshell/esh-opt.el, eshell/esh-test.el:
+        * eshell/esh-util.el, international/mule-cmds.el:
+        * international/mule-diag.el, mail/smtpmail.el, net/netrc.el:
+        * net/tls.el, progmodes/etags.el, textmodes/page-ext.el:
+        Remove unnecessary eval-when-compiles and eval-and-compiles.
+
+        * Makefile.in (bootstrap-clean): Run autogen-clean.
+        (maintainer-clean): No need to run autogen-clean now it is included in
+        bootstrap-clean.
+
 2008-06-06  Miles Bader  <miles@gnu.org>
 
         * Makefile.in (ELCFILES): Add gnus/nndir.elc.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 78ca42b4993..9c2410fc96d 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1401,12 +1401,9 @@ bootstrap-prepare:
 autogen-clean:
         cd $(lisp); rm -f $(AUTOGENEL)
 
-maintainer-clean: distclean bootstrap-clean autogen-clean
+maintainer-clean: distclean bootstrap-clean
 
-## NB note that this rules assume only one level of subdirs below lisp/.
-## If nested subdirs are added, it's probably time to switch to:
-## find $(lisp) -name "*.elc" -exec rm -f '{}' ';'
-bootstrap-clean:
+bootstrap-clean: autogen-clean
         cd $(lisp); rm -f *.elc */*.elc
 
 # Generate/update files for the bootstrap process.