make: remake TG-BUILD-SETTINGS and TG-TEST-SETTINGS on config mods

If config.sh and/or config.mak are changed be sure to rebuild
TG-BUILD-SETTINGS and TG-TEST-SETTINGS (of course only changing the
mod date on them if anything actually ended up changing).

And make `make settings` work at the top-level too.

Signed-off-by: Kyle J. McKay <[email protected]>

Author: mackyle

Makefile

@@ -13,7 +13,7 @@
 # Anything explicitly listed here will always avoid a bogus "up to date" result
 TARGETS = \
 	all clean tg awk hooks helpers doc html \
-	precheck TG-BUILD-SETTINGS \
+	precheck TG-BUILD-SETTINGS settings \
 	install	install-doc install-html \
 	tg--awksome tg-tg.txt topgit.html \
 	shell_compatibility_test \

Makefile.mak

@@ -16,6 +16,9 @@ all: \
 	tg $(commands_out) $(utils_out) $(awk_out) $(hooks_out) $(helpers_out) \
 	bin-wrappers/tg bin-wrappers/pre-commit $(help_out) tg-tg.txt
 
+settings: TG-BUILD-SETTINGS FORCE
+	+$(Q)cd t && $(MAKE) settings
+
 awk: $(awk_out)
 hooks: $(hooks_out)
 helpers: $(helpers_out)
@@ -185,11 +188,11 @@ bs() { printf "%s\\n" \
 # make -f Makefile.mak TG-BUILD-SETTINGS thus avoiding this always
 # causing the targets that depend on it to build while still forcing
 # a rebuild if any settings actually change.
-TG-BUILD-SETTINGS: $(FORCE_SETTINGS_BUILD)
+TG-BUILD-SETTINGS: $(CONFIGDEPS) $(FORCE_SETTINGS_BUILD)
 	$(Q)$(BUILD_SETTINGS);if test x"$$(bs)" != x"`cat \"$@\" 2>/dev/null`"; then \
 		echo "* new build settings"; \
 		bs >"$@"; \
-	fi
+	elif test z"$(FORCE_SETTINGS_BUILD)" = z; then touch "$@"; fi
 
 test: all FORCE
 	+$(Q)cd t && $(MAKE) all

gnomake.sh

@@ -20,13 +20,24 @@ set -e
 # If MKTOP is set, they are looked for there instead of in
 # the current directory.
 #
+# The CONFIGDEPS variable will be set to the ones that exist
+# (for use in dependency lines).
+#
 # wrap it up for safety
 configsh() {
-	! [ -f "${MKTOP:+$MKTOP/}config.sh" ] ||
-	. ./"${MKTOP:+$MKTOP/}config.sh"
+	[ z"$MKTOP" = z"/" ] || MKTOP="${MKTOP%/}"
+	CONFIGDEPS=
+	! [ -f "${MKTOP:+$MKTOP/}config.sh" ] || {
+		. ./"${MKTOP:+$MKTOP/}config.sh"
+		CONFIGDEPS="${CONFIGDEPS:+$CONFIGDEPS }${MKTOP:+$MKTOP/}config.sh"
+	}
 	# now set CONFIGMAK and make it an absolute path
 	[ -n "$CONFIGMAK" ] || CONFIGMAK="${MKTOP:+$MKTOP/}config.mak"
-	[ -f "$CONFIGMAK" ] || CONFIGMAK="${MKTOP:+$MKTOP/}Makefile.mt"
+	if [ -f "$CONFIGMAK" ]; then
+		CONFIGDEPS="${CONFIGDEPS:+$CONFIGDEPS }$CONFIGMAK"
+	else
+		CONFIGMAK="${MKTOP:+$MKTOP/}Makefile.mt"
+	fi
 	case "$CONFIGMAK" in */?*);;*) CONFIGMAK="./$CONFIGMAK"; esac
 	CONFIGMAK="$(cd "${CONFIGMAK%/*}" && pwd)/${CONFIGMAK##*/}"
 }

t/Makefile.mak

@@ -110,6 +110,7 @@ TEST_TARGET = $(TEST_TARGET_$(DEFAULT_TEST_TARGET_))
 all: $(TEST_TARGET)
 
 settings: TG-TEST-SETTINGS
+	-@true # avoids the "Nothing to be done" message
 
 test: pre-clean TG-TEST-SETTINGS $(TEST_LINT) FORCE
 	$(Q)set -m && $(CACHE_SETUP_TTY) $(MAKE) $${GNO_PD_OPT} -f Makefile.mak aggregate-results-and-cleanup
@@ -197,11 +198,11 @@ ts() { printf "%s\\n" \
 	': "$${GIT_MINIMUM_VERSION:=$$TG_GIT_MINIMUM_VERSION}"' \
 ;}
 
-TG-TEST-SETTINGS: $(FORCE_SETTINGS_BUILD)
+TG-TEST-SETTINGS: $(CONFIGDEPS) $(FORCE_SETTINGS_BUILD)
 	$(Q)$(TEST_SETTINGS);if test x"$$(ts)" != x"`cat \"$@\" 2>/dev/null`"; then \
 		echo "* new test settings"; \
 		ts >"$@"; \
-	fi
+	elif test z"$(FORCE_SETTINGS_BUILD)" = z; then touch "$@"; fi
 
 FORCE: __file_which_should_not_exist