--- MITgcm/tools/genmake2	2005/09/05 13:39:28	1.128
+++ MITgcm/tools/genmake2	2005/09/16 00:50:49	1.132
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.128 2005/09/05 13:39:28 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.132 2005/09/16 00:50:49 cnh Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -671,7 +671,7 @@
     RET_C=$?
     cat <<EOF > genmake_tc_2.$FS
       program hello
-      Real*8 wtime
+      REAL*8 wtime
       external cloc
       call cloc(wtime)
       print *," HELLO WORLD", wtime
@@ -689,6 +689,42 @@
 }
 
 
+check_HAVE_SETRLSTK()  {
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
+void FC_NAMEMANGLE(setrlstk) ()
+{
+    struct rlimit rls;
+    rls.rlim_cur = RLIM_INFINITY;
+    rls.rlim_max = RLIM_INFINITY;
+    setrlimit(RLIMIT_STACK, &rls);
+    return;
+}
+EOF
+    make genmake_tc_1.o >> genmake_warnings 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.$FS
+      program hello
+      external setrlstk
+      call setrlstk()
+      end
+EOF
+    $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1
+    RET_F=$?
+    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_warnings 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_SETRLSTK=t
+	DEFINES="$DEFINES -DHAVE_SETRLSTK"
+    fi
+    rm -f genmake_tc*
+}
+
+
 check_HAVE_STAT()  {
     get_fortran_c_namemangling
     cat <<EOF > genmake_tc_1.c
@@ -838,12 +874,14 @@
 MPI=
 MPIPATH=
 TS=
+HAVE_TEST_L=
 
 # DEFINES checked by test compilation or command-line
 HAVE_SYSTEM=
 HAVE_FDATE=
 FC_NAMEMANGLE=
 HAVE_CLOC=
+HAVE_SETRLSTK=
 HAVE_STAT=
 HAVE_NETCDF=
 HAVE_ETIME=
@@ -1301,6 +1339,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
@@ -1338,7 +1381,7 @@
 printf "  Do we have the fdate() command using $FC...  "
 cat > genmake_tcomp.$FS <<EOF
       program hello
-      CHARACTER(128) string
+      CHARACTER*(128) string
       string = ' '
       call fdate( string )
       print *, string
@@ -1387,6 +1430,15 @@
 fi
 rm -f genmake_t*
 
+printf "  Can we unlimit the stack size using $FC...  "
+check_HAVE_SETRLSTK
+if test "x$HAVE_SETRLSTK" != x ; then
+    echo "yes"
+else
+    echo "no"
+fi
+rm -f genmake_t*
+
 printf "  Can we use stat() through C calls...  "
 check_HAVE_STAT
 if test "x$HAVE_STAT" != x ; then
@@ -1874,6 +1926,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)
 			;;
@@ -1884,33 +1937,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
@@ -2061,6 +2122,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)