--- MITgcm/tools/genmake2	2012/06/23 23:21:43	1.230
+++ MITgcm/tools/genmake2	2012/07/06 18:55:13	1.231
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.230 2012/06/23 23:21:43 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.231 2012/07/06 18:55:13 jmc Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -2753,7 +2753,7 @@
 	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
 AD_CONFIG.h:
 	@echo Creating \$@ ...
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > \$@
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > \$@
 FC_NAMEMANGLE.h:
 	@echo Creating \$@ ...
 	echo "$FC_NAMEMANGLE" > \$@
@@ -2867,7 +2867,7 @@
 adtamc: ad_tamc_output.$FS
 
 ad_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES) \$(AD_FLOW_FILES)
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ad_config.template
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
 	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
 	-rm -f ad_config.template
 	@make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
@@ -2908,7 +2908,7 @@
 ftltamc: ftl_tamc_output.$FS
 
 ftl_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES)
-	@$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
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ftl_config.template
 	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
 	-rm -f ftl_config.template
 	@make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
@@ -2955,7 +2955,7 @@
 	touch ad_taf_output.$FS ftl_taf_output.$FS
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ad_taf_output.$FS
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ftl_taf_output.$FS
-	@$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
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ftl_config.template
 	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
 	-rm -f ftl_config.template
 
@@ -3255,7 +3255,7 @@
     fi
 fi
 if test ! -f AD_CONFIG.h ; then
-    $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > AD_CONFIG.h
+    $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > AD_CONFIG.h
 fi
 
 #  Write the "state" for future records