Skip to content

Commit e80cb8c

Browse files
committed
Prefix Makefile variables with GRV_ to avoid name clash
1 parent b5b8c96 commit e80cb8c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Makefile

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
VERSION=$(shell git describe --long --tags --dirty --always 2>/dev/null || echo 'Unknown')
2-
HEAD_OID=$(shell git rev-parse --short HEAD 2>/dev/null || echo 'Unknown')
3-
BUILD_DATETIME=$(shell date '+%Y-%m-%d %H:%M:%S %Z')
1+
GRV_VERSION=$(shell git describe --long --tags --dirty --always 2>/dev/null || echo 'Unknown')
2+
GRV_HEAD_OID=$(shell git rev-parse --short HEAD 2>/dev/null || echo 'Unknown')
3+
GRV_BUILD_DATETIME=$(shell date '+%Y-%m-%d %H:%M:%S %Z')
44

55
GOCMD=go
66
GOLINT=golint
77

88
BINARY?=grv
9-
SOURCE_DIR=./cmd/grv
10-
LDFLAGS=-X 'main.version=$(VERSION)' -X 'main.headOid=$(HEAD_OID)' -X 'main.buildDateTime=$(BUILD_DATETIME)'
11-
STATIC_LDFLAGS=-extldflags '-lncurses -ltinfo -lgpm -static'
12-
BUILD_FLAGS=--tags static -ldflags "$(LDFLAGS)"
13-
STATIC_BUILD_FLAGS=--tags static -ldflags "$(LDFLAGS) $(STATIC_LDFLAGS)"
9+
GRV_SOURCE_DIR=./cmd/grv
10+
GRV_LDFLAGS=-X 'main.version=$(GRV_VERSION)' -X 'main.headOid=$(GRV_HEAD_OID)' -X 'main.buildDateTime=$(GRV_BUILD_DATETIME)'
11+
GRV_STATIC_LDFLAGS=-extldflags '-lncurses -ltinfo -lgpm -static'
12+
GRV_BUILD_FLAGS=--tags static -ldflags "$(GRV_LDFLAGS)"
13+
GRV_STATIC_BUILD_FLAGS=--tags static -ldflags "$(GRV_LDFLAGS) $(GRV_STATIC_LDFLAGS)"
1414

1515
GRV_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
1616
GOPATH_DIR:=$(shell go env GOPATH)
1717
GOBIN_DIR:=$(GOPATH_DIR)/bin
18-
GIT2GO_DIR:=$(SOURCE_DIR)/vendor/gopkg.in/libgit2/git2go.v25
18+
GIT2GO_DIR:=$(GRV_SOURCE_DIR)/vendor/gopkg.in/libgit2/git2go.v25
1919
GIT2GO_PATCH=git2go.v25.patch
2020

2121
all: $(BINARY)
2222

2323
$(BINARY): build-libgit2
24-
$(GOCMD) build $(BUILD_FLAGS) -o $(BINARY) $(SOURCE_DIR)
24+
$(GOCMD) build $(GRV_BUILD_FLAGS) -o $(BINARY) $(GRV_SOURCE_DIR)
2525

2626
.PHONY: install
2727
install: $(BINARY)
@@ -49,13 +49,13 @@ build-libgit2: update
4949
# Requires dependencies static library versions to be present alongside dynamic ones
5050
.PHONY: static
5151
static: build-libgit2
52-
$(GOCMD) build $(STATIC_BUILD_FLAGS) -o $(BINARY) $(SOURCE_DIR)
52+
$(GOCMD) build $(GRV_STATIC_BUILD_FLAGS) -o $(BINARY) $(GRV_SOURCE_DIR)
5353

5454
.PHONY: test
5555
test: $(BINARY) update-test
56-
$(GOCMD) test $(BUILD_FLAGS) $(SOURCE_DIR)
57-
$(GOCMD) vet $(SOURCE_DIR)
58-
$(GOLINT) -set_exit_status $(SOURCE_DIR)
56+
$(GOCMD) test $(GRV_BUILD_FLAGS) $(GRV_SOURCE_DIR)
57+
$(GOCMD) vet $(GRV_SOURCE_DIR)
58+
$(GOLINT) -set_exit_status $(GRV_SOURCE_DIR)
5959

6060
.PHONY: clean
6161
clean:

0 commit comments

Comments
 (0)