merge trunk

1 files changed, 17 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 608d5c618b3..36e2f29e58f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,20 @@
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
+
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (.m.o): Remove, there are no .m files.
+        (BASE_CFLAGS): New variable.
+        (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS.
+        (check): Update the message.
+        (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS.
+
+        * Makefile.in: Convert comments to makefile format.
+
+        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+        (config.h) [MSDOS]: Do not include.
+
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp.