# HG changeset patch
# User jwe
# Date 1156530280 0
# Node ID af3407589a89bd8879a58a4acdaa1114180847e8
# Parent  b305d2d925d806674fb00009c3fe7fb8ef7babf0
[project @ 2006-08-25 18:24:40 by jwe]

diff -r b305d2d925d8 -r af3407589a89 ChangeLog
--- a/ChangeLog	Fri Aug 25 14:13:52 2006 +0000
+++ b/ChangeLog	Fri Aug 25 18:24:40 2006 +0000
@@ -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
diff -r b305d2d925d8 -r af3407589a89 mkoctfile.in
--- a/mkoctfile.in	Fri Aug 25 14:13:52 2006 +0000
+++ b/mkoctfile.in	Fri Aug 25 18:24:40 2006 +0000
@@ -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