diff options
| author | Glenn Morris <[email protected]> | 2014-06-15 10:45:38 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-15 10:45:38 -0700 |
| commit | b24ffa815c1ff9e581f261fdb63b6901196bbc8c (patch) | |
| tree | 44826e5c6b912e9150dcd1752df17ac7c1fc45f9 /lib-src | |
| parent | 9fae211dbf3a1362866668acc9a7017f79d57b98 (diff) | |
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')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 32db644b2e..ba801f024d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Glenn Morris <[email protected]> + + * Makefile.in (LDFLAGS): Explicitly set via configure. + 2014-06-15 Eli Zaretskii <[email protected]> * Makefile.in (CPPFLAGS): Define. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e35610d27f..aff112d9e0 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} |