--- MITgcm/tools/genmake2	2006/10/23 19:40:43	1.156
+++ MITgcm/tools/genmake2	2006/12/13 02:24:53	1.159
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.156 2006/10/23 19:40:43 heimbach Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.159 2006/12/13 02:24:53 cnh Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -325,7 +325,7 @@
 
     #================================================================
     #  look for possible C compilers
-    tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc"
+    tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc icc"
     p_CC=
     for c in $tmp ; do
 	rm -f ./genmake_hello.c  ./genmake_hello
@@ -364,7 +364,7 @@
 
     #================================================================
     #  look for possible FORTRAN compilers
-    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95 gfortran"
+    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 gfortran g95"
     p_FC=
     for c in $tmp ; do
 	rm -f ./hello.f ./hello
@@ -2458,6 +2458,7 @@
 
 libmitgcmuv.a: \$(OBJFILES)
 	ar rcv libmitgcmuv.a \$(OBJFILES)
+	ar d   libmitgcmuv.a main.o
 
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
 
@@ -2468,7 +2469,9 @@
 	@\$(EXECUTABLE) > \$@
 
 clean:
-	-rm -rf *.o *.$FS *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template
+	-rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template
+	-rm -rf *.o
+	-rm -rf *.$FS
 Clean:
 	@make clean
 	@make cleanlinks
@@ -2538,9 +2541,7 @@
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
 .$FS.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
-.F90.$FS90:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
-.$FS90.o:
+.F90.o:   
 	\$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
 .c.o:
 	\$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$<