--- MITgcm/tools/genmake2	2004/08/05 16:04:32	1.95
+++ MITgcm/tools/genmake2	2004/09/27 15:49:48	1.99
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.95 2004/08/05 16:04:32 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.99 2004/09/27 15:49:48 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -689,23 +689,30 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    #echo "$CPP $DEFINES $INCLUDES"
+    #echo "$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f"
+    #echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.f"
+    #echo "$LINK -o genmake_tnc.o $LIBS"
     $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
-	&&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1
+	&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
+	&&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
-    test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
-    RETVAL=$?
-    if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+
+    #EH3  Remove test program execution for machines that either disallow
+    #EH3  execution or cannot support it (eg. cross-compilers)
+    #EH3
+    #EH3 test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
+    #EH3 RETVAL=$?
+    #EH3 if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+
+    if test "x$RET_COMPILE" = x0 ; then
 	HAVE_NETCDF=t
     else
 	# try again with "-lnetcdf" added to the libs
 	$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
-	    &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
-	    $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
+	    &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
+	    &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
 	RET_COMPILE=$?
-	test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
-	RETVAL=$?
-	if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+	if test "x$RET_COMPILE" = x0 ; then
 	    LIBS="$LIBS -lnetcdf"
 	    HAVE_NETCDF=t
 	else
@@ -775,9 +782,11 @@
 PWD=`pwd`
 MAKE=make
 AWK=awk
-THISHOSTNAME=`hostname`
+THISHOST=`hostname`
 THISCWD=`pwd`
 THISDATE=`date`
+THISUSER=`echo $USER`
+THISVER=
 MACHINE=`uname -a`
 EXECUTABLE=
 EXEHOOK=
@@ -811,7 +820,7 @@
 #  The following state is not directly set by command-line switches
 gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM "
 gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS"
-gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOSTNAME THISDATE MACHINE"
+gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOST THISUSER THISDATE THISVER MACHINE"
 gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
 gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE HAVE_ETIME"
 
@@ -1036,6 +1045,7 @@
     echo 
 fi
 
+#  Find the MITgcm ${ROOTDIR}
 if test "x${ROOTDIR}" = x ; then
     tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
@@ -1062,6 +1072,11 @@
     exit 1
 fi
 
+#  Find the MITgcm ${THISVER}
+if test -f "${ROOTDIR}/doc/tag-index" ; then
+    THISVER=`grep checkpoint ${ROOTDIR}/doc/tag-index | head -1`
+fi
+
 echo "  getting OPTFILE information:  "
 if test "x${OPTFILE}" = x ; then
     if test "x$MITGCM_OF" = x ; then
@@ -1575,14 +1590,20 @@
     if test "x$HAVE_NETCDF" != xt ; then
 	cat <<EOF
 
-WARNING: the "mnc" package has been enabled but tests failed to 
-  compile and/or execute NetCDF applications.  Please check that:
+*********************************************************************
+WARNING: the "mnc" package was enabled but tests failed to compile
+  NetCDF applications.  Please check that:
 
-  1) NetCDF is installed for your compiler and
-  2) the LIBS variable (within the 'optfile") specifies the correct 
+  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
 
@@ -1732,6 +1753,8 @@
 			;;
                   ./FC_NAMEMANGLE.h)
 			;;
+                  ./BUILD_INFO.h)
+			;;
                   *)
 		  	touch .links.tmp/$sf
 		  	deplist="$deplist $sf"
@@ -1788,7 +1811,7 @@
 echo "# by the command:" >> $MAKEFILE
 echo "#    $0 $G2ARGS" >> $MAKEFILE
 echo "# executed by:" >> $MAKEFILE
-echo "#    $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE
+echo "#    ${THISUSER}@${THISHOST}:${THISCWD}" >> $MAKEFILE
 
 EXE_AD=$EXECUTABLE"_ad"
 EXE_FTL=$EXECUTABLE"_ftl"
@@ -1834,7 +1857,7 @@
 DISABLED_PACKAGES = ${DISABLED_PACKAGES}
 
 # These files are created by Makefile
-SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h
+SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h BUILD_INFO.h
 
 EOF
 
@@ -1938,7 +1961,7 @@
 cleanlinks:
 	-find . -type l -exec rm {} \;
 
-# Special targets ($SPECIAL_FILES) which are create by make
+# Special targets (SPECIAL_FILES) which are create by make
 ${PACKAGES_DOT_H}:
 	@echo Creating \$@ ...
 	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
@@ -1949,6 +1972,17 @@
 	@echo Creating \$@ ...
 	echo "$FC_NAMEMANGLE" > \$@
 
+BUILD_INFO.h:
+	@echo Creating \$@ ...
+EOF
+
+test ! "x$THISVER" = x  && echo "	-echo \"#define THISVER '$THISVER'\" > \$@"   >> $MAKEFILE
+test ! "x$THISUSER" = x && echo "	-echo \"#define THISUSER '$THISUSER'\" >> \$@" >> $MAKEFILE
+test ! "x$THISDATE" = x && echo "	-echo \"#define THISDATE '$THISDATE'\" >> \$@" >> $MAKEFILE
+test ! "x$THISHOST" = x && echo "	-echo \"#define THISHOST '$THISHOST'\" >> \$@" >> $MAKEFILE
+
+cat >>$MAKEFILE <<EOF
+
 # The normal chain of rules is (  .F - .$FS - .o  )
 
 %.o : %.F