Mercurial > hg > octave-avbm
changeset 10342:7f6b4c6838ea
Add -bindir flags to _LDFLAGS variables.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 21 Feb 2010 17:33:58 +0000 |
| parents | 43145faf9af8 |
| children | 2ef5144ccb0d |
| files | libcruft/ChangeLog libcruft/Makefile.am liboctave/ChangeLog liboctave/Makefile.am src/ChangeLog src/Makefile.am |
| diffstat | 6 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +2010-02-21 Michael Goffioul <michael.goffioul@gmail.com> + + * Makefile.am: Add -bindir option to libcruft_la_LDFLAGS. + 2010-02-17 John W. Eaton <jwe@octave.org> * Makefile.am (libcruft_la_LIBADD): Include libranlib.la in the list.
--- a/libcruft/Makefile.am +++ b/libcruft/Makefile.am @@ -34,7 +34,8 @@ libcruft_la_CPPFLAGS = @CRUFT_DLL_DEFS@ libcruft_la_LDFLAGS = \ - -release $(version) $(NO_UNDEFINED_LDFLAG) @XTRA_CRUFT_SH_LDFLAGS@ + -release $(version) $(NO_UNDEFINED_LDFLAG) @XTRA_CRUFT_SH_LDFLAGS@ \ + -bindir $(bindir) libcruft_la_LIBADD = libranlib.la $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2010-02-21 Michael Goffioul <michael.goffioul@gmail.com> + + * Makefile.am: Add -bindir flag to liboctave_la_LDFLAGS. + 2010-02-19 Jaroslav Hajek <highegg@gmail.com> * idx-vector.cc (idx_vector::as_array,
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -507,6 +507,7 @@ $(AM_CPPFLAGS) liboctave_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) \ + -bindir $(bindir) \ $(SPARSE_XLDFLAGS) \ $(ARPACK_LDFLAGS) \ $(QRUPDATE_LDFLAGS) \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-02-21 Michael Goffioul <michael.goffioul@gmail.com> + + * Makefile.am: Add -bindir flag to liboctinterp_la_LDFLAGS. Remove + temporary libtool module file after copying oct file. + 2010-02-19 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/qr.cc: Increase tolerance for test.
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -581,7 +581,8 @@ liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@ $(AM_CPPFLAGS) -liboctinterp_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) +liboctinterp_la_LDFLAGS = -release $(version) $(NO_UNDEFINED_LDFLAG) \ + -bindir $(bindir) CLEANFILES = \ DLD-FUNCTIONS/PKG_ADD \ @@ -701,7 +702,7 @@ fi; \ lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \ if [ -n "$$lnames" ]; then \ - rm -f $$f $$lnames; \ + rm -f $$f $$lnames $$dl; \ fi \ done