X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=52576170a5b4dbbb47b678dee3b15e2e3390e972;hb=42d11af03300fe0a3476c32ad8c70297862d9320;hp=bd11c2637f34c9357fa731dced273a1fb5ac6a78;hpb=d1f24d37bd447b64e402298bb8eb2479681facf9;p=govpp.git diff --git a/Makefile b/Makefile index bd11c26..5257617 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /usr/bin/env bash -o pipefail VERSION ?= $(shell git describe --always --tags --dirty) COMMIT ?= $(shell git rev-parse HEAD) -BUILD_STAMP ?= $(shell git log -1 --format="%ct") +BUILD_STAMP ?= $(shell git log -1 --format='%ct') BUILD_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) BUILD_HOST ?= $(shell hostname) @@ -10,7 +10,7 @@ BUILD_USER ?= $(shell id -un) GO ?= go -GOVPP_PKG := $(shell go list) +GOVPP_PKG := git.fd.io/govpp.git LDFLAGS = \ -X ${GOVPP_PKG}/version.version=$(VERSION) \ -X ${GOVPP_PKG}/version.commitHash=$(COMMIT) \ @@ -94,7 +94,8 @@ gen-binapi-docker: install-generator ## Generate binapi code (using Docker) docker run -t --rm \ -e DEBUG_GOVPP \ -v "$(shell which binapi-generator):/usr/local/bin/binapi-generator:ro" \ - -v "$(shell pwd):/govpp" -w /govpp \ + -v "$(shell pwd):/govpp" \ + -w /govpp \ -u "$(shell id -u):$(shell id -g)" \ "${VPP_IMG}" \ sh -ec "cd $(BINAPI_DIR) && $(cmds)" @@ -104,9 +105,9 @@ extras: help: @echo "List of make targets:" - grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' -.DEFAULT = help +.DEFAULT_GOAL = help .PHONY: help \ build cmd examples clean \