vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Makefile: split declarations to Makefile.inc

Browse source 
so that they can be reused by another Makefile

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-02-22 20:01:41 +01:00
parent 1c540236d1
commit 96a9afedf6
No known key found for this signature in database
GPG key ID: 263D6DF2E163E1EA
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,3 +1,5 @@
include Makefile.inc
GO ?= go GO ?= go
EPOCH_TEST_COMMIT ?= 1cc5a27 EPOCH_TEST_COMMIT ?= 1cc5a27
PROJECT := github.com/kubernetes-incubator/cri-o PROJECT := github.com/kubernetes-incubator/cri-o
@ -20,8 +22,6 @@ OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d
SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z) SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/kubernetes-incubator/cri-o/vendor) PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/kubernetes-incubator/cri-o/vendor)
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
BUILD_INFO := $(shell date +%s) BUILD_INFO := $(shell date +%s)
# If GOPATH not specified, use one in the local directory # If GOPATH not specified, use one in the local directory

2
Makefile.inc Normal file
View file

@ -0,0 +1,2 @@
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")