aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorGlenn Morris2014-06-15 10:45:38 -0700
committerGlenn Morris2014-06-15 10:45:38 -0700
commitb24ffa815c1ff9e581f261fdb63b6901196bbc8c (patch)
tree44826e5c6b912e9150dcd1752df17ac7c1fc45f9 /nt
parent9fae211dbf3a1362866668acc9a7017f79d57b98 (diff)
downloademacs-b24ffa815c1ff9e581f261fdb63b6901196bbc8c.tar.gz
emacs-b24ffa815c1ff9e581f261fdb63b6901196bbc8c.zip
Explicitly set LDFLAGS in some sub-Makefiles
* lib-src/Makefile.in (LDFLAGS): Explicitly set via configure. * nt/Makefile.in (LDFLAGS): Explicitly set via configure.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/Makefile.in5
2 files changed, 8 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 32e44a65948..9c7328e9175 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12014-06-15 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (LDFLAGS): Explicitly set via configure.
4
12014-06-15 Eli Zaretskii <eliz@gnu.org> 52014-06-15 Eli Zaretskii <eliz@gnu.org>
2 6
3 * Makefile.in (CPPFLAGS): Define. 7 * 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
25 25
26CC=@CC@ 26CC=@CC@
27CFLAGS=@CFLAGS@ 27CFLAGS=@CFLAGS@
28CPPFLAGS=@CPPFLAGS@ 28CPPFLAGS = @CPPFLAGS@
29LDFLAGS = @LDFLAGS@
30
29version=@version@ 31version=@version@
30## Used in $archlibdir. 32## Used in $archlibdir.
31configuration=@configuration@ 33configuration=@configuration@
@@ -141,6 +143,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
141 $(WARN_CFLAGS) $(WERROR_CFLAGS) \ 143 $(WARN_CFLAGS) $(WERROR_CFLAGS) \
142 -I. -I${srcdir} 144 -I. -I${srcdir}
143 145
146## FIXME? What is LDFLAGS doing here?
144ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} 147ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
145LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} 148LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
146CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} 149CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}