From: Jason Ish <ish@unx.ca>
Date: Tue, 22 May 2018 18:16:05 +0000 (-0600)
Subject: rust: cargo fixes for out of tree build
X-Git-Tag: suricata-4.1.0-rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d73b5ee276c336f406f52d9711c2f23bff21f5c2;p=thirdparty%2Fsuricata.git

rust: cargo fixes for out of tree build
---

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index bfc8bd9b51..bddfebf4b0 100644
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -4,6 +4,7 @@ version = "@PACKAGE_VERSION@"
 
 [lib]
 crate-type = ["staticlib"]
+path = "@abs_srcdir@/src/lib.rs"
 
 [profile.release]
 debug = true
diff --git a/rust/Makefile.am b/rust/Makefile.am
index fc9b6a0a90..5a1814027f 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -31,31 +31,25 @@ endif
 
 all-local:
 if HAVE_PYTHON
-	cd $(top_srcdir)/rust && \
-		$(HAVE_PYTHON) ./gen-c-headers.py && \
-		CARGO_TARGET_DIR=$(abs_builddir)/target \
-		CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
-			--features "$(RUST_FEATURES)"
+	cd $(top_srcdir)/rust && $(HAVE_PYTHON) ./gen-c-headers.py
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
+		--features "$(RUST_FEATURES)"
 else
-	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
-			--features "$(RUST_FEATURES)"
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
+		--features "$(RUST_FEATURES)"
 endif
 
 clean-local:
-	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		CARGO_HOME=$(CARGO_HOME) $(CARGO) clean
+	-rm -rf target
 
-distclean-local:
+distclean-local: clean-local
 	rm -rf vendor gen Cargo.lock
 
 check:
-	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		CARGO_HOME=$(CARGO_HOME) $(CARGO) test
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) test
 
 Cargo.lock: Cargo.toml
-	cd $(top_srcdir)/rust && \
-		CARGO_HOME=$(CARGO_HOME) $(CARGO) generate-lockfile
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) generate-lockfile
 
 if HAVE_CARGO_VENDOR
 vendor: