From: Andreas Schwab <schwab@suse.de>
Date: Tue, 22 Apr 2008 06:53:52 +0000 (+0000)
Subject: Unbreak bootstrap.
X-Git-Tag: emacs-pretest-23.0.90~6137
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9b96e40c5ce007c6be248b264ae34cfb0f15b80;p=emacs.git

Unbreak bootstrap.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e3108624b5..c08e64b81dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -29,12 +29,6 @@
 
 	* add-log.el (top-level): Require 'cl when compiling.
 
-2008-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	* Makefile.in ($(MH_E_DIR)/mh-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
-	($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
-	Undo last change.
-
 2008-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* complete.el (PC-complete-as-file-name, PC-read-file-name-internal):
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e02f42bec29..4ed0fd76d1d 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -252,7 +252,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el    \
 	$(MH_E_DIR)/mh-xface.el
 
 mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
-$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
+$(MH_E_DIR)/mh-loaddefs.el: $(lisp)/subdirs.el $(MH_E_SRC)
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
 	   --eval "(setq generated-autoload-file \"$@\")" \
@@ -274,21 +274,21 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el  \
 	$(CAL_DIR)/holidays.el    $(CAL_DIR)/lunar.el      \
 	$(CAL_DIR)/solar.el
 
-$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
+$(CAL_DIR)/cal-loaddefs.el: $(lisp)/subdirs.el $(CAL_SRC)
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
 	   --eval "(setq generated-autoload-file \"$@\")" \
 	   --eval "(setq make-backup-files nil)" \
 	   -f batch-update-autoloads $(CAL_DIR)
 
-$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
+$(CAL_DIR)/diary-loaddefs.el: $(lisp)/subdirs.el $(CAL_SRC)
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
 	   --eval "(setq generated-autoload-file \"$@\")" \
 	   --eval "(setq make-backup-files nil)" \
 	   -f batch-update-autoloads $(CAL_DIR)
 
-$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
+$(CAL_DIR)/hol-loaddefs.el: $(lisp)/subdirs.el $(CAL_SRC)
 	$(emacs) -l autoload \
 	   --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
 	   --eval "(setq generated-autoload-file \"$@\")" \