aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-27 21:16:23 -0400
committerGlenn Morris2014-06-27 21:16:23 -0400
commitbca0df810d32f5b757398107aa64e433a0aceac6 (patch)
treec04b06f93615b680e5b4c5ee413c725ac9e83511
parent06a9b8f6eb1108cc63d0c1dd95275dfa8b37a291 (diff)
downloademacs-bca0df810d32f5b757398107aa64e433a0aceac6.tar.gz
emacs-bca0df810d32f5b757398107aa64e433a0aceac6.zip
lisp/Makefile tiny simplification
* lisp/Makefile.in (compile-main, compile, compile-always): No need to explicitly pass variables to ourself in recursive calls.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in10
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aab65df93b8..a0f950e6aff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-06-28 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (compile-main, compile, compile-always):
4 No need to explicitly pass variables to ourself in recursive calls.
5
12014-06-28 Stefan Monnier <monnier@iro.umontreal.ca> 62014-06-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * files.el (minibuffer-with-setup-hook): Evaluate the first arg eagerly. 8 * files.el (minibuffer-with-setup-hook): Evaluate the first arg eagerly.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index cb732655299..4624654c0d0 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -308,7 +308,7 @@ compile-onefile:
308compile-first: $(COMPILE_FIRST) 308compile-first: $(COMPILE_FIRST)
309 309
310# In `compile-main' we could directly do 310# In `compile-main' we could directly do
311# ... | xargs $(MAKE) EMACS="$(EMACS)" 311# ... | xargs $(MAKE)
312# and it works, but it generates a lot of messages like 312# and it works, but it generates a lot of messages like
313# make[2]: gnus/gnus-mlspl.elc is up to date. 313# make[2]: gnus/gnus-mlspl.elc is up to date.
314# so instead, we use "xargs echo" to split the list of file into manageable 314# so instead, we use "xargs echo" to split the list of file into manageable
@@ -332,7 +332,7 @@ compile-main: leim semantic compile-clean
332 echo "$${el}c"; \ 332 echo "$${el}c"; \
333 done | xargs $(XARGS_LIMIT) echo) | \ 333 done | xargs $(XARGS_LIMIT) echo) | \
334 while read chunk; do \ 334 while read chunk; do \
335 $(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ 335 $(MAKE) compile-targets TARGETS="$$chunk"; \
336 done 336 done
337 337
338.PHONY: compile-clean 338.PHONY: compile-clean
@@ -363,17 +363,15 @@ semantic:
363# date. Some .el files don't get compiled because they set the 363# date. Some .el files don't get compiled because they set the
364# local variable no-byte-compile. 364# local variable no-byte-compile.
365# Calling make recursively because suffix rule cannot have prerequisites. 365# Calling make recursively because suffix rule cannot have prerequisites.
366# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
367# sub-makes that run rules that use it, for the sake of some non-GNU makes.
368compile: $(LOADDEFS) autoloads compile-first 366compile: $(LOADDEFS) autoloads compile-first
369 $(MAKE) compile-main EMACS="$(EMACS)" 367 $(MAKE) compile-main
370 368
371# Compile all Lisp files. This is like `compile' but compiles files 369# Compile all Lisp files. This is like `compile' but compiles files
372# unconditionally. Some files don't actually get compiled because they 370# unconditionally. Some files don't actually get compiled because they
373# set the local variable no-byte-compile. 371# set the local variable no-byte-compile.
374compile-always: doit 372compile-always: doit
375 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc 373 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
376 $(MAKE) compile EMACS="$(EMACS)" 374 $(MAKE) compile
377 375
378.PHONY: backup-compiled-files compile-after-backup 376.PHONY: backup-compiled-files compile-after-backup
379 377