# HG changeset patch # User Jaroslav Hajek # Date 1250083567 -7200 # Node ID 113dba092d8c65c20d28ea4320e7eb026db13dd2 # Parent a85dbf7b6ff94b8fcc99c749caa13d99f1b63d64 include LDFLAGS for shared liboctave and liboctinterp diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2009-08-12 Jaroslav Hajek + + * Makefile.in: Include LDFLAGS when linking shared executable. + 2009-08-11 John W. Eaton * oct-fftw.h, oct-fftw.cc (octave_fftw_planner): Convert to singleton. diff --git a/liboctave/Makefile.in b/liboctave/Makefile.in --- 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 diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-08-12 Jaroslav Hajek + + * Makefile.in: Include LDFLAGS when linking shared executable. + 2009-08-12 Jaroslav Hajek * data.cc (Fissorted, F__sort_rows_idx__, Fnorm): Mark as Built-in diff --git a/src/Makefile.in b/src/Makefile.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) \