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 /lib-src/Makefile.in | |
| 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 'lib-src/Makefile.in')
| -rw-r--r-- | lib-src/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
| 28 | 28 | ||
| 29 | CC=@CC@ | 29 | CC=@CC@ |
| 30 | CFLAGS=@CFLAGS@ | 30 | CFLAGS=@CFLAGS@ |
| 31 | CPPFLAGS=@CPPFLAGS@ | 31 | CPPFLAGS = @CPPFLAGS@ |
| 32 | LDFLAGS = @LDFLAGS@ | ||
| 33 | |||
| 32 | version=@version@ | 34 | version=@version@ |
| 33 | ## Used in $archlibdir. | 35 | ## Used in $archlibdir. |
| 34 | configuration=@configuration@ | 36 | configuration=@configuration@ |
| @@ -192,6 +194,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ | |||
| 192 | -I. -I../src -I../lib \ | 194 | -I. -I../src -I../lib \ |
| 193 | -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib | 195 | -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib |
| 194 | 196 | ||
| 197 | ## FIXME? What is LDFLAGS doing here? | ||
| 195 | ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} | 198 | ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} |
| 196 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} | 199 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} |
| 197 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} | 200 | CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} |