Mercurial > octave
changeset 4228:309e799edc5a
[project @ 2002-12-18 18:10:13 by jwe]
| author | jwe |
|---|---|
| date | Wed, 18 Dec 2002 18:10:13 +0000 |
| parents | 399793c2c95a |
| children | 40153a2affd6 |
| files | ChangeLog liboctave/Makefile.in mkoctfile.in |
| diffstat | 3 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 18 03:31:55 2002 +0000 +++ b/ChangeLog Wed Dec 18 18:10:13 2002 +0000 @@ -1,3 +1,10 @@ +2002-12-18 John W. Eaton <jwe@bevo.che.wisc.edu> + + * mkoctfile.in: Also define LIBKPATHSEA and include it when + linking stand alone files. Define LIBOCTAVE, LIBOCTINTERP, + LIBCRUFT, LIBREADLINE, and LIBKPATHSEA using -lLIB. + Include $LIBOCTINTERP in the stand alone link command. + 2002-12-17 John W. Eaton <jwe@bevo.che.wisc.edu> * Makeconf.in (do-script-install, do-script-uninstall):
--- a/liboctave/Makefile.in Wed Dec 18 03:31:55 2002 +0000 +++ b/liboctave/Makefile.in Wed Dec 18 18:10:13 2002 +0000 @@ -28,7 +28,7 @@ MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h Array-flags.h \ Array-idx.h Array2-idx.h Array3-idx.h ArrayN-idx.h MArray-defs.h \ MArray.h MArray2.h MDiagArray2.h Matrix.h \ - base-lu.h mx-base.h mx-op-defs.h mx-defs.h mx-ext.h \ + base-lu.h mx-base.h mx-op-defs.h mx-ops.h mx-defs.h mx-ext.h \ CColVector.h CDiagMatrix.h CMatrix.h CRowVector.h CmplxAEPBAL.h \ CmplxCHOL.h CmplxDET.h CmplxHESS.h CmplxLU.h CmplxQR.h \ CmplxQRP.h CmplxSCHUR.h CmplxSVD.h EIG.h boolMatrix.h chMatrix.h \
--- a/mkoctfile.in Wed Dec 18 03:31:55 2002 +0000 +++ b/mkoctfile.in Wed Dec 18 18:10:13 2002 +0000 @@ -36,10 +36,11 @@ : ${RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%} : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%} -: ${LIBOCTAVE=%OCTAVE_CONF_LIBOCTAVE%} -: ${LIBOCTINTERP=%OCTAVE_CONF_LIBOCTINTERP%} -: ${LIBREADLINE=%OCTAVE_CONF_LIBREADLINE%} -: ${LIBCRUFT=%OCTAVE_CONF_LIBCRUFT%} +: ${LIBOCTAVE=-loctave} +: ${LIBOCTINTERP=-loctinterp} +: ${LIBREADLINE=-lreadline} +: ${LIBKPATHSEA=-lkpathsea} +: ${LIBCRUFT=-lcruft} : ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%} : ${FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%} : ${LIBS=%OCTAVE_CONF_LIBS%} @@ -58,7 +59,7 @@ : ${ALL_LDFLAGS="$LD_STATIC_FLAG $CPICFLAG $LDFLAGS"} -: ${OCTAVE_LIBS="$LIBOCTAVE $SPECIAL_MATH_LIB $LIBCRUFT"} +: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB $LIBCRUFT"} # Local variables. @@ -378,7 +379,7 @@ if $link; then if $link_stand_alone; then if [ -n "$LD_CXX" ]; then - cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $output_option $objfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LIBS $BLAS_LIBS $FFTW_LIBS $LIBREADLINE $LIBS $FLIBS" + cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $output_option $objfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LIBS $BLAS_LIBS $FFTW_LIBS $LIBREADLINE $LIBKPATHSEA $LIBS $FLIBS" $dbg $cmd eval $cmd else