fix: some targets (#5)

Signed-off-by: tkrop <[email protected]>

Makefile

@@ -8,14 +8,14 @@ else
 endif
 
 GOBIN ?= $(shell go env GOPATH)/bin
-GOMAKE ?= github.com/tkrop/[email protected].12
+GOMAKE ?= github.com/tkrop/[email protected].13
 TARGETS := $(shell command -v go-make >/dev/null || \
 	go install $(GOMAKE) && go-make targets)
 
 # Declare all targets phony to make them available for auto-completion.
 .PHONY: $(TARGETS)
 
-# Delegate all targets to go-make in one call.
-# TODO: consider solution that does not delegate local goals.
+# Delegate all targets to go-make in a single call suppressing other targets.
+$(eval $(wordlist 1,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))::;@:)
 $(firstword $(MAKECMDGOALS) all)::
 	$(GOBIN)/go-make $(MAKEFLAGS) $(MAKECMDGOALS);

Makefile.base

@@ -374,13 +374,13 @@ push::
 	@git push --set-upstream origin \
 	  $$(git branch 2> /dev/null | sed -e '/^[^*]/d; s/* \(.*\)/\1/');
 #@ pushes the latest changes to the previous commit of the origin.
-fix::
+fix-commit::
 	@git commit --amend --no-edit && git push --force;
 #@ pushes the latest changes to the previous commit of the origin without verifying them.
 fix-no-verify::
 	@git commit --amend --no-edit --no-verify && git push --force;
-#@ pushes the latest changes to the previous commit of the origin updating the message.
-fix-update::
+#@ pushes the latest changes to the previous commit of the origin updating the commit message.
+fix-comment::
 	@git commit --amend && git push --force;
 
 #@ <version|major|minor|patch[+-]?> # update version and prepare release of the software.
@@ -942,8 +942,9 @@ lint-apis:: $(GOBIN)/zally
 	fi; \
 	ARGS=("--linter-service" "$${LINTER}"); \
 	if command -v ztoken > /dev/null; then ARGS+=("--token" "$$(ztoken)"); fi; \
-	if [ -n "$(RUNARGS)" ]; then FILES="$(RUNARGS)"; \
-	else FILES="$$(find zalando-apis -name "*.yaml" 2>/dev/null)"; fi; \
+	if [ -z "$(filter %.yaml,$(RUNARGS))" ]; then \
+	   FILES="$$(find zalando-apis -name "*.yaml" 2>/dev/null)"; \
+	else FILES="$(filter %.yaml,$(RUNARGS))"; fi; \
 	for APISPEC in $${FILES}; do \
 	  echo "check API: zally \"$${APISPEC}\""; \
 	  zally "$${ARGS[@]}" lint "$${APISPEC}" || exit 1; \

README.md

@@ -155,8 +155,8 @@ TARGETS := $(shell command -v go-make >/dev/null || \
 # Declare all targets phony to make them available for auto-completion.
 .PHONY: $(TARGETS)
 
-# Delegate all targets to go-make in one call.
-# TODO: consider solution that does not delegate local goals.
+# Delegate all targets to go-make in a single call suppressing other targets.
+$(eval $(wordlist 1,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))::;@:)
 $(firstword $(MAKECMDGOALS) all)::
    $(GOBIN)/go-make $(MAKEFLAGS) $(MAKECMDGOALS);
 ```

VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

internal/make/fixtures/targets-trace.out

@@ -23,9 +23,9 @@ clean-run
 clean-run-aws
 clean-run-db
 commit
-fix
+fix-comment
+fix-commit
 fix-no-verify
-fix-update
 go.sum
 help
 image

internal/make/fixtures/targets.out

@@ -15,9 +15,9 @@ clean-run
 clean-run-aws
 clean-run-db
 commit
-fix
+fix-comment
+fix-commit
 fix-no-verify
-fix-update
 go.sum
 help
 image