* mh-e/mh-loaddefs.el: Removed. Now generated automatically.

* Makefile.in (AUTOGENEL): Added mh-e/mh-loaddefs.el.
(MH-E-SRC): Added. Used by mh-autoloads.
(mh-autoloads): Added. Builds mh-e/mh-loaddefs.el. Rebuilds if any
files in MH-E-SRC have been updated.
(compile, recompile, bootstrap): Depend on mh-autoloads.

1 files changed, 43 insertions, 4 deletions

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index b8501c5021d..07231d57405 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -44,7 +44,8 @@ AUTOGENEL = loaddefs.el \
 	cus-load.el \
 	finder-inf.el \
 	subdirs.el \
-	eshell/esh-groups.el
+	eshell/esh-groups.el \
+	mh-e/mh-loaddefs.el
 
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.  The CC files are compiled first
@@ -148,7 +149,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 # subdirectories, to make sure require's and load's in the files being
 # compiled find the right files.
 
-compile: $(lisp)/subdirs.el doit
+compile: $(lisp)/subdirs.el mh-autoloads doit
 	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
 	wd=$(lisp); $(setwins);	\
 	els=`echo $$wins | tr ' \011' '\012\012' | \
@@ -201,7 +202,7 @@ compile-after-backup: backup-compiled-files compile-always
 # Note that this doesn't create .elc files.  It only recompiles if an
 # .elc is present.
 
-recompile: doit $(lisp)/progmodes/cc-mode.elc
+recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc
 	$(EMACS) $(EMACSOPT) --eval "(batch-byte-recompile-directory 0)" $(lisp)
 
 # CC Mode uses a compile time macro system which causes a compile time
@@ -213,6 +214,44 @@ $(lisp)/progmodes/cc-mode.elc: \
 	$(lisp)/progmodes/cc-defs.el
 	$(EMACS) $(EMACSOPT) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el
 
+# Update MH-E internal autoloads. These are not to be confused with
+# the autoloads for the MH-E entry points, which are already in
+# loaddefs.el.
+MH-E-SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el	\
+	$(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el	\
+	$(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el		\
+	$(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el		\
+	$(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el		\
+	$(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el	\
+	$(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el	\
+	$(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el		\
+	$(lisp)/mh-e/mh-utils.el
+
+mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
+$(lisp)/mh-e/mh-loaddefs.el: $(MH-E-SRC)
+	echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
+	echo ";;" >> $@
+	echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
+	echo ";;; Author: Bill Wohler <wohler@newt.com>" >> $@
+	echo ";;; Keywords: mail" >> $@
+	echo ";;; Commentary:" >> $@
+	echo ";;; Change Log:" >> $@
+	echo ";;; Code:" >> $@
+	$(EMACS) $(EMACSOPT) \
+	   -l autoload \
+	   --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
+	   --eval "(setq generated-autoload-file (expand-file-name \"mh-e/mh-loaddefs.el\"))" \
+	   --eval "(setq make-backup-files nil)" \
+	   -f batch-update-autoloads mh-e
+	echo "" >> $@
+	echo "(provide 'mh-loaddefs)" >> $@
+	echo ";;; Local Variables:" >> $@
+	echo ";;; version-control: never" >> $@
+	echo ";;; no-byte-compile: t" >> $@
+	echo ";;; no-update-autoloads: t" >> $@
+	echo ";;; End:" >> $@
+	echo ";;; mh-loaddefs.el ends here" >> $@
+
 # Prepare a bootstrap in the lisp subdirectory.
 #
 # Build loaddefs.el to make sure it's up-to-date.  If it's not, that
@@ -241,7 +280,7 @@ bootstrap-clean:
 
 # Generate/update files for the bootstrap process.
 
-bootstrap: update-subdirs autoloads compile
+bootstrap: update-subdirs autoloads mh-autoloads compile
 
 # Generate/update files after the bootstrap process.
 # custom-deps needs `preloaded-file-list'.