--- MITgcm/tools/genmake2	2003/11/25 14:57:45	1.47
+++ MITgcm/tools/genmake2	2003/12/03 19:46:10	1.51
@@ -1,6 +1,6 @@
-#!/bin/sh
+#! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.47 2003/11/25 14:57:45 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.51 2003/12/03 19:46:10 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -586,7 +586,7 @@
 	-optfile=* | --optfile=* | -of=* | --of=*)
 	    OPTFILE=$ac_optarg ;;
 	
-	-adoptfile | --adoptfile | -ad | --ad)
+	-adoptfile | --adoptfile | -adof | --adof)
 	    ac_prev=AD_OPTFILE ;;
 	-adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
 	    AD_OPTFILE=$ac_optarg ;;
@@ -1447,7 +1447,7 @@
 .SUFFIXES: .o .f .p .F .c .F90 .f90
 
 all: \$(EXECUTABLE)
-\$(EXECUTABLE): links \$(OBJFILES)
+\$(EXECUTABLE): ${PACKAGES_DOT_H} AD_CONFIG.h \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(OBJFILES)
 	@echo Creating \$@ ...
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
 depend:
@@ -1469,7 +1469,7 @@
 	@make clean
 	@make cleanlinks
 	-rm -f ${PACKAGES_DOT_H} AD_CONFIG.h
-	-rm -f Makefile.bak genmake_state genmake_*optfile genmake_warnings make.log
+	-rm -f genmake_state genmake_*optfile genmake_warnings make.log run.log *.bak
 CLEAN:
 	@make Clean
 	-find \$(EXEDIR) -name "*.meta" -exec rm {} \;
@@ -1549,7 +1549,7 @@
 adtaf: ad_taf_output.f
 adtamc: ad_tamc_output.f
 
-ad_input_code.f: links \$(AD_FILES) \$(HEADERFILES)
+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
@@ -1581,7 +1581,7 @@
 ftltaf: ftl_taf_output.f
 ftltamc: ftl_tamc_output.f
 
-ftl_input_code.f: links \$(AD_FILES) \$(HEADERFILES)
+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