Finalize the GNUmakefile setup

Author: ingydotnet

GNUmakefile

@@ -1,17 +1,46 @@
-M := .cache/.makes
-$(shell [ -d $M ] || git clone -q https://github.com/makeplus/makes $M)
-include $M/init.mk
-include $M/go.mk
-include $M/ys.mk
+# Auto-install https://github.com/makeplus/makes at specific commit:
+MAKES := .cache/makes
+MAKES-LOCAL := .cache/local
+MAKES-COMMIT ?= 74a4d03223cdaf39140613d48d3f1d8c0a0840e5
+$(shell [ -d $(MAKES) ] || ( \
+  git clone -q https://github.com/makeplus/makes $(MAKES) && \
+  git -C $(MAKES) reset -q --hard $(MAKES-COMMIT)))
+ifneq ($(shell git -C $(MAKES) rev-parse HEAD), \
+       $(shell git -C $(MAKES) rev-parse $(MAKES-COMMIT)))
+$(error $(MAKES) is not at the correct commit: $(MAKES-COMMIT))
+endif
+include $(MAKES)/init.mk
 
-# Print Makefile targets summary
-default::
+# Only auto-install go if no go exists or GO-VERSION specified:
+ifeq (,$(shell which go))
+GO-VERSION ?= 1.24.0
+endif
+GO-VERSION-NEEDED := $(GO-VERSION)
 
-$(GO-CMDS):: $(GO)
-	go $@ $A
+# Setup and include go.mk and shell.mk:
+GO-CMDS-SKIP := test
+ifndef GO-VERSION-NEEDED
+GO-NO-DEP-GO := true
+endif
+include $(MAKES)/go.mk
+ifdef GO-VERSION-NEEDED
+TEST-DEPS += $(GO)
+else
+SHELL-DEPS := $(filter-out $(GO),$(SHELL-DEPS))
+endif
+SHELL-NAME := makes go-yaml
+include $(MAKES)/shell.mk
 
-ys-test: $(YS)
-	prove -v test/
+v ?=
 
-distclean:
-	$(RM) -r .cache
+
+# Test rules:
+test: $(TEST-DEPS)
+	go test$(if $v, -v)
+
+
+# Clean rules:
+realclean:
+
+distclean: realclean
+	$(RM) -r $(ROOT)/.cache

README.md

@@ -168,7 +168,7 @@ b:
 ## Testing with `make`
 
 Running `make test` in this directory should just work.
-You don't need to have `go` installed and even if you do the Makefile will
+You don't need to have `go` installed and even if you do the `GNUmakefile` will
 ignore it and setup / cache its own version under `.cache/`.
 
 The only things you need are:
@@ -182,7 +182,9 @@ Some `make` commands are:
 
 * `make test`
 * `make test GO-VERSION=1.2.34`
-* `make distclean` - Remove `.cache/`
+* `make shell` Start a shell with the local `go` environment
+* `make shell GO-VERSION=1.2.34`
+* `make distclean` - Removes `.cache/`
 
 
 ## License