diff options
| author | Paul Eggert | 2015-01-03 18:50:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-03 18:54:34 -0800 |
| commit | ccb2d93859f6c7e41c648cf3371e42ee265e3408 (patch) | |
| tree | a0d5e946d9be47da1c1547aacf4aabec988f8680 /lisp | |
| parent | 0d85a0c05e9676c57c0dcc140c6d0347bee611d1 (diff) | |
| download | emacs-ccb2d93859f6c7e41c648cf3371e42ee265e3408.tar.gz emacs-ccb2d93859f6c7e41c648cf3371e42ee265e3408.zip | |
Less 'make' chatter for lisp dir
* lisp/Makefile.in (THEFILE): Define to be 'no-such-file' by default,
to make it clearer that the caller must specify it.
(compile-onefile): Remove, replacing by ...
($(THEFILE)c): ... new rule. This lets us use AM_V_GEN here.
($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
Use AM_V_GEN to lessen 'make' chatter.
(.el.elc): Omit duplicate comment.
* src/Makefile.in (%.elc): Adjust to compile-onefile change in
../lisp/Makefile.in.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/Makefile.in | 27 |
2 files changed, 21 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2feb2af917f..aa79a8d4b2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,16 @@ | |||
| 1 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Less 'make' chatter for lisp dir | ||
| 4 | * Makefile.in (THEFILE): Define to be 'no-such-file' by default, | ||
| 5 | to make it clearer that the caller must specify it. | ||
| 6 | (compile-onefile): Remove, replacing by ... | ||
| 7 | ($(THEFILE)c): ... new rule. This lets us use AM_V_GEN here. | ||
| 8 | ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el) | ||
| 9 | ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el) | ||
| 10 | ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): | ||
| 11 | Use AM_V_GEN to lessen 'make' chatter. | ||
| 12 | (.el.elc): Omit duplicate comment. | ||
| 13 | |||
| 3 | Less 'make' chatter in batch mode | 14 | Less 'make' chatter in batch mode |
| 4 | * emacs-lisp/autoload.el (autoload-generate-file-autoloads): | 15 | * emacs-lisp/autoload.el (autoload-generate-file-autoloads): |
| 5 | * emacs-lisp/bytecomp.el (byte-compile-file): | 16 | * emacs-lisp/bytecomp.el (byte-compile-file): |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 67855baf9f3..565ca77de3b 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -257,12 +257,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | |||
| 257 | # src/Makefile.in to rebuild a particular Lisp file, no questions asked. | 257 | # src/Makefile.in to rebuild a particular Lisp file, no questions asked. |
| 258 | # Use byte-compile-refresh-preloaded to try and work around some of | 258 | # Use byte-compile-refresh-preloaded to try and work around some of |
| 259 | # the most common problems of not bootstrapping from a clean state. | 259 | # the most common problems of not bootstrapping from a clean state. |
| 260 | .PHONY: compile-onefile | 260 | THEFILE = no-such-file |
| 261 | compile-onefile: | 261 | .PHONY: $(THEFILE)c |
| 262 | @echo Compiling $(THEFILE) | 262 | $(THEFILE)c: |
| 263 | @# Use byte-compile-refresh-preloaded to try and work around some of | 263 | $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) \ |
| 264 | @# the most common bootstrapping problems. | ||
| 265 | @$(emacs) $(BYTE_COMPILE_FLAGS) \ | ||
| 266 | -l bytecomp -f byte-compile-refresh-preloaded \ | 264 | -l bytecomp -f byte-compile-refresh-preloaded \ |
| 267 | -f batch-byte-compile $(THEFILE) | 265 | -f batch-byte-compile $(THEFILE) |
| 268 | 266 | ||
| @@ -278,12 +276,7 @@ compile-onefile: | |||
| 278 | # An old-fashioned suffix rule, which, according to the GNU Make manual, | 276 | # An old-fashioned suffix rule, which, according to the GNU Make manual, |
| 279 | # cannot have prerequisites. | 277 | # cannot have prerequisites. |
| 280 | .el.elc: | 278 | .el.elc: |
| 281 | @echo Compiling $< | 279 | $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $< |
| 282 | @# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler | ||
| 283 | @# files, which is normally done in compile-first, but may also be | ||
| 284 | @# recompiled via this rule. | ||
| 285 | @$(emacs) $(BYTE_COMPILE_FLAGS) \ | ||
| 286 | -f batch-byte-compile $< | ||
| 287 | 280 | ||
| 288 | .PHONY: compile-first compile-main compile compile-always | 281 | .PHONY: compile-first compile-main compile compile-always |
| 289 | 282 | ||
| @@ -404,7 +397,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \ | |||
| 404 | .PHONY: mh-autoloads | 397 | .PHONY: mh-autoloads |
| 405 | mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el | 398 | mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el |
| 406 | $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) | 399 | $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) |
| 407 | $(emacs) -l autoload \ | 400 | $(AM_V_GEN)$(emacs) -l autoload \ |
| 408 | --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ | 401 | --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ |
| 409 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ | 402 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ |
| 410 | -f batch-update-autoloads $(MH_E_DIR) | 403 | -f batch-update-autoloads $(MH_E_DIR) |
| @@ -421,7 +414,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \ | |||
| 421 | $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el | 414 | $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el |
| 422 | 415 | ||
| 423 | $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) | 416 | $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) |
| 424 | $(emacs) -l autoload \ | 417 | $(AM_V_GEN)$(emacs) -l autoload \ |
| 425 | --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ | 418 | --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ |
| 426 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ | 419 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ |
| 427 | -f batch-update-autoloads $(TRAMP_DIR) | 420 | -f batch-update-autoloads $(TRAMP_DIR) |
| @@ -442,19 +435,19 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \ | |||
| 442 | $(CAL_DIR)/solar.el | 435 | $(CAL_DIR)/solar.el |
| 443 | 436 | ||
| 444 | $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC) | 437 | $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC) |
| 445 | $(emacs) -l autoload \ | 438 | $(AM_V_GEN)$(emacs) -l autoload \ |
| 446 | --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ | 439 | --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ |
| 447 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ | 440 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ |
| 448 | -f batch-update-autoloads $(CAL_DIR) | 441 | -f batch-update-autoloads $(CAL_DIR) |
| 449 | 442 | ||
| 450 | $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el | 443 | $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el |
| 451 | $(emacs) -l autoload \ | 444 | $(AM_V_GEN)$(emacs) -l autoload \ |
| 452 | --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ | 445 | --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ |
| 453 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ | 446 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ |
| 454 | -f batch-update-autoloads $(CAL_DIR) | 447 | -f batch-update-autoloads $(CAL_DIR) |
| 455 | 448 | ||
| 456 | $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el | 449 | $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el |
| 457 | $(emacs) -l autoload \ | 450 | $(AM_V_GEN)$(emacs) -l autoload \ |
| 458 | --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ | 451 | --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ |
| 459 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ | 452 | --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ |
| 460 | -f batch-update-autoloads $(CAL_DIR) | 453 | -f batch-update-autoloads $(CAL_DIR) |