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

Merge pull request #35 from mrunalp/makefile_fixes

Browse source 
Fixes to the Makefile
This commit is contained in:
Antonio Murdaca 2016-09-19 20:45:03 +02:00 committed by GitHub
commit 26262dff00
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -5,7 +5,7 @@ default: help
help: help:
@echo "Usage: make <target>" @echo "Usage: make <target>"
@echo @echo
@echo " * 'binaries' - Build ocid, conmon andocic" @echo " * 'binaries' - Build ocid, conmon and ocic"
@echo " * 'clean' - Clean artifacts" @echo " * 'clean' - Clean artifacts"
@echo " * 'lint' - Execute the source code linter" @echo " * 'lint' - Execute the source code linter"
@echo " * 'update-deps' - Update vendored dependencies" @echo " * 'update-deps' - Update vendored dependencies"
@ -37,7 +37,6 @@ update-deps:
binaries: ocid ocic conmon binaries: ocid ocic conmon
.PHONY: .gitvalidation .PHONY: .gitvalidation
#
# When this is running in travis, it will only check the travis commit range # When this is running in travis, it will only check the travis commit range
.gitvalidation: .gitvalidation:
@which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false) @which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false)
@ -62,7 +61,7 @@ install.tools: .install.gitvalidation .install.glide .install.glide-vc .install.
.install.gometalinter: .install.gometalinter:
go get github.com/alecthomas/gometalinter go get github.com/alecthomas/gometalinter
gometalinter --install --update gometalinter --install
.PHONY: \ .PHONY: \
binaries \ binaries \