From 7ecf45a279348fa6aaa79b8456ccef6fbee0d650 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Fri, 27 Jun 2014 22:43:10 -0400
Subject: [PATCH] Switch to Cargo.

---
 .gitignore      |  6 ++----
 Cargo.toml      | 12 ++++++++++++
 Makefile        | 39 ++++++++++++++++++++-------------------
 cargo-lite.conf |  4 ----
 4 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 Cargo.toml
 delete mode 100644 cargo-lite.conf

diff --git a/.gitignore b/.gitignore
index cb86fdd..af23c43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 .*.swp
-test-runner
-bench-runner
 doc
 tags
 examples/data/ss10pusa.csv
-*.rlib
-*.so
+build
+target
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..48831b0
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "csv"
+version = "0.1.0"
+authors = ["Andrew Gallant <jamslam@gmail.com>"]
+
+[[lib]]
+name = "csv"
+path = "src/lib.rs"
+
+[dependencies.quickcheck]
+git = "git://github.com/BurntSushi/quickcheck"
+
diff --git a/Makefile b/Makefile
index 2993802..d1c0edb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
 RUST_CFG=
+BUILD ?= build
+LIB ?= $(BUILD)/.timestamp_csv
+RUST_PATH ?= -L $(BUILD) -L ./target/deps
 
-compile:
-	rustc --opt-level=3 ./src/lib.rs
+compile: $(LIB)
 
-install:
-	cargo-lite install
+$(LIB):
+	@mkdir -p $(BUILD)
+	rustc --opt-level=3 ./src/lib.rs --out-dir $(BUILD)
+	@touch $(BUILD)/.timestamp_csv
 
 ctags:
 	ctags --recurse --options=ctags.rust --languages=Rust
@@ -18,29 +22,26 @@ docs:
 	in-dir doc fix-perms
 	rscp ./doc/* gopher:~/www/burntsushi.net/rustdoc/
 
-test: test-runner
-	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv ./test-runner
+test: $(BUILD)/test
+	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv $(BUILD)/test
 
-test-runner: src/lib.rs src/test.rs src/bench.rs
-	rustc -L . --test src/lib.rs -o test-runner
+$(BUILD)/test: $(LIB) src/lib.rs src/test.rs src/bench.rs
+	rustc $(RUST_PATH) --test src/lib.rs -o $(BUILD)/test
 
 test-examples:
 	(cd ./examples && ./test)
 
-bench: bench-runner
-	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv ./bench-runner --bench
+bench: $(BUILD)/bench
+	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv $(BUILD)/bench --bench
 
-bench-prof: bench-runner
-	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv valgrind --tool=callgrind ./bench-runner --bench
+bench-prof: $(BUILD)/bench
+	RUST_TEST_TASKS=1 RUST_LOG=quickcheck,csv valgrind --tool=callgrind $(BUILD)/bench --bench
 
-bench-runner: src/lib.rs src/test.rs src/bench.rs
-	rustc -g -L . --opt-level=3 -Z lto --test $(RUST_CFG) src/lib.rs -o bench-runner
+$(BUILD)/bench: $(LIB) src/lib.rs src/test.rs src/bench.rs
+	rustc -g $(RUST_PATH) --opt-level=3 -Z lto --test $(RUST_CFG) src/lib.rs -o $(BUILD)/bench
 
-test-clean:
-	rm -rf ./test-runner ./bench-runner
-
-clean: test-clean
-	rm -f *.rlib *.so
+clean:
+	rm -f $(BUILD)/* $(LIB)
 
 push:
 	git push origin master
diff --git a/cargo-lite.conf b/cargo-lite.conf
deleted file mode 100644
index 64d1c6a..0000000
--- a/cargo-lite.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[build]
-crate_root = "src/lib.rs"
-crate_type = "library"
-