# HG changeset patch # User jwe # Date 1171058497 0 # Node ID fa02b0b467b5d1578f2d256d651a27dbcb7fc925 # Parent b649aa46950d5acf245a0e276045c75e4faef422 [project @ 2007-02-09 22:01:37 by jwe] diff --git a/doc/interpreter/mkoctfile.1 b/doc/interpreter/mkoctfile.1 --- a/doc/interpreter/mkoctfile.1 +++ b/doc/interpreter/mkoctfile.1 @@ -87,6 +87,7 @@ .f Fortran source .F Fortran source .o object file + .a library file .SH SEE ALSO .BR octave (1). .RE diff --git a/mkoctfile.in b/mkoctfile.in --- a/mkoctfile.in +++ b/mkoctfile.in @@ -71,6 +71,7 @@ ccfiles= f77files= objfiles= +libfiles= octfiles= octfile= outputfile= @@ -120,6 +121,10 @@ file=$1 objfiles="$objfiles $file" ;; + *.a) + file=$1 + libfiles="$libfiles $file" + ;; -d | --debug | -v | --verbose) dbg=echo ;; @@ -202,6 +207,7 @@ .f90 Fortran source (free form) .F90 Fortran source (free form) .o object file + .a library file EOF exit 0 @@ -459,7 +465,7 @@ if $link && [ -n "$objfiles" ]; then if $link_stand_alone; then if [ -n "$LD_CXX" ]; then - cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $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 $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LIBS $BLAS_LIBS $FFTW_LIBS $LIBREADLINE $LIBS $FLIBS" $dbg $cmd eval $cmd else @@ -468,7 +474,7 @@ fi else LINK_DEPS="$LFLAGS $OCTAVE_LIBS $LDFLAGS $BLAS_LIBS $FFTW_LIBS $LIBS $FLIBS" - cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $ldflags $LINK_DEPS" + cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LINK_DEPS" $dbg $cmd eval $cmd fi