summaryrefslogtreecommitdiff
path: root/Makefile-libostree.am
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-02-04 11:29:20 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-02-07 16:50:37 +0000
commit9169268c31df31cc09495e2a04c30cd251f22b5d (patch)
treed0a818aea3215e75d422ce4c2165f8e027326273 /Makefile-libostree.am
parent9c0af41710fc3800a3b02dd552b96890bf1d432f (diff)
downloadostree-9169268c31df31cc09495e2a04c30cd251f22b5d.tar.gz
rust: Support `make dist` -> cargo vendor
What we do here basically is set things up in a `dist-hook` so that our Rust sources are vendored at `dist` time. This gives us a single tarball still, and ideally should be transparent to downstream builders, as long as they have the `cargo/rust` toolchain. Closes: #669 Approved by: jlebon
Diffstat (limited to 'Makefile-libostree.am')
-rw-r--r--Makefile-libostree.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 63f0eb7d..d40196d4 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -25,7 +25,9 @@ noinst_LTLIBRARIES += libostree-kernel-args.la
if ENABLE_RUST
bupsplitpath = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/libbupsplit_rs.a
.PHONY: $(bupsplitpath)
-$(bupsplitpath): Makefile rust/src/bupsplit.rs
+BUPSPLIT_RUST_SOURCES = rust/src/bupsplit.rs
+EXTRA_DIST += $(BUPSPLIT_RUST_SOURCES)
+$(bupsplitpath): Makefile $(BUPSPLIT_RUST_SOURCES)
cd $(top_srcdir)/rust && CARGO_TARGET_DIR=@abs_top_builddir@/target cargo build --verbose $(CARGO_RELEASE_ARGS)
else
bupsplitpath = libbupsplit.la