diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 15 |
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 | |||
| 368 | lib lib-src lisp nt: Makefile | 368 | lib lib-src lisp nt: Makefile |
| 369 | $(MAKE) -C $@ all | 369 | $(MAKE) -C $@ all |
| 370 | 370 | ||
| 371 | # Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which | ||
| 372 | # is either set to bootstrap-emacs (in case bootstrap-emacs has not been | ||
| 373 | # constructed yet) or the empty string (otherwise). | ||
| 374 | # src/Makefile.in uses it to implement conditional dependencies, so that | ||
| 375 | # files that need bootstrap-emacs to be built do not additionally need | ||
| 376 | # to be kept fresher than bootstrap-emacs. Otherwise changing a single | ||
| 377 | # file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling | ||
| 378 | # all preloaded elisp files, and only then dump the actual src/emacs, which | ||
| 379 | # is not wrong, but is overkill in 99.99% of the cases. | ||
| 380 | # | ||
| 381 | # Note the use of single quotes in the value of vcswitness. | 371 | # Note the use of single quotes in the value of vcswitness. |
| 382 | # This passes an unexpanded $srcdir to src's Makefile, which then | 372 | # This passes an unexpanded $srcdir to src's Makefile, which then |
| 383 | # expands it using its own value of srcdir (which points to the | 373 | # expands it using its own value of srcdir (which points to the |
| @@ -386,10 +376,7 @@ src: Makefile | |||
| 386 | dirstate='.bzr/checkout/dirstate'; \ | 376 | dirstate='.bzr/checkout/dirstate'; \ |
| 387 | vcswitness='$$(srcdir)/../'$$dirstate; \ | 377 | vcswitness='$$(srcdir)/../'$$dirstate; \ |
| 388 | [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ | 378 | [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ |
| 389 | cd $@ || exit; \ | 379 | $(MAKE) -C $@ all VCSWITNESS="$$vcswitness" |
| 390 | boot=bootstrap-emacs$(EXEEXT); \ | ||
| 391 | [ ! -x "$$boot" ] || boot=''; \ | ||
| 392 | $(MAKE) all BOOTSTRAPEMACS="$$boot" VCSWITNESS="$$vcswitness" | ||
| 393 | 380 | ||
| 394 | blessmail: Makefile src | 381 | blessmail: Makefile src |
| 395 | $(MAKE) -C lib-src maybe-blessmail | 382 | $(MAKE) -C lib-src maybe-blessmail |