From 96e2271cce1e9e7f6eaefd57c3ca206e324b4f73 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Wed, 13 Jul 2016 12:25:19 +0100
Subject: [PATCH] Factor commands into Makefile

---
 .travis.yml |  8 ++------
 Makefile    | 18 ++++++++++++++++++
 RELEASE.md  |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16ab04c72..2b593cd64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,8 @@ go:
   - tip
 
 install:
- - go get -t ./...
- - go get -u github.com/kisielk/errcheck
- - go get -u golang.org/x/tools/cmd/goimports
- - go get -u github.com/golang/lint/golint
+  - make build_dep
 
 script:
   - make check
-  - go test ./...
-  - go test -cpu=2 -race ./...
+  - make quicktest
diff --git a/Makefile b/Makefile
index c6ee06890..678ef851d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,34 @@ rclone:
 	@go version
 	go install -v ./...
 
+# Full suite of integration tests
 test:	rclone
 	go test ./...
 	cd fs && go run test_all.go
 
+# Quick test
+quicktest:
+	go test ./...
+	go test -cpu=2 -race ./...
+
+# Do source code quality checks
 check:	rclone
 	go vet ./...
 	errcheck ./...
 	goimports -d . | grep . ; test $$? -eq 1
 	golint ./... | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1
 
+# Get the build dependencies
+build_dep:
+	go get -t ./...
+	go get -u github.com/kisielk/errcheck
+	go get -u golang.org/x/tools/cmd/goimports
+	go get -u github.com/golang/lint/golint
+
+# Update dependencies
+update:
+	go get -t -u -f -v ./...
+
 doc:	rclone.1 MANUAL.html MANUAL.txt
 
 rclone.1:	MANUAL.md
diff --git a/RELEASE.md b/RELEASE.md
index ee7d1b0ed..1ff30d70f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -8,7 +8,7 @@ Required software for making a release
   * golint - go get github.com/golang/lint
 
 Making a release
-  * go get -t -u -f -v ./...
+  * make update
   * make check
   * make test
   * make tag