aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-06-21 19:33:21 +0000
committerGlenn Morris2008-06-21 19:33:21 +0000
commit7fae72ef7e8f31e1456b13cbb36e3015f79217a0 (patch)
treeb7a49531853055349385fe585fbeda9bda945dc2
parent727f1976d382be8a1461ef599cc7754d2a179aaf (diff)
downloademacs-7fae72ef7e8f31e1456b13cbb36e3015f79217a0.tar.gz
emacs-7fae72ef7e8f31e1456b13cbb36e3015f79217a0.zip
Comment fixes.
-rw-r--r--lisp/Makefile.in13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index a201769d4a5..badd94e56b3 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -100,7 +100,7 @@ setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \
100 100
101# `compile-main' tends to be slower than `recompile' but can be parallelized 101# `compile-main' tends to be slower than `recompile' but can be parallelized
102# with "make -j" and results in more deterministic compilation warnings. 102# with "make -j" and results in more deterministic compilation warnings.
103# cus-load ans finder-inf are not explicitly requested by anything, so 103# cus-load and finder-inf are not explicitly requested by anything, so
104# we add them here to make sure they get built. 104# we add them here to make sure they get built.
105all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el 105all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
106 @: Let us check that we byte-compiled all the files. 106 @: Let us check that we byte-compiled all the files.
@@ -109,18 +109,19 @@ all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
109doit: 109doit:
110 110
111# custom-deps and finder-data both used to scan _all_ the *.el files. 111# custom-deps and finder-data both used to scan _all_ the *.el files.
112# Now they avoid auto-generated files, which should avoid this 112# This could lead to problems in parallel builds if automatically
113# historical problem: 113# generated *.el files (eg loaddefs etc) were being changed at the same time.
114# In parallel builds, they should not run at the same time as anything
115# else that might modify any .el files, eg autoloads (or each other).
116# One solution was to add autoloads as a prerequisite: 114# One solution was to add autoloads as a prerequisite:
117# http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html 115# http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html
118# http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00171.html 116# http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00171.html
119# However, this means that running these targets modifies loaddefs.el, 117# However, this meant that running these targets modified loaddefs.el,
120# every time (due to time-stamping). Calling these rules from 118# every time (due to time-stamping). Calling these rules from
121# bootstrap-after would modify loaddefs after src/emacs, resulting 119# bootstrap-after would modify loaddefs after src/emacs, resulting
122# in make install remaking src/emacs for no real reason: 120# in make install remaking src/emacs for no real reason:
123# http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00311.html 121# http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00311.html
122# Nowadays these commands don't scan automatically generated files,
123# since they will never contain any useful information
124# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
124$(lisp)/cus-load.el: 125$(lisp)/cus-load.el:
125 $(MAKE) $(MFLAGS) custom-deps 126 $(MAKE) $(MFLAGS) custom-deps
126custom-deps: doit 127custom-deps: doit