Mercurial > hg > octave-nkf

changeset 9518:113dba092d8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include LDFLAGS for shared liboctave and liboctinterp
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 12 Aug 2009 15:26:07 +0200
parents a85dbf7b6ff9
children ee99f9f37505
files liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in
diffstat 4 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-12  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Makefile.in: Include LDFLAGS when linking shared executable.
+
 2009-08-11  John W. Eaton  <jwe@octave.org>
 
 	* oct-fftw.h, oct-fftw.cc (octave_fftw_planner): Convert to singleton.
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -277,7 +277,7 @@
 
 $(SHLPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
 	rm -f $@
-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \
+	$(SH_LD) $(SH_LDFLAGS) $(LDFLAGS) $(SONAME_FLAGS) -o $@ \
 	$(LIBOCTAVE_PICOBJ) $(LINK_DEPS)
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-12  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Makefile.in: Include LDFLAGS when linking shared executable.
+
 2009-08-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* data.cc (Fissorted, F__sort_rows_idx__, Fnorm): Mark as Built-in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -357,7 +357,7 @@
 
 $(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
 	rm -f $@
-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+	$(SH_LD) $(SH_LDFLAGS) $(LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
 octave$(EXEEXT): $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
 	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \