--- MITgcm/tools/genmake2	2006/10/05 15:02:15	1.155
+++ MITgcm/tools/genmake2	2007/01/31 21:28:10	1.160
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.155 2006/10/05 15:02:15 dfer Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.160 2007/01/31 21:28:10 ce107 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
@@ -601,6 +601,8 @@
 
     -gsl | --gsl
           Use GSL to control floating point rounding and precision
+    -devel | --devel
+          Add additional warning and debugging flags for development
 
     -mpi | --mpi
           Include MPI header files and link to MPI libraries
@@ -983,6 +985,21 @@
 	if test "x$RET_COMPILE" = x0 ; then
 	    LIBS="$LIBS -lnetcdf"
 	    HAVE_NETCDF=t
+	else
+	# try again with "-lnetcdff" added to the libs
+	    echo "try again with added '-lnetcdff -lnetcdf'" > genmake_tnc.log
+	    echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log
+	    echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+	    echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
+	    cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null  \
+		&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
+		&&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdff -lnetcdf >> genmake_tnc.log 2>&1
+	    RET_COMPILE=$?
+	    cat genmake_tnc.log >> genmake_warnings
+	    if test "x$RET_COMPILE" = x0 ; then
+		LIBS="$LIBS -lnetcdff -lnetcdf"
+		HAVE_NETCDF=t
+	    fi
 	fi
     fi
     rm -f genmake_tnc*
@@ -1036,6 +1053,7 @@
 PCL=
 HPMT=
 GSL=
+DEVEL=
 HAVE_TEST_L=
 
 # DEFINES checked by test compilation or command-line
@@ -1094,7 +1112,7 @@
 
 #  The following state can be set directly by command-line switches
 gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"
-gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL MPI JAM DUMPSTATE STANDARDDIRS"
+gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI JAM DUMPSTATE STANDARDDIRS"
 
 #  The following state is not directly set by command-line switches
 gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM "
@@ -1292,6 +1310,9 @@
         -gsl | --gsl)
 	    GSL=true ;;
 
+        -devel | --devel)
+	    DEVEL=true ;;
+
 	-mpi | --mpi)
 	    MPI=true ;;
 	-mpi=* | --mpi=*)
@@ -2207,7 +2228,7 @@
 	perl -i -pe 's/MPI_DISPLACEMENT_CURRENT=-1_8/MPI_DISPLACEMENT_CURRENT=-1/g' mpi_headers/mpif.h
     else
 	echo " We cannot create a copy of mpif.h!"
-	exit -1
+#	exit -1
     fi
 fi
 
@@ -2458,6 +2479,7 @@
 
 libmitgcmuv.a: \$(OBJFILES)
 	ar rcv libmitgcmuv.a \$(OBJFILES)
+	ar d   libmitgcmuv.a main.o
 
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
 
@@ -2468,7 +2490,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 +2562,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 \$<