commit 3a364529a49257aaa3710499874bde84fb6b0d06 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 27 12:35:13 2017 -0400
Make distcleancheck pass with --enable-rust --- Makefile.am | 5 +++++ src/rust/tor_rust/include.am | 7 +++++++ 2 files changed, 12 insertions(+)
diff --git a/Makefile.am b/Makefile.am index 137fb1edc..3445fc064 100644 --- a/Makefile.am +++ b/Makefile.am @@ -246,3 +246,8 @@ mostlyclean-local: clean-local: rm -rf $(top_builddir)/src/rust/target rm -rf $(top_builddir)/src/rust/.cargo/registry + +if USE_RUST +distclean-local: distclean-rust +endif + diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 6bfec77fb..f3b0748ba 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -8,4 +8,11 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release --quiet $(CARGO_ONLINE) )
+distclean-rust: + ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ + CARGO_HOME="$(abs_top_builddir)/src/rust" \ + $(CARGO) clean --quiet $(CARGO_ONLINE) ) + rm -rf "$(abs_top_builddir)/src/rust/registry" + FORCE: