summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2023-04-19 20:33:19 -0600
committerFederico Mena Quintero <federico@gnome.org>2023-04-19 20:33:19 -0600
commit41c14aeeacacd4160d1b4989d2c29cd3d7bf72a1 (patch)
tree3a32f7c82cba89bb27f61ada8cb67ef77b376a3c
parentae75aa08dea253d8d6de12e60531025d735bf11b (diff)
downloadlibrsvg-41c14aeeacacd4160d1b4989d2c29cd3d7bf72a1.tar.gz
Makefile.am: build just the librsvg-c package for the C ABI library
Also, change the crate-type to staticlib in librsvg-c as it was before. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
-rw-r--r--Makefile.am2
-rw-r--r--librsvg-c/Cargo.toml6
-rw-r--r--rsvg/Cargo.toml1
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 8fb6b0ec..3e434971 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,7 @@ librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_SRC)
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
- $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --lib \
+ $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package librsvg-c \
&& cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && mv $(RUST_LIB) .libs/librsvg_c_api.a
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/librsvg-c/Cargo.toml b/librsvg-c/Cargo.toml
index 9996027b..1bbe56a5 100644
--- a/librsvg-c/Cargo.toml
+++ b/librsvg-c/Cargo.toml
@@ -23,4 +23,8 @@ url = "2"
[build-dependencies]
regex = "1.7.1"
-librsvg = { path = "../rsvg", features = ["c-api", "test-utils"] } \ No newline at end of file
+librsvg = { path = "../rsvg", features = ["c-api", "test-utils"] }
+
+[lib]
+name = "rsvg"
+crate-type = [ "staticlib" ]
diff --git a/rsvg/Cargo.toml b/rsvg/Cargo.toml
index 5469ad5d..b01e12a4 100644
--- a/rsvg/Cargo.toml
+++ b/rsvg/Cargo.toml
@@ -45,7 +45,6 @@ test-utils = ["yeslogic-fontconfig-sys"]
[lib]
name = "rsvg"
-crate-type = [ "staticlib", "rlib" ]
[dependencies]
# Keep these in sync with respect to the cairo-rs version: