--- MITgcm/tools/genmake2	2009/06/17 22:47:49	1.195
+++ MITgcm/tools/genmake2	2009/10/09 11:13:27	1.198
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.195 2009/06/17 22:47:49 utke Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.198 2009/10/09 11:13:27 mlosch Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -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
@@ -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
@@ -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 ==============