Merge branch 'master' of github.com:Determinant/salticidae-go

1 files changed, 7 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index a7a5d47..4e2b0cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
-.PHONY: all clean run_make
+.PHONY: all clean
 
 all: build/test_msgnet build/test_p2p_stress
 
-run_make:
-	make -C salticidae/
 
 salticidae/libsalticidae.so:
 	cd salticidae/; cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED=ON  -DSALTICIDAE_DEBUG_LOG=OFF -DSALTICIDAE_CBINDINGS=ON -DBUILD_TEST=OFF ./
-	make -C salticidae/
+	make -C salticidae/ -j4
 
 build:
 	mkdir -p build
 
-build/test_msgnet: salticidae/libsalticidae.so test_msgnet/main.go run_make
+build/test_msgnet: salticidae/libsalticidae.so test_msgnet/main.go
+	make -C salticidae/
 	go build -o $@ github.com/Determinant/salticidae-go/test_msgnet
-build/test_p2p_stress: salticidae/libsalticidae.so test_p2p_stress/main.go run_make
+build/test_p2p_stress: salticidae/libsalticidae.so test_p2p_stress/main.go
+	make -C salticidae/
 	go build -o $@ github.com/Determinant/salticidae-go/test_p2p_stress
 
 clean:
-	rm -r build/
+	rm -rf build/
 	cd salticidae/; make clean
 	rm salticidae/CMakeCache.txt