Mercurial > hg > octave-lojdl
changeset 9537:8f8cb45ad674
src/Makefile.in: more linking tweaks
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 17 Aug 2009 18:57:48 -0400 |
parents | 592a959b68e5 |
children | d0239bddf621 |
files | src/ChangeLog src/Makefile.in |
diffstat | 2 files changed, 32 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-08-17 John W. Eaton <jwe@octave.org> + + * Makefile.in (OCTINTERP_LINK_DEPS): Include FFTW_LDFLAGS, + FFTW_LIBS and READLINE_LIBS in the list. + (OCTAVE_LIBS): Attempt to include all necessary dependencies for + static linking. + 2009-08-17 John W. Eaton <jwe@octave.org> * Makefile.in (eigs.oct, chol.oct, qr.oct): Add library-specific
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -288,15 +288,37 @@ ifeq ($(ENABLE_DYNAMIC_LINKING), true) OCTAVE_LIBS = $(LIBOCTINTERP) else - OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(QHULL_LIBS) \ - $(GLPK_LIBS) $(MAGICK_LIBS) $(REGEX_LIBS) $(LIBCRUFT) \ - $(LIBPLPLOT) $(LIBGLOB) + ## FIXME -- this list is probably not complete now. It may not even + ## be possible to build a statically linked copy of Octave that is + ## fully functional. + OCTAVE_LIBS = -L. $(LIBOCTINTERP) \ + -L../liboctave $(LIBOCTAVE) \ + -L../libcruft $(LIBCRUFT) \ + $(FFTW_LDFLAGS) $(FFTW_LIBS) + $(QHULL_LDFLAGS) $(QHULL_LIBS) \ + $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \ + $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \ + $(SPARSE_LDFLAGS) $(SPARSE_LIBS) \ + $(BLAS_LIBS) \ + $(REGEX_LDFLAGS) $(REGEX_LIBS) \ + $(CURL_LDFLAGS) $(CURL_LIBS) \ + $(GLPK_LDFLAGS) $(GLPK_LIBS) \ + $(MAGICK_LIBS) \ + $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) \ + $(FT2_LDFLAGS) $(FT2_LIBS) \ + $(HDF5_LIBS) $(ZLIB_LIBS) \ + $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \ + $(READLINE_LIBS) $(TERM_LIBS) \ + $(LIBPLPLOT) $(LIBGLOB) \ + $(LIBS) endif OCTINTERP_LINK_DEPS = $(RLD_FLAG) -L../liboctave $(LIBOCTAVE) \ -L../libcruft $(LIBCRUFT) \ + $(FFTW_LDFLAGS) $(FFTW_LIBS) \ $(HDF5_LIBS) $(ZLIB_LIBS) \ $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \ + $(READLINE_LIBS) \ $(LIBS) OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) \