From a21a720941250ddc4e1e8cf917f6fde4b3a4324e Mon Sep 17 00:00:00 2001 From: Dmitry Maluka Date: Fri, 24 Sep 2021 23:40:26 +0200 Subject: [PATCH] Make 'make' do the same as 'make build' (#2217) Fix a slight regression after ec3292: when 'make' is run without specifying a target, it counter-intuitively runs fetch-tags instead of building micro. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 927eed7a..e19e142b 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,6 @@ GOVARS = -X github.com/zyedidia/micro/v2/internal/util.Version=$(VERSION) -X git DEBUGVAR = -X github.com/zyedidia/micro/v2/internal/util.Debug=ON VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a45f4242ebddb7aa9a229f85555e8a3bd987e2/src/vs/editor/test/common/model/' -fetch-tags: - git fetch --tags - -generate: - go generate ./runtime - build: go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro @@ -35,6 +29,12 @@ install: install-all: generate install +fetch-tags: + git fetch --tags + +generate: + go generate ./runtime + testgen: mkdir -p tools/vscode-tests cd tools/vscode-tests && \ -- 2.44.0