--- MITgcm/tools/genmake2	2004/10/21 13:38:46	1.108
+++ MITgcm/tools/genmake2	2004/12/26 16:38:20	1.113
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.108 2004/10/21 13:38:46 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.113 2004/12/26 16:38:20 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -718,10 +718,18 @@
 
 
 check_netcdf_libs()  {
+    if test ! "x$SKIP_NETCDF_CHECK" = x ; then
+	return
+    fi
     echo "" > genmake_tnc.log
     cat <<EOF > genmake_tnc.for
       program fgennc
 #include "netcdf.inc"
+EOF
+    if test ! "x$MPI" = x ; then
+	echo '#include "mpif.h"' >> genmake_tnc.for
+    fi
+    cat <<EOF >> genmake_tnc.for
       integer iret, ncid, xid
       iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
@@ -731,11 +739,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=$?
 
@@ -791,7 +810,7 @@
 DUMPSTATE=t
 PDEFAULT=
 OPTFILE=
-INCLUDES="-I."
+INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
 CFLAGS=
@@ -1090,7 +1109,7 @@
 
 #  Find the MITgcm ${ROOTDIR}
 if test "x${ROOTDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    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
 	ROOTDIR=".."
     else
@@ -1377,7 +1396,7 @@
 fi
 
 if test "x${EXEDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then
 	EXEDIR=../exe
     else
@@ -1588,7 +1607,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
@@ -2188,11 +2207,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
 
 #=========================================