diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 32db644b2eb75461d14f028e57ee445d92e3c467..ba801f024dbbf0fbedeea1f36c857318af021112 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Glenn Morris + + * Makefile.in (LDFLAGS): Explicitly set via configure. + 2014-06-15 Eli Zaretskii * Makefile.in (CPPFLAGS): Define. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e35610d27fbc81bfad2486f59080a0615d257ec7..aff112d9e0d06aacab927c331bb7c3f29da10438 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -28,7 +28,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp CC=@CC@ CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ + version=@version@ ## Used in $archlibdir. configuration=@configuration@ @@ -192,6 +194,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ -I. -I../src -I../lib \ -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib +## FIXME? What is LDFLAGS doing here? ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d4d575ce013c01d299d2a8adcd7af47a477421b..959f0a26a548c0369168e5498d0ee9c3faf67b08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -129,7 +129,8 @@ 2014-06-14 Ron Schnell - * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue. + * play/dunnet.el (dun-describe-room, dun-mode): + If a lamp is in the room, you won't be eaten by a grue. 2014-06-13 Glenn Morris diff --git a/nt/ChangeLog b/nt/ChangeLog index 32e44a65948f9d4f2f40a4afc91c3a50e82d1b1e..9c7328e917563d258be49cf5e30fcb99028dcd98 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Glenn Morris + + * Makefile.in (LDFLAGS): Explicitly set via configure. + 2014-06-15 Eli Zaretskii * Makefile.in (CPPFLAGS): Define. diff --git a/nt/Makefile.in b/nt/Makefile.in index 264164304251a125ba0496fd389f776f62d96ff1..f612af298d14f60033828cebaf72721a80e47135 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -25,7 +25,9 @@ SHELL = /bin/sh CC=@CC@ CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ + version=@version@ ## Used in $archlibdir. configuration=@configuration@ @@ -141,6 +143,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -I. -I${srcdir} +## FIXME? What is LDFLAGS doing here? ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}