Revert incorrect fix for claimed bootstrap breakage.

2 files changed, 13 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90cbdad0d7f..ea4dad18234 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in: Revert incorrect fix for claimed bootstrap breakage.
+
 2008-05-01  Daiki Ueno  <ueno@unixuser.org>
 
         * epa-file-hook.el: New file split from epa-file.el.
@@ -590,6 +594,10 @@
         (whitespace-report-list): Const initialization fix.
         (whitespace-color-on): Code fix.
 
+2008-04-27  Andreas Schwab  <schwab@suse.de>
+
+        * Makefile.el: Unbreak bootstrap.
+
 2008-04-27  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-replace-environment-variables): New defun.
@@ -872,6 +880,8 @@
         * cus-start.el: Remove insert-default-directory and
         read-file-name-completion-ignore-case.
 
+        * Makefile.in (emacs-deps): Leave it empty.
+
 2008-04-23  Magnus Henoch  <mange@freemail.hu>
 
         * tar-mode.el (tar-untar-buffer): If the entry has directory
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 396f39f80d7..935370e8fb0 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -81,7 +81,9 @@ COMPILE_FIRST = \
 
 emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 # Prerequisites for running $(emacs)
-emacs-deps = $(lisp)/subdirs.el
+# This should not be necessary because in order to have ../src/emacs
+# we must have built subdirs.el already.
+# emacs-deps = $(lisp)/subdirs.el
 
 # Common command to find subdirectories