--- MITgcm/tools/genmake2	2004/10/14 03:24:14	1.106
+++ MITgcm/tools/genmake2	2004/11/13 03:23:28	1.111
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.106 2004/10/14 03:24:14 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.111 2004/11/13 03:23:28 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -675,6 +675,48 @@
 }
 
 
+check_HAVE_STAT()  {
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+void FC_NAMEMANGLE(tfsize) ( int *nbyte )
+{
+    char name[512];
+    struct stat astat;
+
+    name[0] = 'a'; name[1] = '\0';
+    if (! stat(name, &astat))
+        *nbyte = (int)(astat.st_size);
+    else
+        *nbyte = -1;
+}
+EOF
+    make genmake_tc_1.o >> genmake_tc.log 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.f
+      program hello
+      integer nbyte
+      call tfsize(nbyte)
+      print *," HELLO WORLD", nbyte
+      end program hello
+EOF
+    $FC $FFLAGS -o genmake_tc genmake_tc_2.f genmake_tc_1.o >> genmake_tc.log 2>&1
+    RET_F=$?
+    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_tc.log 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_STAT=t
+	DEFINES="$DEFINES -DHAVE_STAT"
+    fi
+    rm -f genmake_tc*
+}
+
+
 check_netcdf_libs()  {
     echo "" > genmake_tnc.log
     cat <<EOF > genmake_tnc.for
@@ -689,11 +731,22 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    #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"
+    echo "Executing:" > genmake_tnc.log
+    echo "  $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f" \
+	> genmake_tnc.log
+    RET_CPP=f
     $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
-	&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
+	&&  RET_CPP=t
+    if test "x$RET_CPP" = xf ; then
+	echo "  WARNING: CPP failed to pre-process the netcdf test." \
+	    > genmake_tnc.log
+	echo "    Please check that \$INCLUDES is properly set." \
+	    > genmake_tnc.log
+    fi
+    echo "Executing:" > genmake_tnc.log
+    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.f" > genmake_tnc.log
+    echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
+    $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=$?
 
@@ -749,7 +802,7 @@
 DUMPSTATE=t
 PDEFAULT=
 OPTFILE=
-INCLUDES="-I."
+INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
 CFLAGS=
@@ -768,6 +821,7 @@
 HAVE_FDATE=
 FC_NAMEMANGLE=
 HAVE_CLOC=
+HAVE_STAT=
 HAVE_NETCDF=
 HAVE_ETIME=
 
@@ -1293,6 +1347,15 @@
 fi
 rm -f genmake_t*
 
+printf "  Can we use stat() through C calls...  "
+check_HAVE_STAT
+if test "x$HAVE_STAT" != x ; then
+    echo "yes"
+else
+    echo "no"
+fi
+rm -f genmake_t*
+
 printf "  Can we create NetCDF-enabled binaries...  "
 check_netcdf_libs
 if test "x$HAVE_NETCDF" != x ; then
@@ -1536,7 +1599,7 @@
 	PACKAGES=`echo $PACKAGES | sed -e 's/mnc//g'`
 	DISABLE="$DISABLE mnc"
     else
-	( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
+	( cd $ROOTDIR"/pkg/mnc" && $MAKE testclean && $MAKE templates ) > make_mnc.errors 2>&1
 	RETVAL=$?
 	if test "x${RETVAL}" = x0 ; then
 	    rm -f make_mnc.errors
@@ -1925,7 +1988,7 @@
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
-LIBS = ${LIBS} \$(XLIBS)
+LIBS = ${LIBS}
 # Name of the Mekfile
 MAKEFILE=${MAKEFILE}
 
@@ -2136,11 +2199,27 @@
 
 # ... SVD ...
 svdtaf: ad_taf_output.f ftl_taf_output.f
-svdall: svd_taf
+	@echo "--->>> Only ran TAF to generate SVD code!    <<<---"
+	@echo "--->>> Do make svdall afterwards to compile. <<<---"
+svdall: svd_touch svd_taf
 
-svd_taf: ad_taf_output.o ftl_taf_output.o \$(OBJFILES)
+svd_taf: \$(OBJFILES)
 	\$(LINK) -o mitgcmuv_svd \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o ftl_taf_output.o \$(LIBS)
 
+	@echo "--->>> Only COMPILE svd code! <<<---"
+	@echo "--->>> Assumes you previously <<<---"
+	@echo "--->>> did make svdtaf        <<<---"
+
+svd_touch:
+	@echo "--->>> Only COMPILE svd code! <<<---"
+	@echo "--->>> Assumes you previously <<<---"
+	@echo "--->>> did make svdtaf        <<<---"
+	touch ad_taf_output.f ftl_taf_output.f
+	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ad_taf_output.f
+	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ftl_taf_output.f
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ftl_config.template
+	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+	-rm -f ftl_config.template
 
 #=========================================