Mercurial > octave
changeset 15600:fcdc284f96ef
Fix cruft.def location and usage.
* configure.ac (XTRA_CRUFT_SH_LDFLAGS): Use cruft/cruft.def for MSVC.
* liboctave/Makefile.am (liboctave_la_LDFLAGS): Add @XTA_CRUFT_SH_LDFLAGS@.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Mon, 05 Nov 2012 01:48:16 +0000 |
| parents | 1d40c0514053 |
| children | 35bc8f16538f |
| files | configure.ac liboctave/Makefile.am |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Nov 05 01:48:09 2012 +0000 +++ b/configure.ac Mon Nov 05 01:48:16 2012 +0000 @@ -1099,7 +1099,7 @@ XTRA_CRUFT_SH_LDFLAGS= if test $have_msvc = yes; then FLIBS="$FLIBS -lkernel32" - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft.def" + XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def" fi AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
--- a/liboctave/Makefile.am Mon Nov 05 01:48:09 2012 +0000 +++ b/liboctave/Makefile.am Mon Nov 05 01:48:16 2012 +0000 @@ -113,6 +113,7 @@ liboctave_la_LDFLAGS = \ -version-info $(liboctave_version_info) \ $(NO_UNDEFINED_LDFLAG) \ + @XTRA_CRUFT_SH_LDFLAGS@ \ -bindir $(bindir) \ $(LIBOCTAVE_LINK_OPTS)