--- MITgcm/tools/genmake2	2007/10/29 20:47:42	1.166
+++ MITgcm/tools/genmake2	2008/02/15 19:33:34	1.169
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.166 2007/10/29 20:47:42 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.169 2008/02/15 19:33:34 jmc Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -746,7 +746,9 @@
  *curtim = *curtim/1.E6;
 }
 EOF
-    make genmake_tc_1.o >> genmake_warnings 2>&1
+    COMM="$CC $CFLAGS -c genmake_tc_1.c"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RET_C=$?
     cat <<EOF > genmake_tc_2.$FS
       program hello
@@ -805,7 +807,9 @@
     return;
 }
 EOF
-    make genmake_tc_1.o >> genmake_warnings 2>&1
+    COMM="$CC $CFLAGS -c genmake_tc_1.c"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RET_C=$?
     cat <<EOF > genmake_tc_2.$FS
       program hello
@@ -853,7 +857,9 @@
     return;
 }
 EOF
-    make genmake_tc_1.o >> genmake_warnings 2>&1
+    COMM="$CC $CFLAGS -c genmake_tc_1.c"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RET_C=$?
     cat <<EOF > genmake_tc_2.$FS
       program hello
@@ -897,7 +903,9 @@
         *nbyte = -1;
 }
 EOF
-    make genmake_tc_1.o >> genmake_tc.log 2>&1
+    COMM="$CC $CFLAGS -c genmake_tc_1.c"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_tc.log 2>&1
     RET_C=$?
     cat <<EOF > genmake_tc_2.$FS
       program hello
@@ -1145,12 +1153,6 @@
 
 echo "===  Processing options files and arguments  ==="
 gm_local="genmake_local"
-for i in . $MODS ; do
-    if test -r $i/$gm_local ; then
-	. $i/$gm_local
-	break
-    fi
-done
 printf "  getting local config information:  "
 if test -f $gm_local ; then
     echo "using $gm_local"
@@ -2595,6 +2597,8 @@
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
 .$FS.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+.F.o:
+	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
 .F90.o:   
 	\$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
 .c.o: