aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoseph Richey <joerichey@google.com>2017-10-03 15:33:23 -0700
committerGitHub <noreply@github.com>2017-10-03 15:33:23 -0700
commit18e2de753e2bcad172f066dc6ec78899940930ca (patch)
tree8008a68049eabac5982d881b6c1b41f5ad036459 /Makefile
parenta53b68fb7bf3b0cf6bbdd837d293b7a285bbb904 (diff)
parent02714459eb590d4efe6e89180dbbb9dd42b6d850 (diff)
Merge pull request #69 from google/makefilev0.2.20.2.2
Makefile cleanup
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 6ff5e71..a28522e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ MOUNT ?= /mnt/$(NAME)_mount
ifneq ("$(wildcard $(MOUNT))","")
export TEST_FILESYSTEM_ROOT = $(MOUNT)
endif
+
# The flags code below lets the caller of the makefile change the build flags
# for fscrypt in a familiar manner.
# CFLAGS
@@ -121,16 +122,16 @@ gen:
# Update the vendored dependencies.
.PHONY: update
update:
- @govendor init
- @govendor fetch +missing
- @govendor add +external
- @govendor remove +unused
+ govendor init
+ govendor fetch +missing
+ govendor add +external
+ govendor remove +unused
# Format all the Go and C code
.PHONY: format format-check
format:
- @goimports -l -w $(GO_FILES)
- @clang-format -i -style=Google $(C_FILES)
+ goimports -l -w $(GO_FILES)
+ clang-format -i -style=Google $(C_FILES)
format-check:
@goimports -d $(GO_FILES) \
@@ -191,7 +192,7 @@ test-teardown:
travis-install: go-tools test-setup
go get -u github.com/mattn/goveralls
-travis-script: lint format-check default
+travis-script: lint format-check test default
goveralls -service=travis-ci
@govendor list +missing +external +unused \
| ./input_fail.py "Incorrect vendored dependencies. Run \"make update\"."