Mercurial > hg > octave-lyh
changeset 9566:028dd9914276
src/Makefile.in: update list of libraries for linking
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Aug 2009 11:36:32 -0400 |
parents | fe57b638e48c |
children | 0a4eb56c5676 |
files | src/ChangeLog src/Makefile.in |
diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-08-26 John W. Eaton <jwe@octave.org> + + * Makefile.in (OCTAVE_LIBS): Include FLIBS in the list. + (OCTINTERP_LINK_DEPS): Include TERM_LIBS, LIBGLOB, and FLIBS in + the list. + 2009-08-26 Jaroslav Hajek <highegg@gmail.com> * data.cc (Ffmod): Reverse order of args.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -296,6 +296,7 @@ $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \ $(READLINE_LIBS) $(TERM_LIBS) \ $(LIBGLOB) \ + $(FLIBS) \ $(LIBS) else ## FIXME -- this list is probably not complete now. It may not even @@ -319,7 +320,8 @@ $(HDF5_LDFLAGS) $(HDF5_LIBS) $(Z_LDFLAGS) $(Z_LIBS) \ $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \ $(READLINE_LIBS) $(TERM_LIBS) \ - $(LIBPLPLOT) $(LIBGLOB) \ + $(LIBGLOB) \ + $(FLIBS) \ $(LIBS) endif @@ -328,7 +330,9 @@ $(FFTW_LDFLAGS) $(FFTW_LIBS) \ $(HDF5_LDFLAGS) $(HDF5_LIBS) $(Z_LDFLAGS) $(Z_LIBS) \ $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \ - $(READLINE_LIBS) \ + $(READLINE_LIBS) $(TERM_LIBS) \ + $(LIBGLOB) \ + $(FLIBS) \ $(LIBS) OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) \