update makefile to actual state

Makefile

 all: build
 
-OS := $(shell uname -s)
-ifeq ($(OS), Linux)
-	SRC_LIB = libsbroad.so
-else
-	ifeq ($(OS), Darwin)
-		SRC_LIB = libsbroad.dylib
-	endif
-endif
 IMAGE_NAME = docker-public.binary.picodata.io/sbroad-builder:0.6.0
 
 bench:
@@ -26,22 +18,13 @@ build_debug:
 	make clean
 	cargo build
 
-build_integration:
-	cd test_app && cartridge build
-
 clean:
 	rm -rf target/release/build/sbroad-* 
 	rm -rf target/release/deps/sbroad-* 
 	rm -rf target/release/incremental/sbroad-* 
 	rm -rf target/debug/build/sbroad-* 
 	rm -rf target/debug/deps/sbroad-* 
-	rm -rf target/debug/incremental/sbroad-* 
-
-install_release:
-	mkdir -p $(LUADIR)/$(PROJECT_NAME)
-	cp -Rf target/release/$(SRC_LIB) $(LIBDIR)
-	cp -Rf src/*.lua $(LUADIR)/$(PROJECT_NAME)
-	cp -Rf cartridge $(LUADIR)
+	rm -rf target/debug/incremental/sbroad-*
 
 lint:
 	cargo fmt --all -- --check
@@ -50,16 +33,11 @@ lint:
 	./deps.sh
 	./.rocks/bin/luacheck .
 
-run_integration:
-	cd test_app && rm -rf tmp/tarantool.log && TARANTOOL_LOG_LEVEL=7 TARANTOOL_LOG=tmp/tarantool.log ./.rocks/bin/luatest --coverage -v test/
-
 test:
-	make clean
 	cargo test --features mock -vv
 
 test_integration:
-	make build_integration
-	make run_integration
+	cd sbroad-cartridge && $(MAKE) test_integration
 
 test_all: test bench_check test_integration
 

sbroad-cartridge/Cargo.toml

@@ -20,5 +20,9 @@ yaml-rust = "0.4"
 pretty_assertions = "1.3"
 rmp-serde = "0.14"
 
+[lib]
+name = "sbroad_cartridge"
+crate-type = ["cdylib", "rlib"]
+
 [features]
 mock = ["sbroad-core/mock"]

sbroad-cartridge/Makefile

+OS := $(shell uname -s)
+ifeq ($(OS), Linux)
+	SRC_LIB = libsbroad_cartridge.so
+	DEST_LIB = libsbroad.so
+else
+	ifeq ($(OS), Darwin)
+		SRC_LIB = libsbroad_cartridge.dylib
+		DEST_LIB = libsbroad.dylib
+	endif
+endif
+
+build:
+	cargo build --release
+
+build_integration:
+	cd test_app && cartridge build
+
+run_integration:
+	cd test_app && rm -rf tmp/tarantool.log && TARANTOOL_LOG_LEVEL=7 TARANTOOL_LOG=tmp/tarantool.log ./.rocks/bin/luatest --coverage -v test/
+
+install_release:
+	mkdir -p $(LUADIR)/$(PROJECT_NAME)
+	cp -Rf ../target/release/$(SRC_LIB) $(LIBDIR)/$(DEST_LIB)
+	cp -Rf src/*.lua $(LUADIR)/$(PROJECT_NAME)
+	cp -Rf cartridge $(LUADIR)
+
+test_integration: build_integration run_integration