From 881c7f76b53e477c4769b4b86a9900dfe8f25897 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Wed, 27 Aug 2014 15:13:34 -0600
Subject: [PATCH] Cargoify rust-hubbub

---
 .gitignore                 |  3 +++
 Cargo.toml                 | 10 ++++++++++
 Makefile.in                |  6 +++---
 hubbub.rs => src/hubbub.rs |  0
 hubbub.rc => src/lib.rs    |  0
 ll.rs => src/ll.rs         |  0
 6 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 Cargo.toml
 rename hubbub.rs => src/hubbub.rs (100%)
 rename hubbub.rc => src/lib.rs (100%)
 rename ll.rs => src/ll.rs (100%)

diff --git a/.gitignore b/.gitignore
index 5df5866..6fc9137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 /doc
+/target
+/Cargo.lock
+
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..2f9d91a
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+
+name = "hubbub"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+[dependencies.hubbub-sys]
+
+path = "../libhubbub"
+
diff --git a/Makefile.in b/Makefile.in
index a10babf..93de9d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@ RUSTDOC ?= rustdoc
 RUSTDOC_FLAGS ?=
 RUSTDOC_TARGET ?= doc
 
-RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
+RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
 
 .PHONY: all
 all:	libhubbub-servo.dummy
@@ -19,14 +19,14 @@ all:	libhubbub-servo.dummy
 %.o:	%.c
 	$(CC) $< -o $@ -c $(CFLAGS)
 
-libhubbub-servo.dummy: hubbub.rc $(RUST_SRC) $(EXT_DEPS)
+libhubbub-servo.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTC) $(RUSTFLAGS) $< --out-dir . -C extra-filename=-servo
 	touch $@
 
 .PHONY: doc
 doc: $(RUSTDOC_TARGET)/hubbub/index.html
 
-$(RUSTDOC_TARGET)/hubbub/index.html: hubbub.rc $(RUST_SRC) $(EXT_DEPS)
+$(RUSTDOC_TARGET)/hubbub/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET)
 
 .PHONY: check
diff --git a/hubbub.rs b/src/hubbub.rs
similarity index 100%
rename from hubbub.rs
rename to src/hubbub.rs
diff --git a/hubbub.rc b/src/lib.rs
similarity index 100%
rename from hubbub.rc
rename to src/lib.rs
diff --git a/ll.rs b/src/ll.rs
similarity index 100%
rename from ll.rs
rename to src/ll.rs