Cargoify rust-png

.gitignore

@@ -8,3 +8,5 @@
 /Makefile
 /test_store.png
 /doc
+/target
+/Cargo.lock

Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+
+name = "png"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+build = "make -f makefile.cargo"
+
+[dependencies.png-sys]
+
+git = "https://github.com/servo/libpng"

Makefile.in

@@ -14,14 +14,14 @@ RUSTDOC_TARGET ?= doc
 .PHONY: all
 all:	libpng-servo.dummy
 
-%.o: %.c
+shim.o: src/shim.c
 	$(CC) $< -o $@ -c $(CFLAGS)
 
-libpng-servo.dummy: lib.rs libshim.a $(EXT_DEPS)
+libpng-servo.dummy: src/lib.rs libshim.a $(EXT_DEPS)
 	$(RUSTC) $(RUSTFLAGS) $< --out-dir . -C extra-filename=-servo
 	touch $@
 
-png-test: lib.rs libshim.a
+png-test: src/lib.rs libshim.a
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
 
 libshim.a: shim.o
@@ -30,7 +30,7 @@ libshim.a: shim.o
 .PHONY: doc
 doc: $(RUSTDOC_TARGET)/png/index.html
 
-$(RUSTDOC_TARGET)/png/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS)
+$(RUSTDOC_TARGET)/png/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET)
 
 check: png-test

makefile.cargo

@@ -0,0 +1,16 @@
+CC ?= gcc
+CXX ?= g++
+AR ?= ar
+
+PNG_OUTDIR = $(shell find $(OUT_DIR)/.. -name 'png-sys-*' -type d)
+
+CFLAGS += -fPIC -I$(PNG_OUTDIR)
+
+.PHONY: all
+all: $(OUT_DIR)/libshim.a
+
+$(OUT_DIR)/shim.o: src/shim.c
+	$(CC) $< -o $@ -c $(CFLAGS)
+
+$(OUT_DIR)/libshim.a: $(OUT_DIR)/shim.o
+	$(AR) rcs $@ $(OUT_DIR)/shim.o