Autoconf: Minor fixes

* The siglongjmp() function name was incorrectly assigned to SETJMP when
  missing.  This patch corrects sets it to SIGLONGJMP.

* Restore MAKEDEP_DIRS (formerly SRC_DIRS) so that it can be used to
  detect file changes, as detected by rwildcard.

* Fix path of ac-clean targets

* Remove legacy bin/ and mkmf/ dirs from ac/deps/

* Remove top-level .gitignore (`build/` is not a defined output)

Author: marshallward

.gitignore

@@ -19,6 +19,7 @@ FCFLAGS = @FCFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 MAKEDEP_FLAGS = @MAKEDEP_FLAGS@
+MAKEDEP_DIRS = @MAKEDEP_DIRS@
 
 -include Makefile.dep
 
@@ -34,8 +35,8 @@ rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(su
 # Generate dependencies
 .PHONY: depend
 depend: Makefile.dep
-Makefile.dep: $(call rwildcard,$(SRC_DIRS),*.h *.c *.inc *.F90)
-	$(PYTHON) $(MAKEDEP) $(DEFS) -o Makefile.dep $(MAKEDEP_FLAGS)
+Makefile.dep: $(call rwildcard,$(MAKEDEP_DIRS),*.h *.c *.inc *.F90)
+	$(PYTHON) $(MAKEDEP) $(DEFS) -o Makefile.dep $(MAKEDEP_FLAGS) $(MAKEDEP_DIRS)
 
 
 # Delete any files associated with configuration (including the Makefile).
@@ -57,5 +58,5 @@ distclean: clean
 ac-clean: distclean
 	rm -f @srcdir@/ac/aclocal.m4
 	rm -rf @srcdir@/ac/autom4te.cache
-	rm -f @srcdir@/ac/configure
-	rm -f @srcdir@/ac/configure~
+	rm -f @srcdir@/configure
+	rm -f @srcdir@/configure~

ac/Makefile.in

@@ -315,16 +315,18 @@ AS_IF([test "$with_cvmix" = yes], [
     -s ${srcdir}/src/parameterizations/CVmix"
 ])
 
-SRC_DIRS="\\
+MAKEDEP_FLAGS="${MAKEDEP_FLAGS}"
+
+MAKEDEP_FLAGS="${MAKEDEP_FLAGS# }"
+AC_SUBST([MAKEDEP_FLAGS])
+
+MAKEDEP_DIRS="\\
   ${srcdir}/src \\
   ${MODEL_FRAMEWORK} \\
   ${srcdir}/config_src/external \\
   ${DRIVER_DIR} \\
   ${MOM_MEMORY_DIR}"
-MAKEDEP_FLAGS="${MAKEDEP_FLAGS} ${SRC_DIRS}"
-
-MAKEDEP_FLAGS="${MAKEDEP_FLAGS# }"
-AC_SUBST([MAKEDEP_FLAGS])
+AC_SUBST([MAKEDEP_DIRS])
 
 # Add makedep to config.status
 AC_CONFIG_COMMANDS(Makefile.dep, [make depend])
@@ -367,7 +369,7 @@ AC_DEFINE_UNQUOTED([SIGSETJMP_NAME], ["${SIGSETJMP}"])
 
 # Validate the siglongjmp symbol
 AX_FC_CHECK_BIND_C([siglongjmp],
-  [SIGLONGJMP="siglongjmp"], [SETJMP="siglongjmp_missing"]
+  [SIGLONGJMP="siglongjmp"], [SIGLONGJMP="siglongjmp_missing"]
 )
 AC_DEFINE_UNQUOTED([SIGLONGJMP_NAME], ["${SIGLONGJMP}"])
 

ac/configure.ac

@@ -1,7 +1,5 @@
-/bin/
 /fms/
 /gsw/
 /cvmix/
 /include/
 /lib/
-/mkmf/

ac/deps/.gitignore

@@ -599,6 +599,7 @@ ac_ct_CC
 CPPFLAGS
 CFLAGS
 CC
+MAKEDEP_DIRS
 MAKEDEP_FLAGS
 MAKEDEP
 PYTHON
@@ -5297,15 +5298,17 @@ then :
 
 fi
 
-SRC_DIRS="\\
+MAKEDEP_FLAGS="${MAKEDEP_FLAGS}"
+
+MAKEDEP_FLAGS="${MAKEDEP_FLAGS# }"
+
+
+MAKEDEP_DIRS="\\
   ${srcdir}/src \\
   ${MODEL_FRAMEWORK} \\
   ${srcdir}/config_src/external \\
   ${DRIVER_DIR} \\
   ${MOM_MEMORY_DIR}"
-MAKEDEP_FLAGS="${MAKEDEP_FLAGS} ${SRC_DIRS}"
-
-MAKEDEP_FLAGS="${MAKEDEP_FLAGS# }"
 
 
 # Add makedep to config.status
@@ -5555,7 +5558,7 @@ printf '%s\n' "$ax_fc_cv_bind_c_siglongjmp" >&6; }
 then :
   SIGLONGJMP="siglongjmp"
 else case e in #(
-  e) SETJMP="siglongjmp_missing"
+  e) SIGLONGJMP="siglongjmp_missing"
  ;;
 esac
 fi