Fix rpc server error (#195)

[bytom/bytom.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a9fbf5..fbdd8df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,19 @@
-GOTOOLS  = github.com/mitchellh/gox \
-                  github.com/Masterminds/glide
-PACKAGES = $(shell go list ./... | grep -v '/vendor/' | grep -v '/rpc/')
+PACKAGES = $(shell go list ./... | grep -v '/vendor/')
 
-all: install test
+all: bytomd bytomcli test
 
-install: get_vendor_deps copy
-       @go install --ldflags '-extldflags "-static"' \
-               --ldflags "-X github.com/Bytom/blockchain/version.GitCommit=`git rev-parse HEAD`" ./node/
-       @echo "====> Done!"
+bytomd:
+       @echo "Building bytomd to cmd/bytomd/bytomd"
+       @go build -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`" \
+    -o cmd/bytomd/bytomd cmd/bytomd/main.go
 
-get_vendor_deps: ensure_tools
-       @rm -rf vendor/
-       @echo "====> Running glide install"
-       @glide install
-
-ensure_tools:
-       go get $(GOTOOLS)
-
-# In case of the terrible network condition
-copy:
-       @cp -r vendor/github.com/golang/crypto vendor/golang.org/x/crypto
-       @cp -r vendor/github.com/golang/net    vendor/golang.org/x/net
-       @cp -r vendor/github.com/golang/text   vendor/golang.org/x/text
-       @cp -r vendor/github.com/golang/tools  vendor/golang.org/x/tools
-       @cp -r vendor/github.com/golang/time   vendor/golang.org/x/time
+bytomcli:
+       @echo "Building bytomcli to cmd/bytomcli/bytomcli"
+       @go build -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`" \
+    -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
 
 test:
-       @echo "=====> Running go test"
+       @echo "====> Running go test"
        @go test $(PACKAGES)
 
-.PHONY: install get_vendor_deps ensure_tools copy test
+.PHONY: test