Mercurial > hg > octave-nkf

diff mkoctfile.in @ 6294:fa02b0b467b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-09 22:01:37 by jwe]
author jwe
date Fri, 09 Feb 2007 22:01:37 +0000
parents 2a8922007c12
children e2a1aca62551
line wrap: on
line diff
--- 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