]> git.lizzy.rs Git - micro.git/commitdiff
Make 'make' do the same as 'make build' (#2217)
authorDmitry Maluka <dmitrymaluka@gmail.com>
Fri, 24 Sep 2021 21:40:26 +0000 (23:40 +0200)
committerGitHub <noreply@github.com>
Fri, 24 Sep 2021 21:40:26 +0000 (14:40 -0700)
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

index 927eed7a74340beec28f851242fb0804273f3ea8..e19e142b8a157c9aa7b5f41683e1b0b56685a884 100644 (file)
--- 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 && \