Fix travis.

Author: dterei

.travis.yml

@@ -6,6 +6,7 @@ go:
   - 1.2
   - 1.3
   - 1.4
+  - 1.5
   - tip
 
 matrix:
@@ -17,9 +18,10 @@ before_install:
 
 install:
   - travis_retry sudo apt-get install memcached
-  - git submodule init
-  - git submodule update
   - memcached -h | head -1
 
-script: make && make test-full
+script:
+  - make deps
+  - make
+  - make test-full
 

Makefile

@@ -11,12 +11,13 @@ build: *.go
 	@$(GO) build
 
 deps:
-	git submodule init
-	git submodule update
+	git submodule update --init --recursive
 
 # Yes, this is a hack, but Go's packing is also just stupid.
-work-tree: src
-	ln -s vendor src
+work-tree:
+	@if [ ! -e src ]; then \
+		ln -s vendor src; \
+	fi
 
 test: build work-tree
 	@memcached -p 11289 & echo $$! > test.pids