rust: rename lib to libsuricata_rust

Previously it was libsuricata.a, but eventually we want to get
to a place where libsuricata.a is a combination of the Rust
and C code.

diff --git a/configure.ac b/configure.ac
index 4cbbe7249fdb1dc27822f85551aae86484ae8c20..64f94251d241f4b1c8b65358b34f456bacbb8891 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@
     fi
     echo -n "installation for $host OS... "
 
-    RUST_SURICATA_LIBNAME="libsuricata.a"
+    RUST_SURICATA_LIBNAME="libsuricata_rust.a"
 
     e_magic_file=""
     e_magic_file_comment="#"

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index a0fb8c7abc572c297f4eb945fd46747fd27c265d..214499b1db52c0e68bcff914902fc4e83aff640a 100644 (file)
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -6,6 +6,7 @@ edition = "2018"
 [lib]
 crate-type = ["staticlib", "rlib"]
 path = "@e_rustdir@/src/lib.rs"
+name = "suricata_rust"
 
 [profile.release]
 debug = true

diff --git a/rust/Makefile.am b/rust/Makefile.am
index f10690a712281990936054fa3d3a23de64f85366..10dbb3051938a8d34c3e4ceb9f0862b2ece1bb53 100644 (file)
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -45,9 +45,9 @@ else
                $(CARGO) build $(RELEASE) $(NIGHTLY_ARGS) \
                        --features "$(RUST_FEATURES)" $(RUST_TARGET)
 endif
-       if test -e $(RUST_SURICATA_LIBDIR)/suricata.lib; then \
-               cp $(RUST_SURICATA_LIBDIR)/suricata.lib \
-                       $(RUST_SURICATA_LIBDIR)/libsuricata.a; \
+       if test -e $(RUST_SURICATA_LIBDIR)/suricata_rust.lib; then \
+               cp $(RUST_SURICATA_LIBDIR)/suricata_rust.lib \
+                       $(RUST_SURICATA_LIBDIR)/${RUST_SURICATA_LIBNAME}; \
        fi
        $(MAKE) gen/rust-bindings.h