manual upstream merge

1 files changed, 27 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d7c755e67f0..1fc9fcdb1f5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,30 @@
+2014-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Omit redundant extern decls.
+        * emacsclient.c (getenv): Remove decl.
+        * make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
+        Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
+
+2014-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LDFLAGS): Explicitly set via configure.
+
+2014-06-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (CPPFLAGS): Define.
+
+2014-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (../lib/libgnu.a):
+        Use `make -C' rather than `cd && make'.
+
+        * Makefile.in (bootstrap-clean): New.
+
+2014-06-13  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (../lib/libgnu.a):
+        GNU make automatically passes command-line arguments to sub-makes.
+
 2014-05-26  Eli Zaretskii  <eliz@gnu.org>
 
         * ntlib.h (lseek): Don't redirect to _lseek.