--- MITgcm/tools/genmake2	2008/11/18 22:11:07	1.178
+++ MITgcm/tools/genmake2	2009/01/14 20:08:40	1.183
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.178 2008/11/18 22:11:07 utke Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.183 2009/01/14 20:08:40 utke Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -1046,6 +1046,8 @@
 FFLAGS=
 FOPTIM=
 FEXTRAFLAGS=
+USE_EXTENDED_SRC=
+EXTENDED_SRC_FLAG=
 CFLAGS=
 KFLAGS1=
 KFLAGS2=
@@ -1402,8 +1404,14 @@
 fi
 
 #  Find the MITgcm ${THISVER}
-if test -f "${ROOTDIR}/doc/tag-index" ; then
-    THISVER=`grep '^checkpoint' ${ROOTDIR}/doc/tag-index | head -1`
+version_file="${ROOTDIR}/doc/tag-index"
+if test -f $version_file ; then
+    THISVER=`grep '^checkpoint' $version_file | head -1`
+#-  remove ./BUILD_INFO.h file if older than version_file
+    if test -f ./BUILD_INFO.h -a ./BUILD_INFO.h -ot $version_file ; then
+	echo "  remove ./BUILD_INFO.h (older than ${version_file})"
+	rm -f ./BUILD_INFO.h
+    fi
 fi
 
 if test "x$MAKEFILE" = x ; then
@@ -1640,6 +1648,11 @@
       INCLUDES="$INCLUDES $GSLINC"
       LIBS="$LIBS $GSLLIB"
 fi
+#- if USE_EXTENDED_SRC is set, add EXTENDED_SRC_FLAG to FFLAGS :
+if test ! "x$USE_EXTENDED_SRC" = x ; then
+      FFLAGS="$FFLAGS $EXTENDED_SRC_FLAG"
+      F90FIXEDFORMAT="$F90FIXEDFORMAT $EXTENDED_SRC_FLAG"
+fi
 
 printf "\n===  Checking system libraries  ===\n"
 printf "  Do we have the system() command using $FC...  "
@@ -2999,7 +3012,7 @@
 
 # canonicalizer
 ad_input_code_sf.w2f.pre.f$FS90: ad_input_code_sf.w2f.f$FS90 preProcess.py
-	./preProcess.py -H \$< -o \$@
+	./preProcess.py -H -S \$< -o \$@
 
 # F -> WHIRL
 # note that the canonicalized version cuts off at col 72 
@@ -3016,8 +3029,8 @@
 	./whirl2xaif -s -n --debug 1 -o \$@ \$<
 
 # XAIF -> XAIF'
-ad_input_code_sf.w2f.pre.xb.xaif : ad_input_code_sf.w2f.pre.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd openad_adm
-	./openad_adm -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
+ad_input_code_sf.w2f.pre.xb.xaif : ad_input_code_sf.w2f.pre.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd oadDriver
+	./oadDriver -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
 
 # XAIF' -> WHIRL'
 ad_input_code_sf.w2f.pre.xb.x2w.B : ad_input_code_sf.w2f.pre.xb.xaif xaif2whirl
@@ -3071,8 +3084,8 @@
 whirl2f whirl2f_be:
 	\$(LN) \${OPEN64ROOT}/whirl2f/\$@ .
 
-openad_adm:
-	\$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/test/t \$@
+oadDriver:
+	\$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver \$@
 
 # ============ end OpenAD specific section ==============