--- MITgcm/tools/genmake2	2009/05/12 08:19:48	1.194
+++ MITgcm/tools/genmake2	2009/12/10 07:01:14	1.201
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.194 2009/05/12 08:19:48 utke Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.201 2009/12/10 07:01:14 utke Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -1405,7 +1405,7 @@
 #  Find the MITgcm ${THISVER}
 version_file="${ROOTDIR}/doc/tag-index"
 if test -f $version_file ; then
-    THISVER=`grep '^checkpoint' $version_file | head -1`
+    THISVER=`$AWK '/^checkpoint/{print $1; exit}' $version_file`
 #-  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})"
@@ -2783,7 +2783,7 @@
 	-rm -f ad_config.template
 	@make \$(F77_PP_SRC_FILES)
 	@make \$(FLOFILES)
-	cat \$(FLOFILES) \$(AD_FILES) > ad_input_code.$FS
+	cat \$(FLOFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
 
 ad_taf_output.$FS: ad_input_code.$FS
 	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
@@ -3041,7 +3041,7 @@
 
 # canonicalizer
 ad_input_code_sf.w2f.pre.f$FS90: ad_input_code_sf.w2f.f$FS90 preProcess.py
-	./preProcess.py -H -S \$< -o \$@
+	./preProcess.py --timing --r8 -H -S \$< -o \$@
 
 # F -> WHIRL
 # note that the canonicalized version cuts off at col 72 
@@ -3063,7 +3063,7 @@
 
 # XAIF' -> WHIRL'
 ad_input_code_sf.w2f.pre.xb.x2w.B : ad_input_code_sf.w2f.pre.xb.xaif xaif2whirl
-	./xaif2whirl --debug 1 --structured ad_input_code_sf.w2f.pre.B \$<
+	./xaif2whirl --debug 1 ad_input_code_sf.w2f.pre.B \$<
 
 # WHIRL' -> F'
 ad_input_code_sf.w2f.pre.xb.x2w.w2f.f$FS90: ad_input_code_sf.w2f.pre.xb.x2w.B whirl2f whirl2f_be
@@ -3081,7 +3081,7 @@
 	# this step also creates the file postProcess.make but we cannot 
 	# name it as the target or else make will try to remake it for 
 	# the include directive above for any rule, e.g. make clean
-	./postProcess.py -m r -i ../OAD_support/ad_inline.f --width 4 \$<
+	./postProcess.py --progress --timing --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$<
 
 # setup some links
 %.xsd:
@@ -3106,7 +3106,7 @@
 oadDriver:
 	\$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver \$@
 
-AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.make postProcess.tag postProcess.comp
+AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.make postProcess.tag postProcess.comp \$(PPEXTRAS:.F=.f)
 
 # ============ end OpenAD specific section ==============