aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDeterminant <tederminant@gmail.com>2019-06-14 18:17:53 -0400
committerDeterminant <tederminant@gmail.com>2019-06-14 18:17:53 -0400
commit35d6ada17b298a9ce51c2e432596b91d7c6c4cc3 (patch)
treeab259080619dcdd654a3ef53325839fa48944f5b /Makefile
parentcb133a379998112600ea1504b556484a417cf48a (diff)
minor fix
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f82603c..a7a5d47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-.PHONY: all clean
+.PHONY: all clean run_make
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/
@@ -9,9 +12,9 @@ salticidae/libsalticidae.so:
build:
mkdir -p build
-build/test_msgnet: salticidae/libsalticidae.so test_msgnet/main.go
+build/test_msgnet: salticidae/libsalticidae.so test_msgnet/main.go run_make
go build -o $@ github.com/Determinant/salticidae-go/test_msgnet
-build/test_p2p_stress: salticidae/libsalticidae.so test_p2p_stress/main.go
+build/test_p2p_stress: salticidae/libsalticidae.so test_p2p_stress/main.go run_make
go build -o $@ github.com/Determinant/salticidae-go/test_p2p_stress
clean: