From d5aa0c43ab0379182471866119ef223f006ee442 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Mon, 25 Aug 2014 22:43:10 -0600 Subject: [PATCH] Cargoify rust-opengles --- .gitignore | 2 ++ Cargo.toml | 5 +++++ Makefile.in | 8 ++++---- cgl.rs => src/cgl.rs | 0 gl2.rs => src/gl2.rs | 0 glx.rs => src/glx.rs | 0 lib.rs => src/lib.rs | 0 7 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 Cargo.toml rename cgl.rs => src/cgl.rs (100%) rename gl2.rs => src/gl2.rs (100%) rename glx.rs => src/glx.rs (100%) rename lib.rs => src/lib.rs (100%) diff --git a/.gitignore b/.gitignore index 46409b0..0eec179 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ Makefile libopengles-*.so librustopengles.dummy /doc +/target +/Cargo.lock diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..75b4ca0 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,5 @@ +[package] + +name = "opengles" +version = "0.1.0" +authors = ["The Servo Project Developers"] diff --git a/Makefile.in b/Makefile.in index 321be71..207c332 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,22 +17,22 @@ endif else endif -RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') +RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') .PHONY: all all: libopengles.dummy -libopengles.dummy: lib.rs $(RUST_SRC) $(EXT_DEPS) +libopengles.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS) $(RUSTC) $(RUSTFLAGS) $< --out-dir . touch $@ -opengles-test: lib.rs $(RUST_SRC) +opengles-test: src/lib.rs $(RUST_SRC) $(RUSTC) $(RUSTFLAGS) $< -o $@ --test .PHONY: doc doc: $(RUSTDOC_TARGET)/opengles/index.html -$(RUSTDOC_TARGET)/opengles/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS) +$(RUSTDOC_TARGET)/opengles/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS) $(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET) .PHONY: check diff --git a/cgl.rs b/src/cgl.rs similarity index 100% rename from cgl.rs rename to src/cgl.rs diff --git a/gl2.rs b/src/gl2.rs similarity index 100% rename from gl2.rs rename to src/gl2.rs diff --git a/glx.rs b/src/glx.rs similarity index 100% rename from glx.rs rename to src/glx.rs diff --git a/lib.rs b/src/lib.rs similarity index 100% rename from lib.rs rename to src/lib.rs