Merge pull request ethereum#103 from ngtuna/makefile

clean up Makefile

.travis.yml

@@ -41,8 +41,7 @@ jobs:
 
   - stage: Github release
     script:
-      - make tomo
-      - mv build/bin/tomo build/bin/tomo-linux-amd64
+      - make tomo-linux-amd64
     deploy:
       provider: releases
       api_key: $GITHUB_TOKEN

Makefile

@@ -1,12 +1,6 @@
-# This Makefile is meant to be used by people that do not usually work
-# with Go source code. If you know what GOPATH is then you probably
-# don't need to bother with make.
-
-.PHONY: tomo android ios tomo-cross swarm evm all test clean
+.PHONY: tomo tomo-cross evm all test clean
 .PHONY: tomo-linux tomo-linux-386 tomo-linux-amd64 tomo-linux-mips64 tomo-linux-mips64le
-.PHONY: tomo-linux-arm tomo-linux-arm-5 tomo-linux-arm-6 tomo-linux-arm-7 tomo-linux-arm64
 .PHONY: tomo-darwin tomo-darwin-386 tomo-darwin-amd64
-.PHONY: tomo-windows tomo-windows-386 tomo-windows-amd64
 
 GOBIN = $(shell pwd)/build/bin
 GOFMT = gofmt
@@ -26,50 +20,27 @@ bootnode:
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/bootnode\" to launch a bootnode."
 
-swarm:
-	build/env.sh go run build/ci.go install ./cmd/swarm
+puppeth:
+	build/env.sh go run build/ci.go install ./cmd/puppeth
 	@echo "Done building."
-	@echo "Run \"$(GOBIN)/swarm\" to launch swarm."
+	@echo "Run \"$(GOBIN)/puppeth\" to launch puppeth."
 
 all:
 	build/env.sh go run build/ci.go install
 
-android:
-	build/env.sh go run build/ci.go aar --local
-	@echo "Done building."
-	@echo "Import \"$(GOBIN)/tomo.aar\" to use the library."
-
-ios:
-	build/env.sh go run build/ci.go xcode --local
-	@echo "Done building."
-	@echo "Import \"$(GOBIN)/tomo.framework\" to use the library."
-
 test: all
 	build/env.sh go run build/ci.go test
 
 clean:
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 
-# The devtools target installs tools required for 'go generate'.
-# You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'.
-
-devtools:
-	env GOBIN= go get -u golang.org/x/tools/cmd/stringer
-	env GOBIN= go get -u github.com/kevinburke/go-bindata/go-bindata
-	env GOBIN= go get -u github.com/fjl/gencodec
-	env GOBIN= go get -u github.com/golang/protobuf/protoc-gen-go
-	env GOBIN= go install ./cmd/abigen
-	@type "npm" 2> /dev/null || echo 'Please install node.js and npm'
-	@type "solc" 2> /dev/null || echo 'Please install solc'
-	@type "protoc" 2> /dev/null || echo 'Please install protoc'
-
 # Cross Compilation Targets (xgo)
 
-tomo-cross: tomo-linux tomo-darwin tomo-windows tomo-android tomo-ios
+tomo-cross: tomo-linux tomo-darwin
 	@echo "Full cross compilation done:"
 	@ls -ld $(GOBIN)/tomo-*
 
-tomo-linux: tomo-linux-386 tomo-linux-amd64 tomo-linux-arm tomo-linux-mips64 tomo-linux-mips64le
+tomo-linux: tomo-linux-386 tomo-linux-amd64 tomo-linux-mips64 tomo-linux-mips64le
 	@echo "Linux cross compilation done:"
 	@ls -ld $(GOBIN)/tomo-linux-*
 
@@ -83,30 +54,6 @@ tomo-linux-amd64:
 	@echo "Linux amd64 cross compilation done:"
 	@ls -ld $(GOBIN)/tomo-linux-* | grep amd64
 
-tomo-linux-arm: tomo-linux-arm-5 tomo-linux-arm-6 tomo-linux-arm-7 tomo-linux-arm64
-	@echo "Linux ARM cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-linux-* | grep arm
-
-tomo-linux-arm-5:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-5 -v ./cmd/tomo
-	@echo "Linux ARMv5 cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-linux-* | grep arm-5
-
-tomo-linux-arm-6:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-6 -v ./cmd/tomo
-	@echo "Linux ARMv6 cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-linux-* | grep arm-6
-
-tomo-linux-arm-7:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm-7 -v ./cmd/tomo
-	@echo "Linux ARMv7 cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-linux-* | grep arm-7
-
-tomo-linux-arm64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/arm64 -v ./cmd/tomo
-	@echo "Linux ARM64 cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-linux-* | grep arm64
-
 tomo-linux-mips:
 	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=linux/mips --ldflags '-extldflags "-static"' -v ./cmd/tomo
 	@echo "Linux MIPS cross compilation done:"
@@ -141,20 +88,6 @@ tomo-darwin-amd64:
 	@echo "Darwin amd64 cross compilation done:"
 	@ls -ld $(GOBIN)/tomo-darwin-* | grep amd64
 
-tomo-windows: tomo-windows-386 tomo-windows-amd64
-	@echo "Windows cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-windows-*
-
-tomo-windows-386:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/386 -v ./cmd/tomo
-	@echo "Windows 386 cross compilation done:"
-	@ls -ld $(GOBIN)/tomo-windows-* | grep 386
-
-tomo-windows-amd64:
-	build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/tomo
-	@echo "Windows amd64 cross compilation done:"
-	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
-
 gofmt:
 	$(GOFMT) -s -w $(GO_FILES)
 	$(GIT) checkout vendor