Browse Source

fix makefile to allow parallel builds

Alan Shreve 11 years ago
parent
commit
6d6ab48068
1 changed files with 5 additions and 6 deletions
  1. 5 6
      Makefile

+ 5 - 6
Makefile

@@ -18,17 +18,16 @@ client: deps
 
 
 assets: client-assets server-assets
 assets: client-assets server-assets
 
 
-client-assets:
-	go get github.com/jteeuwen/go-bindata
-	GOOS="" GOARCH="" go install github.com/jteeuwen/go-bindata/go-bindata
+bin/go-bindata:
+	GOOS="" GOARCH="" go get github.com/jteeuwen/go-bindata/go-bindata
+
+client-assets: bin/go-bindata
 	bin/go-bindata -nomemcopy -pkg=assets -tags=$(BUILDTAGS) \
 	bin/go-bindata -nomemcopy -pkg=assets -tags=$(BUILDTAGS) \
 		-debug=$(if $(findstring debug,$(BUILDTAGS)),true,false) \
 		-debug=$(if $(findstring debug,$(BUILDTAGS)),true,false) \
 		-o=src/ngrok/client/assets/assets_$(BUILDTAGS).go \
 		-o=src/ngrok/client/assets/assets_$(BUILDTAGS).go \
 		assets/client/...
 		assets/client/...
 
 
-server-assets:
-	go get github.com/jteeuwen/go-bindata
-	GOOS="" GOARCH="" go install github.com/jteeuwen/go-bindata/go-bindata
+server-assets: bin/go-bindata
 	bin/go-bindata -nomemcopy -pkg=assets -tags=$(BUILDTAGS) \
 	bin/go-bindata -nomemcopy -pkg=assets -tags=$(BUILDTAGS) \
 		-debug=$(if $(findstring debug,$(BUILDTAGS)),true,false) \
 		-debug=$(if $(findstring debug,$(BUILDTAGS)),true,false) \
 		-o=src/ngrok/server/assets/assets_$(BUILDTAGS).go \
 		-o=src/ngrok/server/assets/assets_$(BUILDTAGS).go \