--- MITgcm/tools/genmake2	2004/09/27 15:49:48	1.99
+++ MITgcm/tools/genmake2	2004/10/15 19:54:56	1.107
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.99 2004/09/27 15:49:48 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.107 2004/10/15 19:54:56 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -124,10 +124,10 @@
 EOF
     test -f Makefile  &&  mv -f Makefile Makefile.bak
     cat <<EOF >> Makefile
-%.$tfs : %.F
 .SUFFIXES:
-genmake_hello.$tfs: genmake_hello.F
-	$LN genmake_hello.F genmake_hello.$tfs
+.SUFFIXES: .$tfs .F
+.F.$tfs:
+	$LN \$< \$@
 EOF
     $MAKE "genmake_hello."$tfs > /dev/null 2>&1
     RETVAL=$?
@@ -861,7 +861,7 @@
     echo "none found"
 fi
 
-#  echo "$0::$1:$2:$3:$4:$5:$6:$7:"
+#echo "$0::$1:$2:$3:$4:$5:$6:$7:"
 #OPTIONS=
 #n=0
 #for i ; do 
@@ -873,7 +873,7 @@
 #done
 #parse_options
 ac_prev=
-for ac_option in $@ ; do
+for ac_option in "$@" ; do
 
     G2ARGS="$G2ARGS \"$ac_option\""
 
@@ -1345,7 +1345,30 @@
     exit 1
 fi
 if test "x$S64" = x ; then
-    S64='$(TOOLSDIR)/set64bitConst.sh'
+    echo "3.0 _d 3" | ${TOOLSDIR}/set64bitConst.sh > /dev/null 2>&1
+    RETVAL=$?
+    if test "x${RETVAL}" = x0 ; then
+	S64='$(TOOLSDIR)/set64bitConst.sh'
+    else
+	echo "3.0 _d 3" | ${TOOLSDIR}/set64bitConst.csh > /dev/null 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    S64='$(TOOLSDIR)/set64bitConst.csh'
+	else
+	    cat <<EOF
+
+ERROR: neither of the two default scripts:
+
+    ${TOOLSDIR}/set64bitConst.sh
+    ${TOOLSDIR}/set64bitConst.csh
+
+  are working so please check paths or specify (with \$S64) a 
+  working version of this script.
+
+EOF
+	    exit 1
+	fi
+    fi
 fi
 THIS_SCRIPT=`echo ${0} | sed 's:'$TOOLSDIR':\$(TOOLSDIR):'`
 
@@ -1490,6 +1513,41 @@
 rm -f ./.tmp_pack
 echo "    packages are:  $PACKAGES"
 
+#  Check availability of NetCDF and then either build the MNC template
+#  files or delete mnc from the list of available packages.
+echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    if test "x$HAVE_NETCDF" != xt ; then
+	cat <<EOF
+
+*********************************************************************
+WARNING: the "mnc" package was enabled but tests failed to compile
+  NetCDF applications.  Please check that:
+
+  1) NetCDF is correctly installed for this compiler and
+  2) the LIBS variable (within the "optfile") specifies the correct 
+       NetCDF library to link against.
+
+  Due to this failure, the "mnc" package is now DISABLED.
+*********************************************************************
+
+EOF
+	PACKAGES=`echo $PACKAGES | sed -e 's/mnc//g'`
+	DISABLE="$DISABLE mnc"
+    else
+	( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    rm -f make_mnc.errors
+	else
+	    echo "Error: problem encountered while building source files in pkg/mnc:"
+	    cat make_mnc.errors 1>&2
+	    exit 1
+	fi
+    fi
+fi
+
 echo "  applying package dependency rules"
 ck=
 while test "x$ck" != xtt ; do
@@ -1574,39 +1632,6 @@
     fi
 done
 
-#  Build MNC templates and check for ability to build and use NetCDF
-echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
-RETVAL=$?
-if test "x$RETVAL" = x0 ; then
-    ( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
-    RETVAL=$?
-    if test "x${RETVAL}" = x0 ; then
-	rm -f make_mnc.errors
-    else
-	echo "Error: problem encountered while building source files in pkg/mnc:"
-	cat make_mnc.errors 1>&2
-	exit 1
-    fi
-    if test "x$HAVE_NETCDF" != xt ; then
-	cat <<EOF
-
-*********************************************************************
-WARNING: the "mnc" package was enabled but tests failed to compile
-  NetCDF applications.  Please check that:
-
-  1) NetCDF is correctly installed for this compiler and
-  2) the LIBS variable (within the "optfile") specifies the correct 
-       NetCDF library to link against.
-
-  Due to this failure, the "mnc" package is now DISABLED.
-*********************************************************************
-
-EOF
-	temp=`echo $PACKAGES | sed -e 's/mnc//g'`
-	PACKAGES=$temp
-    fi
-fi
-
 # Create a list of #define and #undef to enable/disable packages
 PACKAGES_DOT_H=PACKAGES_CONFIG.h
 #  The following UGLY HACK sets multiple "#undef"s and it needs to go 
@@ -1900,7 +1925,7 @@
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
-LIBS = ${LIBS} \$(XLIBS)
+LIBS = ${LIBS}
 # Name of the Mekfile
 MAKEFILE=${MAKEFILE}
 
@@ -1985,7 +2010,8 @@
 
 # The normal chain of rules is (  .F - .$FS - .o  )
 
-%.o : %.F
+## This nullifies any default implicit rules concerning these two file types:
+## %.o : %.F
 
 .F.$FS:
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
@@ -2070,6 +2096,11 @@
 ad_tamc: ad_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS) 
 
+adonlyfwd:
+	patch < \$(TOOLSDIR)/ad_taf_output.f.onlyfwd.diff
+ 
+adtrick:
+	patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff
 
 # ... FTL ...
 ftlall: ftl_taf