--- MITgcm/tools/genmake2	2007/11/26 21:39:58	1.167
+++ MITgcm/tools/genmake2	2008/05/08 19:48:37	1.170
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.167 2007/11/26 21:39:58 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.170 2008/05/08 19:48:37 jahn 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
@@ -2353,7 +2361,10 @@
 	echo "" >> srclinks.tmp
 	echo "#  These files are linked from $d" >> srclinks.tmp
 	echo "$deplist :" >> srclinks.tmp
-	printf "\t\$(LN) %s/\$@ \$@\n" $d >> srclinks.tmp
+# We need to make sure that the link isn't already there.
+# This may happen when make thinks that a header file has to be "remade"
+# because a module it depends on has changed.  In this case we do nothing.
+	printf "\tif [ ! -L \$@ ]; then \$(LN) %s/\$@ \$@; fi\n" $d >> srclinks.tmp
     fi
 done
 rm -rf .links.tmp
@@ -2589,6 +2600,8 @@
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
 .$FS.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+.F.o:
+	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
 .F90.o:   
 	\$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
 .c.o: