--- MITgcm/tools/genmake2	2003/11/23 20:01:50	1.43
+++ MITgcm/tools/genmake2	2003/11/24 14:54:12	1.44
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.43 2003/11/23 20:01:50 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.44 2003/11/24 14:54:12 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -941,6 +941,7 @@
 if test "x$S64" = x ; then
     S64='$(TOOLSDIR)/set64bitConst.sh'
 fi
+THIS_SCRIPT=`echo ${0} | sed 's:'$TOOLSDIR':\$(TOOLSDIR):'`
 
 EXECUTABLE=${EXECUTABLE:-mitgcmuv}
 
@@ -1164,6 +1165,7 @@
 #  statements could be separated and handled only by genmake.
 names=`ls -1 "$ROOTDIR/pkg"`
 all_pack=
+DISABLED_PACKAGES=
 for n in $names ; do
     if test -d "$ROOTDIR/pkg/$n" -a "x$n" != xCVS ; then
 	has_pack="f"
@@ -1176,6 +1178,7 @@
 	if test "x$has_pack" = xf ; then
 	    undef=`echo "ALLOW_$n" | $AWK '{print toupper($0)}'`
 	    echo "#undef $undef" >> $PACKAGES_DOT_H".tmp"
+            DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
 	fi
     fi
 done
@@ -1183,9 +1186,11 @@
 
 C  Packages enabled by genmake:
 EOF
+ENABLED_PACKAGES=
 for i in $PACKAGES ; do
     def=`echo "ALLOW_$i" | $AWK '{print toupper($0)}'`
     echo "#define $def" >> $PACKAGES_DOT_H".tmp"
+    ENABLED_PACKAGES="$ENABLED_PACKAGES -D$def"
 #eh3 DEFINES="$DEFINES -D$def"
 
 #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
@@ -1278,18 +1283,6 @@
     done
 done
 
-cat <<EOF > adjoint_sed
-s/call adopen(/call adopen ( mythid,\\
-     \&           /g
-s/call adclose(/call adclose( mythid,\\
-     \&           /g
-s/call adread(/call adread ( mythid,\\
-     \&           /g
-s/call adwrite(/call adwrite( mythid,\\
-     \&           /g
-
-EOF
-
 echo
 echo "===  Creating the Makefile  ==="
 echo "  setting INCLUDES"
@@ -1319,9 +1312,19 @@
     for sf in $sfiles ; do
 	if test ! -r ".links.tmp/$sf" ; then
 	    if test -f "$d/$sf" ; then
+                case $d/$sf in
+                  ./$PACKAGES_DOT_H)
+			;;
+                  ./AD_CONFIG.h)
+			;;
+                  ./FC_NAMEMANGLE.h)
+			;;
+                  *)
+		  	touch .links.tmp/$sf
+		  	deplist="$deplist $sf"
+			;;
+                esac
 		extn=`echo $sf | $AWK -F '.' '{print $NF}'`
-		touch .links.tmp/$sf
-		deplist="$deplist $sf"
 		case $extn in
 		    F)
 			echo    " \\"  >> srclist.inc
@@ -1412,6 +1415,9 @@
 EXE_FTL     = ${EXE_FTL}
 EXE_SVD     = ${EXE_SVD}
 
+ENABLED_PACKAGES = ${ENABLED_PACKAGES}
+DISABLED_PACKAGES = ${DISABLED_PACKAGES}
+
 EOF
 
 #  Note: figure out some way to add Hyades JAM libraries here
@@ -1476,14 +1482,15 @@
 .SUFFIXES: .o .f .p .F .c .F90 .f90
 
 all: \$(EXECUTABLE)
-\$(EXECUTABLE): \$(OBJFILES)
+\$(EXECUTABLE): links \$(OBJFILES)
+	@echo Creating \$@ ...
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
 depend:
 	@make links
 	\$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
-	${TOOLSDIR}/f90mkdepend >> \$(MAKEFILE)
+	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 
-links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES)
+links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) ${PACKAGES_DOT_H} AD_CONFIG.h
 
 small_f: \$(F77FILES) \$(F90FILES)
 
@@ -1492,11 +1499,11 @@
 	@\$(EXECUTABLE) > \$@
 
 clean:
-	-cat AD_CONFIG.template > AD_CONFIG.h
-	-rm -rf *.o *.f *.p *.f90 *.mod ${RMFILES} work.{pc,pcl}
+	-rm -rf *.o *.f *.p *.f90 *.mod ${RMFILES} work.{pc,pcl} *.template
 Clean:
 	@make clean
 	@make cleanlinks
+	-rm -f ${PACKAGES_DOT_H} AD_CONFIG.h
 	-rm -f Makefile.bak genmake_state genmake_*optfile genmake_warnings make.log
 CLEAN:
 	@make Clean
@@ -1507,10 +1514,18 @@
 
 #eh3 Makefile: makefile
 makefile:
-	${0} $@
+	$THIS_SCRIPT $@
 cleanlinks:
 	-find . -type l -exec rm {} \;
 
+# Special targets
+${PACKAGES_DOT_H}:
+	@echo Creating \$@ ...
+	@\$(TOOLSDIR)/convert_cpp_cmd2defines "Warngin - this file is automatically generated - do NOT edit" "Enabled packages:" \$(ENABLED_PACKAGES) " " "Disabled packages:" \$(DISABLED_PACKAGES) > \$@
+AD_CONFIG.h:
+	@echo Creating \$@ ...
+	@\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > \$@
+
 # The normal chain of rules is (  .F - .f - .o  )
 .F.f:
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
@@ -1570,25 +1585,27 @@
 adtamc: ad_tamc_output.f
 
 ad_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+	@\$(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
 	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	-rm -f ad_config.template
 	@make \$(F77FILES)
 	@make \$(AD_FLOW_FILES)
 	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ad_input_code.f
 
 ad_taf_output.f: ad_input_code.f
 	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f adjoint_sed > ad_taf_output.f
+	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/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
+	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/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) 
 
 ad_tamc_output.f: ad_input_code.f
 	\$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f adjoint_sed > ad_tamc_output.f
+	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.f
 
 ad_tamc: ad_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS) 
@@ -1600,25 +1617,27 @@
 ftltamc: ftl_tamc_output.f
 
 ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+	@\$(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
 	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+	-rm -f ftl_config.template
 	@make \$(F77FILES)
 	@make \$(AD_FLOW_FILES)
 	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.f
 
 ftl_taf_output.f: ftl_input_code.f
 	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f adjoint_sed > ftl_taf_output.f
+	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.f
 
 ftltafonly:
 	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f adjoint_sed > ftl_taf_output.f
+	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.f
 
 ftl_taf: ftl_taf_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS) 
 
 ftl_tamc_output.f: ftl_input_code.f
 	\$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f adjoint_sed > ftl_tamc_output.f
+	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_tamc_output.f
 
 ftl_tamc: ftl_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_tamc_output.o \$(LIBS)