diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-02-28 04:44:50 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-02-28 04:44:50 +0000 |
| commit | b4b7bab7ca0cbe68d4a701e26c687af971f0ebb4 (patch) | |
| tree | d047490864b0843d7edaf48e195086bc00d7f0d1 /Makefile.in | |
| parent | 33417df2b11627037d6de7dc3a1cb02b67b66171 (diff) | |
| download | emacs-b4b7bab7ca0cbe68d4a701e26c687af971f0ebb4.tar.gz | |
(lib-src, lisp): Use simpler rule.
(src): Be more specific to avoid recompiling all the .elc files just
because the bootstrap-emacs is missing.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 4439e85bb11..14036608d67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -320,6 +320,12 @@ src: lib-src FRC # We need to build `emacs' in `src' to compile the *.elc files in `lisp'. lisp: src +# These targets should be "${SUBDIR} without `src'". +lib-src lisp: Makefile FRC + cd $@; $(MAKE) all $(MFLAGS) \ + CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' + # 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). @@ -329,12 +335,16 @@ lisp: src # 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. -${SUBDIR}: Makefile FRC +src: Makefile FRC boot=bootstrap-emacs$(EXEEXT); \ - if [ -x "src/$$boot" ]; then boot=""; fi; \ + if [ ! -x "src/$$boot" ]; then \ + cd $@; $(MAKE) all $(MFLAGS) \ + CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \ + fi; \ cd $@; $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="" blessmail: Makefile src FRC cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ |