[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/Makefile.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/Makefile.in,v |
Date: |
Thu, 10 Apr 2008 03:40:08 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/10 03:40:07
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- Makefile.in 8 Apr 2008 22:12:12 -0000 1.104
+++ Makefile.in 10 Apr 2008 03:40:06 -0000 1.105
@@ -47,6 +47,9 @@
ETAGS = ../lib-src/etags
# Automatically generated autoload files, apart from lisp/loaddefs.el.
+# Note this includes only those files that need special rules to
+# build; ie it does not need to include things created via
+# generated-autoload-file (eg calc/calc-loaddefs.el).
LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
$(lisp)/calendar/diary-loaddefs.el \
$(lisp)/calendar/hol-loaddefs.el \
@@ -58,7 +61,7 @@
cus-load.el \
finder-inf.el \
subdirs.el \
- eshell/esh-groups.el \
+ eshell/esh-groups.el
# Files to compile before others during a bootstrap. This is done to
# speed up the bootstrap process. The CC files are compiled first
@@ -229,34 +232,65 @@
# 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-autoloads: $(lisp)/mh-e/mh-loaddefs.el
-$(lisp)/mh-e/mh-loaddefs.el: $(lisp)/mh-e/*.el
+MH_E_DIR = $(lisp)/mh-e
+## MH_E_SRC avoids a circular dependency warning for mh-loaddefs.el.
+MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \
+ $(MH_E_DIR)/mh-buffers.el $(MH_E_DIR)/mh-compat.el \
+ $(MH_E_DIR)/mh-comp.el $(MH_E_DIR)/mh-e.el \
+ $(MH_E_DIR)/mh-folder.el $(MH_E_DIR)/mh-funcs.el \
+ $(MH_E_DIR)/mh-gnus.el $(MH_E_DIR)/mh-identity.el \
+ $(MH_E_DIR)/mh-inc.el $(MH_E_DIR)/mh-junk.el \
+ $(MH_E_DIR)/mh-letter.el $(MH_E_DIR)/mh-limit.el \
+ $(MH_E_DIR)/mh-mime.el $(MH_E_DIR)/mh-print.el \
+ $(MH_E_DIR)/mh-scan.el $(MH_E_DIR)/mh-search.el \
+ $(MH_E_DIR)/mh-seq.el $(MH_E_DIR)/mh-show.el \
+ $(MH_E_DIR)/mh-speed.el $(MH_E_DIR)/mh-thread.el \
+ $(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \
+ $(MH_E_DIR)/mh-xface.el
+
+mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
+$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
--eval "(setq generated-autoload-file \"address@hidden")" \
--eval "(setq make-backup-files nil)" \
- -f batch-update-autoloads $(lisp)/mh-e
+ -f batch-update-autoloads $(MH_E_DIR)
+
+CAL_DIR = $(lisp)/calendar
+## Those files that may contain internal calendar autoload cookies.
+## Avoids circular dependency warning for *-loaddefs.el.
+CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \
+ $(CAL_DIR)/cal-coptic.el $(CAL_DIR)/cal-dst.el \
+ $(CAL_DIR)/cal-french.el $(CAL_DIR)/cal-hebrew.el \
+ $(CAL_DIR)/cal-html.el $(CAL_DIR)/cal-islam.el \
+ $(CAL_DIR)/cal-iso.el $(CAL_DIR)/cal-julian.el \
+ $(CAL_DIR)/cal-mayan.el $(CAL_DIR)/cal-menu.el \
+ $(CAL_DIR)/cal-move.el $(CAL_DIR)/cal-persia.el \
+ $(CAL_DIR)/cal-tex.el $(CAL_DIR)/cal-x.el \
+ $(CAL_DIR)/calendar.el $(CAL_DIR)/diary-lib.el \
+ $(CAL_DIR)/holidays.el $(CAL_DIR)/lunar.el \
+ $(CAL_DIR)/solar.el
-$(lisp)/calendar/cal-loaddefs.el: $(lisp)/calendar/*.el
+$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
--eval "(setq generated-autoload-file \"address@hidden")" \
--eval "(setq make-backup-files nil)" \
- -f batch-update-autoloads $(lisp)/calendar
+ -f batch-update-autoloads $(CAL_DIR)
-$(lisp)/calendar/diary-loaddefs.el: $(lisp)/calendar/*.el
+$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
--eval "(setq generated-autoload-file \"address@hidden")" \
--eval "(setq make-backup-files nil)" \
- -f batch-update-autoloads $(lisp)/calendar
+ -f batch-update-autoloads $(CAL_DIR)
-$(lisp)/calendar/hol-loaddefs.el: $(lisp)/calendar/*.el
+$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
$(emacs) -l autoload \
--eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
--eval "(setq generated-autoload-file \"address@hidden")" \
--eval "(setq make-backup-files nil)" \
- -f batch-update-autoloads $(lisp)/calendar
+ -f batch-update-autoloads $(CAL_DIR)
# Prepare a bootstrap in the lisp subdirectory.
#
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Stefan Monnier, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Stefan Monnier, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Stefan Monnier, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Glenn Morris, 2008/04/11
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/18
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/18
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Stefan Monnier, 2008/04/21
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/22
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/22
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Stefan Monnier, 2008/04/23
- [Emacs-diffs] Changes to emacs/lisp/Makefile.in,v, Andreas Schwab, 2008/04/27