--- MITgcm/tools/genmake2 2003/11/13 22:03:39 1.35 +++ MITgcm/tools/genmake2 2003/11/14 12:52:56 1.38 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.35 2003/11/13 22:03:39 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.38 2003/11/14 12:52:56 edhill Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -290,6 +290,7 @@ echo "WARNING: C test compile fails -- please see \"genmake_errors\"" echo "WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE'" echo "WARNING: Please contact if you need help here." + rm -f genmake_tcomp.* genmake_test.* return 1 fi c_tcall=`nm genmake_test.o | grep tcall | cut -d ' ' -f 3` @@ -300,6 +301,7 @@ echo "WARNING: The \"nm\" command failed." echo "WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE'" echo "WARNING: Please contact if you need help here." + rm -f genmake_tcomp.* genmake_test.* return 1 fi cat > genmake_tcomp.f < if you need help here." + rm -f genmake_tcomp.* genmake_test.* return 1 fi f_tcall=`nm genmake_tcomp.o | grep tcall | cut -d ' ' -f 3` @@ -327,6 +330,7 @@ echo "WARNING: The \"nm\" command failed." echo "WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE'" echo "WARNING: Please contact if you need help here." + rm -f genmake_tcomp.* genmake_test.* return 1 fi @@ -864,7 +868,7 @@ # they appear as regular source code if test -r $ROOTDIR"/eesupp/src/Makefile" ; then echo " Making source files in eesupp from templates" - $MAKE -C $ROOTDIR"/eesupp/src/" > make_eesupp.errors 2>&1 + ( cd $ROOTDIR"/eesupp/src/" && $MAKE ) > make_eesupp.errors 2>&1 RETVAL=$? if test "x${RETVAL}" = x0 ; then rm -f make_eesupp.errors @@ -1495,6 +1499,10 @@ \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f cat ad_input_code_ad.f | sed -f adjoint_sed > ad_taf_output.f +adtafonly: + \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f + cat ad_input_code_ad.f | sed -f adjoint_sed > ad_taf_output.f + ad_taf: ad_taf_output.o \$(OBJFILES) \$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)