--- MITgcm/tools/genmake2	2012/09/19 20:46:03	1.241
+++ MITgcm/tools/genmake2	2012/09/20 23:12:47	1.242
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.241 2012/09/19 20:46:03 utke Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.242 2012/09/20 23:12:47 heimbach Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -2482,6 +2482,11 @@
     OAD_DONT_TRANSFORM="/dev/null"
     OAD_KEEP_ORIGINAL="/dev/null"
     OAD_CB2M_FILES="/dev/null"
+    OADTOOLS="$TOOLSDIR/OAD_support"
+    test -f "oadtempflile"  &&  \rm -f "oadtempflile"
+cat >> "oadtempflile" <<EOF
+$OADTOOLS
+EOF
     echo "  looking for dontCompile file:  "
     for i in "." $MODS ; do
 	if test -r $i"/dontCompile" ; then
@@ -2689,6 +2694,7 @@
 EXEDIR      = ${EXEDIR}
 EXECUTABLE  = \$(EXEDIR)/${EXECUTABLE}
 TOOLSDIR    = ${TOOLSDIR}
+OADTOOLS    = ${OADTOOLS}
 
 #eh3  new defines for the adjoint work
 AUTODIFF    = ${ROOTDIR}/pkg/autodiff
@@ -3185,16 +3191,16 @@
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(AD_OBJ_FILES_S2) \$(LIBS)
 
 # create sources files modules from header files containing common blocks
-%_mod.FF90 : %.h ../OAD_support/cb2mGetModules.csh ../OAD_support/cb2mGetModules.awk
-	../OAD_support/cb2mGetModules.csh $< ../OAD_support/cb2mGetModules.awk
+%_mod.FF90 : %.h \${OADTOOLS}/cb2mGetModules.csh \${OADTOOLS}/cb2mGetModules.awk
+	\${OADTOOLS}/cb2mGetModules.csh $< \${OADTOOLS}/cb2mGetModules.awk
 
 # create new header files with USE statements for the new modules made above
-%_mod.h : %.h ../OAD_support/cb2mGetHeaders.csh ../OAD_support/cb2mGetHeaders.awk
-	../OAD_support/cb2mGetHeaders.csh $< ../OAD_support/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
+%_mod.h : %.h \${OADTOOLS}/cb2mGetHeaders.csh \${OADTOOLS}/cb2mGetHeaders.awk
+	\${OADTOOLS}/cb2mGetHeaders.csh $< \${OADTOOLS}/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
 
 # change the include directives of everybody to refer to  the new header files with the USE statements
-%_cb2m.FF90 : %.F ../OAD_support/cb2mUseModules.bash
-	../OAD_support/cb2mUseModules.bash $< ${MPI}
+%_cb2m.FF90 : %.F \${OADTOOLS}/cb2mUseModules.bash
+	\${OADTOOLS}/cb2mUseModules.bash $< ${MPI}
 
 # makefile debug rule
 small_f: \$(CB2M_F90_PP_SRC_FILES)
@@ -3216,7 +3222,7 @@
 
 # replace stop statements (to avoid the implied unstructured control flow)  with print statements
 ad_input_code_sf.pre.s2p.f90 : ad_input_code_sf.pre.f90
-	cat \$< | sed -f ../OAD_support/stop2print.sed > ad_input_code_sf.pre.s2p.f90
+	cat \$< | sed -f \${OADTOOLS}/stop2print.sed > ad_input_code_sf.pre.s2p.f90
 
 # F -> WHIRL
 ad_input_code_sf.pre.s2p.B: ad_input_code_sf.pre.s2p.f90
@@ -3239,13 +3245,13 @@
 	\${OPEN64ROOT}/whirl2f/whirl2f -FLIST:ftn_file=\$@ -openad \$<
 
 # insert template directives
-ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 ../OAD_support/insertTemplateDir.bash
-	../OAD_support/insertTemplateDir.bash \$< \$@
+ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 \${OADTOOLS}/insertTemplateDir.bash
+	\${OADTOOLS}/insertTemplateDir.bash \$< \$@
 
-PPEXTRAS=\$(wildcard ../OAD_support/ad_template.*.F) ../OAD_support/ad_inline.F
+PPEXTRAS=\$(wildcard \${OADTOOLS}/ad_template.*.F) \${OADTOOLS}/ad_inline.F
 # postprocess F'
 postProcess.tag: ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90 \$(PPEXTRAS:.F=.f) | w2f__types.f90
-	\${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i ../OAD_support/ad_inline.f \$<
+	\${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i \${OADTOOLS}/ad_inline.f \$<
 	# the target is a placeholder to trigger a single execution of the rule
 	touch \$@
 # put this so make knows about the postprocessing output
@@ -3257,9 +3263,9 @@
 
 # link the support files:
 \$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES):
-	\$(LN) ../OAD_support/\$@ .
+	\$(LN) \${OADTOOLS}/\$@ .
 
-AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag \$(PPEXTRAS:.F=.f)
+AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag oadtempflile \$(PPEXTRAS:.F=.f)
 
 # ============ end OpenAD specific section ==============