Commit b24ffa81 authored by Glenn Morris's avatar Glenn Morris

Explicitly set LDFLAGS in some sub-Makefiles

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

* nt/Makefile.in (LDFLAGS): Explicitly set via configure.
parent 9fae211d
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (LDFLAGS): Explicitly set via configure.
2014-06-15 Eli Zaretskii <eliz@gnu.org> 2014-06-15 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (CPPFLAGS): Define. * Makefile.in (CPPFLAGS): Define.
......
...@@ -28,7 +28,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp ...@@ -28,7 +28,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
version=@version@ version=@version@
## Used in $archlibdir. ## Used in $archlibdir.
configuration=@configuration@ configuration=@configuration@
...@@ -192,6 +194,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ ...@@ -192,6 +194,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
-I. -I../src -I../lib \ -I. -I../src -I../lib \
-I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
## FIXME? What is LDFLAGS doing here?
ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
......
...@@ -129,7 +129,8 @@ ...@@ -129,7 +129,8 @@
2014-06-14 Ron Schnell <ronnie@driver-aces.com> 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> 2014-06-13 Glenn Morris <rgm@gnu.org>
......
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (LDFLAGS): Explicitly set via configure.
2014-06-15 Eli Zaretskii <eliz@gnu.org> 2014-06-15 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (CPPFLAGS): Define. * Makefile.in (CPPFLAGS): Define.
......
...@@ -25,7 +25,9 @@ SHELL = /bin/sh ...@@ -25,7 +25,9 @@ SHELL = /bin/sh
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
version=@version@ version=@version@
## Used in $archlibdir. ## Used in $archlibdir.
configuration=@configuration@ configuration=@configuration@
...@@ -141,6 +143,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ ...@@ -141,6 +143,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
-I. -I${srcdir} -I. -I${srcdir}
## FIXME? What is LDFLAGS doing here?
ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment