diff options
| author | Eli Zaretskii | 2008-03-14 16:49:31 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2008-03-14 16:49:31 +0000 |
| commit | c79a07d79534a2f7c207379e0809f763e0feda6f (patch) | |
| tree | 307d0d16376c9264b2e92bc9c77ac17395a7e386 | |
| parent | f507f365a77d2a43bc1f57797bfdb945bd73ec57 (diff) | |
| download | emacs-c79a07d79534a2f7c207379e0809f763e0feda6f.tar.gz emacs-c79a07d79534a2f7c207379e0809f763e0feda6f.zip | |
($(lisp)/calendar/cal-loaddefs.el, $(lisp)/calendar/diary-loaddefs.el)
($(lisp)/calendar/hol-loaddefs.el): New targets.
(LOADDEFS): New macro.
(autoloads): Depend on $(LOADDEFS).
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 30 |
2 files changed, 37 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 263a0e4407a..67ecd1ade23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2008-03-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(lisp)/calendar/cal-loaddefs.el) | ||
| 4 | ($(lisp)/calendar/diary-loaddefs.el) | ||
| 5 | ($(lisp)/calendar/hol-loaddefs.el): New targets. | ||
| 6 | (LOADDEFS): New macro. | ||
| 7 | (autoloads): Depend on $(LOADDEFS). | ||
| 8 | |||
| 1 | 2008-03-14 Dan Nicolaescu <dann@ics.uci.edu> | 9 | 2008-03-14 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 10 | ||
| 3 | * font-lock.el (featurep): Remove test, not useful anymore. | 11 | * font-lock.el (featurep): Remove test, not useful anymore. |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 205c29cb669..a0884b99962 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -56,6 +56,10 @@ lisptagsfiles1 = $(lisp)/*.el | |||
| 56 | lisptagsfiles2 = $(lisp)/*/*.el | 56 | lisptagsfiles2 = $(lisp)/*/*.el |
| 57 | ETAGS = "../lib-src/$(BLD)/etags" | 57 | ETAGS = "../lib-src/$(BLD)/etags" |
| 58 | 58 | ||
| 59 | # Automatically generated autoload files, apart from lisp/loaddefs.el. | ||
| 60 | LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ | ||
| 61 | $(lisp)/calendar/diary-loaddefs.el $(lisp)/calendar/hol-loaddefs.el | ||
| 62 | |||
| 59 | # Files to compile before others during a bootstrap. This is done to | 63 | # Files to compile before others during a bootstrap. This is done to |
| 60 | # speed up the bootstrap process. The CC files are compiled first | 64 | # speed up the bootstrap process. The CC files are compiled first |
| 61 | # because CC mode tweaks the compilation process, and requiring | 65 | # because CC mode tweaks the compilation process, and requiring |
| @@ -162,7 +166,7 @@ loaddefs.el-CMD: | |||
| 162 | # | 166 | # |
| 163 | # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as | 167 | # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as |
| 164 | # this can break with GNU Make 3.81 and later if sh.exe is used. | 168 | # this can break with GNU Make 3.81 and later if sh.exe is used. |
| 165 | autoloads: $(lisp)/loaddefs.el doit | 169 | autoloads: $(lisp)/loaddefs.el $(LOADDEFS) doit |
| 166 | @echo Directories: . $(WINS_ALMOST) | 170 | @echo Directories: . $(WINS_ALMOST) |
| 167 | $(emacs) -l autoload \ | 171 | $(emacs) -l autoload \ |
| 168 | --eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ | 172 | --eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ |
| @@ -310,6 +314,30 @@ $(lisp)/progmodes/cc-mode.elc: \ | |||
| 310 | $(lisp)/progmodes/cc-defs.el | 314 | $(lisp)/progmodes/cc-defs.el |
| 311 | $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el | 315 | $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el |
| 312 | 316 | ||
| 317 | $(lisp)/calendar/cal-loaddefs.el: | ||
| 318 | "$(EMACS)" $(EMACSOPT) -l autoload \ | ||
| 319 | --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ | ||
| 320 | --eval "(setq find-file-suppress-same-file-warnings t)" \ | ||
| 321 | --eval "(setq make-backup-files nil)" \ | ||
| 322 | -f w32-batch-update-autoloads "$(lisp)/calendar/cal-loaddefs.el" \ | ||
| 323 | ./calendar | ||
| 324 | |||
| 325 | $(lisp)/calendar/diary-loaddefs.el: | ||
| 326 | "$(EMACS)" $(EMACSOPT) -l autoload \ | ||
| 327 | --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ | ||
| 328 | --eval "(setq find-file-suppress-same-file-warnings t)" \ | ||
| 329 | --eval "(setq make-backup-files nil)" \ | ||
| 330 | -f w32-batch-update-autoloads $(lisp)/calendar/diary-loaddefs.el \ | ||
| 331 | ./calendar | ||
| 332 | |||
| 333 | $(lisp)/calendar/hol-loaddefs.el: | ||
| 334 | "$(EMACS)" $(EMACSOPT) -l autoload \ | ||
| 335 | --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ | ||
| 336 | --eval "(setq find-file-suppress-same-file-warnings t)" \ | ||
| 337 | --eval "(setq make-backup-files nil)" \ | ||
| 338 | -f w32-batch-update-autoloads $(lisp)/calendar/hol-loaddefs.el \ | ||
| 339 | ./calendar | ||
| 340 | |||
| 313 | # Update MH-E internal autoloads. These are not to be confused with | 341 | # Update MH-E internal autoloads. These are not to be confused with |
| 314 | # the autoloads for the MH-E entry points, which are already in | 342 | # the autoloads for the MH-E entry points, which are already in |
| 315 | # loaddefs.el. | 343 | # loaddefs.el. |