Replace BOOTSTRAPEMACS with an order-only dependence on bootstrap-emacs

* Makefile.in (src): No more need to pass BOOTSTRAPEMACS.

* src/Makefile.in (.el.elc): Replace suffix rule with pattern rule.
(%.elc): New pattern rule, with order-only prerequisite.
($(lisp)): No more need to depend on BOOTSTRAPEMACS.
($(lispsource)/loaddefs.el): Use an order-only prerequisite
in place of BOOTSTRAPEMACS.

Fixes: debbugs:2151

1 files changed, 1 insertions, 14 deletions

diff --git a/Makefile.in b/Makefile.in
index ce44aa5de84..0fd9f980ca9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -368,16 +368,6 @@ lisp: src
 lib lib-src lisp nt: Makefile
         $(MAKE) -C $@ all
 
-# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
-# is either set to bootstrap-emacs (in case bootstrap-emacs has not been
-# constructed yet) or the empty string (otherwise).
-# src/Makefile.in uses it to implement conditional dependencies, so that
-# files that need bootstrap-emacs to be built do not additionally need
-# to be kept fresher than bootstrap-emacs.  Otherwise changing a single
-# file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling
-# all preloaded elisp files, and only then dump the actual src/emacs, which
-# is not wrong, but is overkill in 99.99% of the cases.
-#
 # Note the use of single quotes in the value of vcswitness.
 # This passes an unexpanded $srcdir to src's Makefile, which then
 # expands it using its own value of srcdir (which points to the
@@ -386,10 +376,7 @@ src: Makefile
         dirstate='.bzr/checkout/dirstate';                              \
         vcswitness='$$(srcdir)/../'$$dirstate;                          \
         [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
-        cd $@ || exit;                                                  \
-        boot=bootstrap-emacs$(EXEEXT);                                  \
-        [ ! -x "$$boot" ] || boot='';                                   \
-        $(MAKE) all BOOTSTRAPEMACS="$$boot" VCSWITNESS="$$vcswitness"
+        $(MAKE) -C $@ all VCSWITNESS="$$vcswitness"
 
 blessmail: Makefile src
         $(MAKE) -C lib-src maybe-blessmail