[Emacs-diffs] emacs ChangeLog Makefile.in

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/28 04:44:50

Modified files:
        .              : ChangeLog Makefile.in 

Log message:
        (lib-src, lisp): Use simpler rule.
        (src): Be more specific to avoid recompiling all the .elc files just
        because the bootstrap-emacs is missing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.816&r2=1.817
http://cvs.savannah.gnu.org/viewcvs/emacs/Makefile.in?cvsroot=emacs&r1=1.369&r2=1.370

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -b -r1.816 -r1.817
--- ChangeLog   26 Feb 2009 22:58:00 -0000      1.816
+++ ChangeLog   28 Feb 2009 04:44:50 -0000      1.817
@@ -1,3 +1,9 @@
+2009-02-28  Stefan Monnier  <address@hidden>
+
+       * Makefile.in (lib-src, lisp): Use simpler rule.
+       (src): Be more specific to avoid recompiling all the .elc files just
+       because the bootstrap-emacs is missing.
+
 2009-02-26  Chong Yidong  <address@hidden>
 
        * configure.in: Require librsvg >= 2.11.

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- Makefile.in 8 Jan 2009 03:47:43 -0000       1.369
+++ Makefile.in 28 Feb 2009 04:44:50 -0000      1.370
@@ -320,6 +320,12 @@
 # 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 @@
 # 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) \