Merge pull request #1180 from Bytom/dev

[bytom/bytom.git] / Makefile

diff --git a/Makefile b/Makefile
index 4932bbd..b122354 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ $(error "$$GOOS is not defined. If you are using Windows, try to re-make using '
 endif
 endif
 
-PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd')
+PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
+PACKAGES += 'github.com/bytom/mining/tensority/go_algorithm'
+
 BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
@@ -41,6 +43,11 @@ bytomd:
        @echo "Building bytomd to cmd/bytomd/bytomd"
        @go build $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
 
+bytomd-simd:
+       @echo "Building SIMD version bytomd to cmd/bytomd/bytomd"
+       @cd mining/tensority/cgo_algorithm/lib/ && make
+       @go build -tags="simd" $(BUILD_FLAGS) -o cmd/bytomd/bytomd cmd/bytomd/main.go
+
 bytomcli:
        @echo "Building bytomcli to cmd/bytomcli/bytomcli"
        @go build $(BUILD_FLAGS) -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
@@ -109,11 +116,11 @@ test:
        @go test -tags "network" $(PACKAGES)
 
 benchmark:
-       go test -bench $(PACKAGES)
+       @go test -bench $(PACKAGES)
 
 functional-tests:
-       @go test -v -timeout=5m -tags=functional ./test
+       @go test -v -timeout=5m -tags="functional" ./test 
 
-ci: test
+ci: test functional-tests
 
-.PHONY: all target release-all clean test benchmark
+.PHONY: all target release-all clean test benchmark
\ No newline at end of file