merge trunk

1 files changed, 25 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 06417b3254f..64a73027915 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,28 @@
+2014-06-26  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (blessmail): Depend on lisp/mail/blessmail.el.
+        Use $<, $@.
+        (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}, ntlib.o)
+        (hexl${EXEEXT}, update-game-score${EXEEXT}, emacsclient.res): Use $<.
+        (ctags${EXEEXT}): Add $srcdir to dependency rather than using VPATH.
+
+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):