rust: rename to suricata (from suricata_rust)

Rename the Rust lib to simply "suricata" instead of "suricata_rust".
This allows Rust plugin/library code to use it under the name "suricata"
which is what should be expected.

The name was only "suricata_rust" to prevent on-disk conflict with the C
code, so just rename the file on disk, which doesn't affect how the code
is interacted with from an API layer.

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 6febd4c532722258153e5be6ed916a9cf958826d..0987651203a24e8917bbba5b393de6ecaa463802 100644 (file)
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -9,7 +9,7 @@ members = [".", "./derive"]
 [lib]
 crate-type = ["staticlib", "rlib"]
 path = "@e_rustdir@/src/lib.rs"
-name = "suricata_rust"
+name = "suricata"
 
 [profile.release]
 debug = true

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