Mercurial > hg > octave-terminal
changeset 5970:af3407589a89
[project @ 2006-08-25 18:24:40 by jwe]
author | jwe |
---|---|
date | Fri, 25 Aug 2006 18:24:40 +0000 |
parents | b305d2d925d8 |
children | 9cc8149f81b0 |
files | ChangeLog mkoctfile.in |
diffstat | 2 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-25 Alexander Barth <abarth@marine.usf.edu> + + * mkoctfile.in: Accept .f90 and .F90 as Fortran files. + Pass $incflags and $defs to Fortran compiler. + 2006-08-18 John W. Eaton <jwe@octave.org> * Makeconf.in (do-subst-texinfo-vals): Don't substitute
--- a/mkoctfile.in +++ b/mkoctfile.in @@ -112,7 +112,7 @@ file=$1 ccfiles="$ccfiles $file" ;; - *.f | *.F) + *.f | *.F | *.f90 | *.F90) file=$1 f77files="$f77files $file" ;; @@ -195,8 +195,10 @@ .cc C++ source .C C++ source .cpp C++ source - .f Fortran source - .F Fortran source + .f Fortran source (fixed form) + .F Fortran source (fixed form) + .f90 Fortran source (free form) + .F90 Fortran source (free form) .o object file EOF @@ -344,6 +346,12 @@ *.F) b=`echo $f | $SED 's,\.F$,,'` ;; + *.f90) + b=`echo $f | $SED 's,\.f90$,,'` + ;; + *.F90) + b=`echo $f | $SED 's,\.F90$,,'` + ;; esac if [ -n "$F77" ]; then if [ -n "$outputfile" ]; then @@ -356,7 +364,7 @@ o=$b.o fi objfiles="$objfiles $o" - cmd="$F77 -c $FPICFLAG $ALL_FFLAGS $pass_on_options $f -o $o" + cmd="$F77 -c $FPICFLAG $ALL_FFLAGS $incflags $defs $pass_on_options $f -o $o" $dbg $cmd eval $cmd elif [ -n "$F2C" ]; then