aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-27 21:26:09 -0400
committerGlenn Morris2014-06-27 21:26:09 -0400
commit2c4e2e6fd3096eb615504e3cfc89c588ec620f78 (patch)
tree25e6a53f750d4263b82348c9ff092338c7122e00
parentbca0df810d32f5b757398107aa64e433a0aceac6 (diff)
downloademacs-2c4e2e6fd3096eb615504e3cfc89c588ec620f78.tar.gz
emacs-2c4e2e6fd3096eb615504e3cfc89c588ec620f78.zip
* lisp/Makefile.in (doit): Remove force rule.
(custom-deps, finder-data, autoloads, update-subdirs) (compile-one-process): PHONY targets do not need force rules.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/Makefile.in16
2 files changed, 11 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0f950e6aff..298380c011c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12014-06-28 Glenn Morris <rgm@gnu.org> 12014-06-28 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (doit): Remove force rule.
4 (custom-deps, finder-data, autoloads, update-subdirs)
5 (compile-one-process): PHONY targets do not need force rules.
6
3 * Makefile.in (compile-main, compile, compile-always): 7 * Makefile.in (compile-main, compile, compile-always):
4 No need to explicitly pass variables to ourself in recursive calls. 8 No need to explicitly pass variables to ourself in recursive calls.
5 9
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4624654c0d0..fefbd5cda56 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -149,9 +149,7 @@ setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
149# we add them here to make sure they get built. 149# we add them here to make sure they get built.
150all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el 150all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
151 151
152doit: 152.PHONY: all custom-deps finder-data autoloads update-subdirs
153
154.PHONY: all doit custom-deps finder-data autoloads update-subdirs
155 153
156# custom-deps and finder-data both used to scan _all_ the *.el files. 154# custom-deps and finder-data both used to scan _all_ the *.el files.
157# This could lead to problems in parallel builds if automatically 155# This could lead to problems in parallel builds if automatically
@@ -169,7 +167,7 @@ doit:
169# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp). 167# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
170$(lisp)/cus-load.el: 168$(lisp)/cus-load.el:
171 $(MAKE) custom-deps 169 $(MAKE) custom-deps
172custom-deps: doit 170custom-deps:
173 $(setwins_almost); \ 171 $(setwins_almost); \
174 echo Directories: $$wins; \ 172 echo Directories: $$wins; \
175 $(emacs) -l cus-dep \ 173 $(emacs) -l cus-dep \
@@ -178,7 +176,7 @@ custom-deps: doit
178 176
179$(lisp)/finder-inf.el: 177$(lisp)/finder-inf.el:
180 $(MAKE) finder-data 178 $(MAKE) finder-data
181finder-data: doit 179finder-data:
182 $(setwins_finder); \ 180 $(setwins_finder); \
183 echo Directories: $$wins; \ 181 echo Directories: $$wins; \
184 $(emacs) -l finder \ 182 $(emacs) -l finder \
@@ -192,7 +190,7 @@ finder-data: doit
192# Note that we set no-update-autoloads in _generated_ leim files. 190# Note that we set no-update-autoloads in _generated_ leim files.
193# If you want to allow autoloads in such files, remove that, 191# If you want to allow autoloads in such files, remove that,
194# and make this depend on leim. 192# and make this depend on leim.
195autoloads: $(LOADDEFS) doit 193autoloads: $(LOADDEFS)
196 cd $(lisp) && chmod +w $(AUTOGEN_VCS) 194 cd $(lisp) && chmod +w $(AUTOGEN_VCS)
197 $(setwins_almost); \ 195 $(setwins_almost); \
198 echo Directories: $$wins; \ 196 echo Directories: $$wins; \
@@ -216,7 +214,7 @@ obsolete-autoloads: ${lisp}/obsolete/*.el
216# we know that if we have an emacs executable, we also have a subdirs.el. 214# we know that if we have an emacs executable, we also have a subdirs.el.
217$(lisp)/subdirs.el: 215$(lisp)/subdirs.el:
218 $(MAKE) update-subdirs 216 $(MAKE) update-subdirs
219update-subdirs: doit 217update-subdirs:
220 $(setwins_for_subdirs); \ 218 $(setwins_for_subdirs); \
221 for file in $$wins; do \ 219 for file in $$wins; do \
222 $(srcdir)/../build-aux/update-subdirs $$file; \ 220 $(srcdir)/../build-aux/update-subdirs $$file; \
@@ -369,7 +367,7 @@ compile: $(LOADDEFS) autoloads compile-first
369# Compile all Lisp files. This is like `compile' but compiles files 367# Compile all Lisp files. This is like `compile' but compiles files
370# unconditionally. Some files don't actually get compiled because they 368# unconditionally. Some files don't actually get compiled because they
371# set the local variable no-byte-compile. 369# set the local variable no-byte-compile.
372compile-always: doit 370compile-always:
373 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc 371 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
374 $(MAKE) compile 372 $(MAKE) compile
375 373
@@ -402,7 +400,7 @@ compile-after-backup: backup-compiled-files compile-always
402# There is no reason to use this rule unless you only have a single 400# There is no reason to use this rule unless you only have a single
403# core and CPU time is an issue. 401# core and CPU time is an issue.
404.PHONY: compile-one-process 402.PHONY: compile-one-process
405compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc 403compile-one-process: $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc
406 $(emacs) $(BYTE_COMPILE_FLAGS) \ 404 $(emacs) $(BYTE_COMPILE_FLAGS) \
407 --eval "(batch-byte-recompile-directory 0)" $(lisp) 405 --eval "(batch-byte-recompile-directory 0)" $(lisp)
408 406