From: Glenn Morris <rgm@gnu.org>
Date: Sun, 15 Jun 2014 17:45:38 +0000 (-0700)
Subject: Explicitly set LDFLAGS in some sub-Makefiles
X-Git-Tag: emacs-25.0.90~2612^2~709^2~697^2~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b24ffa815c1ff9e581f261fdb63b6901196bbc8c;p=emacs.git

Explicitly set LDFLAGS in some sub-Makefiles

* lib-src/Makefile.in (LDFLAGS): Explicitly set via configure.

* nt/Makefile.in (LDFLAGS): Explicitly set via configure.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 32db644b2eb..ba801f024db 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index e35610d27fb..aff112d9e0d 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 4d4d575ce01..959f0a26a54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -129,7 +129,8 @@
 
 2014-06-14  Ron Schnell  <ronnie@driver-aces.com>
 
-	* 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  <rgm@gnu.org>
 
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 32e44a65948..9c7328e9175 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/nt/Makefile.in b/nt/Makefile.in
index 26416430425..f612af298d1 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}