Mercurial > emacs
changeset 95557:066448b675c8
($(lisp)/cus-load.el): Remove unnecessary rule.
(custom-deps): Don't require $(lisp)/cus-load.el.
(custom-deps, finder-data): Don't depend on autoloads.
Should not be needed now, and doing so was causing make install to
re-dump emacs post-bootstrap.
(bootstrap-after): Don't run update-elclist, since modifying Makefile.in
mid-build forces some things to be rebuilt.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 05 Jun 2008 02:36:11 +0000 |
| parents | 01af78339196 |
| children | 8c1e2d447217 |
| files | lisp/Makefile.in |
| diffstat | 1 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/Makefile.in Thu Jun 05 02:35:36 2008 +0000 +++ b/lisp/Makefile.in Thu Jun 05 02:36:11 2008 +0000 @@ -100,18 +100,25 @@ doit: -$(lisp)/cus-load.el: - touch $@ -# Note that custom-deps and finder-data depend on autoloads rather -# than on loaddefs.el, so that autoloads does not run in parallel with -# them under "make -j", because that could delete loaddefs.el from -# under their feet. -custom-deps: $(emacs-deps) autoloads $(lisp)/cus-load.el doit +# custom-deps and finder-data both used to scan _all_ the *.el files. +# Now they avoid auto-generated files, which should avoid this +# historical problem: +# In parallel builds, they should not run at the same time as anything +# else that might modify any .el files, eg autoloads (or each other). +# One solution was to add autoloads as a prerequisite: +# http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html +# http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00171.html +# However, this means that running these targets modifies loaddefs.el, +# every time (due to time-stamping). Calling these rules from +# bootstrap-after would modify loaddefs after src/emacs, resulting +# in make install remaking src/emacs for no real reason: +# http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00311.html +custom-deps: $(emacs-deps) doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins -finder-data: $(emacs-deps) autoloads doit +finder-data: $(emacs-deps) doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins @@ -1252,6 +1259,9 @@ $(MAKE) $(MFLAGS) compile-main $(MAKE) $(MFLAGS) compile-last +## Doing this causes make install to dump another emacs. +# $(MAKE) $(MFLAGS) update-elclist + # Compile all Lisp files. This is like `compile' but compiles files # unconditionally. Some files don't actually get compiled because they # set the local variable no-byte-compile. @@ -1405,7 +1415,7 @@ # Generate/update files after the bootstrap process. # custom-deps needs `preloaded-file-list'. -bootstrap-after: finder-data custom-deps update-elclist +bootstrap-after: finder-data custom-deps distclean: -rm -f ./Makefile