diff options
| author | Glenn Morris | 2014-06-15 10:45:38 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-06-15 10:45:38 -0700 |
| commit | b24ffa815c1ff9e581f261fdb63b6901196bbc8c (patch) | |
| tree | 44826e5c6b912e9150dcd1752df17ac7c1fc45f9 /nt | |
| parent | 9fae211dbf3a1362866668acc9a7017f79d57b98 (diff) | |
| download | emacs-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/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/Makefile.in | 5 |
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 @@ | |||
| 1 | 2014-06-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (LDFLAGS): Explicitly set via configure. | ||
| 4 | |||
| 1 | 2014-06-15 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-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 | ||
| 26 | CC=@CC@ | 26 | CC=@CC@ |
| 27 | CFLAGS=@CFLAGS@ | 27 | CFLAGS=@CFLAGS@ |
| 28 | CPPFLAGS=@CPPFLAGS@ | 28 | CPPFLAGS = @CPPFLAGS@ |
| 29 | LDFLAGS = @LDFLAGS@ | ||
| 30 | |||
| 29 | version=@version@ | 31 | version=@version@ |
| 30 | ## Used in $archlibdir. | 32 | ## Used in $archlibdir. |
| 31 | configuration=@configuration@ | 33 | configuration=@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? | ||
| 144 | ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} | 147 | ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} |
| 145 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} | 148 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} |
| 146 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} | 149 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} |