]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust: cbindgen first verifies existing bindings
authorPhilippe Antoine <contact@catenacyber.fr>
Fri, 29 Apr 2022 06:55:58 +0000 (08:55 +0200)
committerVictor Julien <vjulien@oisf.net>
Wed, 1 Jun 2022 08:54:17 +0000 (10:54 +0200)
So as not to recompile every C file inclusing rust.h

rust/Makefile.am
src/Makefile.am

index c04ca33bff5bdda47e5674dae6eaef589387c0cc..daea5f3d64449ab9cfec9485d4a2fbd52ab887dd 100644 (file)
@@ -81,9 +81,8 @@ vendor:
 
 if HAVE_CBINDGEN
 gen/rust-bindings.h: $(RUST_SURICATA_LIB)
-       rm -f gen/rust-bindings.h
        cbindgen --config $(abs_top_srcdir)/rust/cbindgen.toml \
-               --quiet --output $(abs_top_builddir)/rust/gen/rust-bindings.h
+               --quiet --verify --output $(abs_top_builddir)/rust/gen/rust-bindings.h || true
 else
 gen/rust-bindings.h:
 endif
index c8d8af8bd97264f1c7eabf9b77e2f195fd833f63..34b8bae4c25428269b0ca3408c1befba24374cd4 100755 (executable)
@@ -1267,7 +1267,7 @@ suricata_SOURCES = main.c
 # the library search path.
 suricata_LDFLAGS = $(all_libraries) ${SECLDFLAGS}
 suricata_LDADD = libsuricata_c.a $(RUST_SURICATA_LIB) $(HTP_LDADD) $(RUST_LDADD)
-suricata_DEPENDENCIES = libsuricata_c.a
+suricata_DEPENDENCIES = libsuricata_c.a $(RUST_SURICATA_LIB)
 
 if BUILD_SHARED_LIBRARY
 libsuricata.so.$(VERSION): libsuricata_c.a