summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuière <hub@figuiere.net>2024-01-05 23:27:59 -0500
committerHubert Figuière <hub@figuiere.net>2024-01-05 23:27:59 -0500
commitd50799d4d19506d3c38c4b6aa9aca0d6969cd790 (patch)
treebcd67ff1950b64ab1719e6d95ab993d3967d1a37
parentd35318967d45dd413c06015d2d513f3e35815440 (diff)
rust: Fix build with the wrong crate name
Signed-off-by: Hubert Figuière <hub@figuiere.net>
-rw-r--r--Cargo.toml1
-rw-r--r--Makefile.am4
2 files changed, 2 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 5437dfd..8f8e710 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,6 @@ fuzzing = ["afl"]
debug = true
[lib]
-name = "openraw"
bench = false
crate-type = [ "staticlib", "rlib" ]
diff --git a/Makefile.am b/Makefile.am
index 5cf6110..3b47b74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,14 +119,14 @@ endif
CARGO_TARGET_DIR=@abs_top_builddir@/target
RUST_PATH=$(CARGO_TARGET_DIR)/@CARGO_TARGET_SUBDIR@
-RUST_LIB=$(RUST_PATH)/libopenraw.a
+RUST_LIB=$(RUST_PATH)/liblibopenraw.a
Cargo.lock:
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
cargo update
libopenraw_la_SOURCES = _or_dummy.c
-libopenraw.la: $(libopenraw_la_OBJECTS) $(RUST_FILES)
+libopenraw.la: $(liblibopenraw_la_OBJECTS) $(RUST_FILES)
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
cargo build --features=capi $(CARGO_VERBOSE) $(CARGO_RELEASE_ARGS) --lib && \
$(LINK) $< && mv $(RUST_LIB) .libs/libopenraw.a