--- MITgcm/tools/genmake2	2005/09/11 18:52:26	1.130
+++ MITgcm/tools/genmake2	2005/11/09 04:31:30	1.134
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.130 2005/09/11 18:52:26 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.134 2005/11/09 04:31:30 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -601,7 +601,7 @@
       call tsub( string )
       end
 EOF
-    $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1
+    $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -791,19 +791,19 @@
 EOF
     echo "Executing:" > genmake_tnc.log
     echo "  $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \
-	> genmake_tnc.log
+	>> genmake_tnc.log
     RET_CPP=f
     $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
 	&&  RET_CPP=t
     if test "x$RET_CPP" = xf ; then
 	echo "  WARNING: CPP failed to pre-process the netcdf test." \
-	    > genmake_tnc.log
+	    >> genmake_tnc.log
 	echo "    Please check that \$INCLUDES is properly set." \
-	    > genmake_tnc.log
+	    >> genmake_tnc.log
     fi
     echo "Executing:" > genmake_tnc.log
-    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log
-    echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
+    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" >> genmake_tnc.log
+    echo "  $LINK -o genmake_tnc.o $LIBS" >> genmake_tnc.log
     $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
 	&&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
@@ -819,6 +819,9 @@
 	HAVE_NETCDF=t
     else
 	# try again with "-lnetcdf" added to the libs
+	echo "$CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
 	$CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
 	    &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
 	    &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
@@ -827,6 +830,9 @@
 	    LIBS="$LIBS -lnetcdf"
 	    HAVE_NETCDF=t
 	else
+	    echo "===  genmake_tnc.F  ===" >> genmake_warnings
+	    cat genmake_tnc.F >> genmake_warnings
+	    echo "===  genmake_tnc.F  ===" >> genmake_warnings
 	    cat genmake_tnc.log >> genmake_warnings
 	fi
     fi
@@ -874,6 +880,7 @@
 MPI=
 MPIPATH=
 TS=
+HAVE_TEST_L=
 
 # DEFINES checked by test compilation or command-line
 HAVE_SYSTEM=
@@ -1338,6 +1345,11 @@
 EOF
     exit 1
 fi
+test -L genmake_tlink > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_TEST_L=t
+fi
 rm -f genmake_test_ln genmake_tlink
 
 #  Check for broken *.F/*.f handling and fix if possible
@@ -1360,7 +1372,7 @@
       call system('echo hi')
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_SYSTEM=t
@@ -1381,7 +1393,7 @@
       print *, string
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_FDATE=t
@@ -1403,7 +1415,7 @@
       print *, tarray
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_ETIME=t
@@ -1920,6 +1932,7 @@
     for sf in $sfiles ; do
 	if test ! -r ".links.tmp/$sf" ; then
 	    if test -f "$d/$sf" ; then
+		ignore_f=f
                 case $d/$sf in
                   ./$PACKAGES_DOT_H)
 			;;
@@ -1930,33 +1943,41 @@
                   ./BUILD_INFO.h)
 			;;
                   *)
-		  	touch .links.tmp/$sf
-		  	deplist="$deplist $sf"
+			#  For the local directory *ONLY*,
+			#  ignore all soft-links
+			if test "x$HAVE_TEST_L" = xt -a "x$d" = x. -a -L $sf ; then
+			    ignore_f=t
+			else
+			    touch .links.tmp/$sf
+			    deplist="$deplist $sf"
+			fi
 			;;
                 esac
-		extn=`echo $sf | $AWK -F. '{print $NF}'`
-		case $extn in
-		    F)
-			echo    " \\"  >> srclist.inc
-			printf " $sf" >> srclist.inc
-			;;
-		    F90)
-			echo    " \\"  >> f90srclist.inc
-			printf " $sf" >> f90srclist.inc
-			;;
-		    c)
-			echo    " \\"  >> csrclist.inc
-			printf " $sf" >> csrclist.inc
-			;;
-		    h)
-			echo    " \\"  >> hlist.inc
-			printf " $sf" >> hlist.inc
-			;;
-		    flow)
-			echo    " \\"  >> ad_flow_files.inc
-			printf " $sf" >> ad_flow_files.inc
-			;;
-		esac
+		if test "x$ignore_f" = xf ; then
+		    extn=`echo $sf | $AWK -F. '{print $NF}'`
+		    case $extn in
+			F)
+			    echo    " \\"  >> srclist.inc
+			    printf " $sf" >> srclist.inc
+			    ;;
+			F90)
+			    echo    " \\"  >> f90srclist.inc
+			    printf " $sf" >> f90srclist.inc
+			    ;;
+			c)
+			    echo    " \\"  >> csrclist.inc
+			    printf " $sf" >> csrclist.inc
+			    ;;
+			h)
+			    echo    " \\"  >> hlist.inc
+			    printf " $sf" >> hlist.inc
+			    ;;
+			flow)
+			    echo    " \\"  >> ad_flow_files.inc
+			    printf " $sf" >> ad_flow_files.inc
+			    ;;
+		    esac
+		fi
 	    fi
 	fi
     done
@@ -2107,6 +2128,11 @@
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out
 
+lib: libmitgcmuv.a
+
+libmitgcmuv.a: \$(OBJFILES)
+	ar rcv libmitgcmuv.a \$(OBJFILES)
+
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
 
 small_f: \$(F77FILES) \$(F90FILES)