From 12729d36f7888b54dd81103db6e1c3eafa486e7b Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 5 Jul 2012 16:09:50 -0700
Subject: [PATCH] Add layers and fix checks

---
 .gitmodules       |  3 +++
 Makefile.in       | 27 ++++++++++++++++++++++++---
 configure.in      |  3 +++
 src/rust-glut     |  2 +-
 src/rust-layers   |  1 +
 src/rust-opengles |  2 +-
 6 files changed, 33 insertions(+), 5 deletions(-)
 create mode 160000 src/rust-layers

diff --git a/.gitmodules b/.gitmodules
index dbf3ec2c84d..b2dc683d114 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "src/rust-glut"]
 	path = src/rust-glut
 	url = git://github.com/pcwalton/rust-glut.git
+[submodule "src/rust-layers"]
+	path = src/rust-layers
+	url = git://github.com/pcwalton/rust-layers.git
diff --git a/Makefile.in b/Makefile.in
index 839b5a039b8..74d46ae80b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,7 @@ RUSTFLAGS += \
 	-L src/rust-geom \
 	-L src/rust-opengles \
 	-L src/rust-glut \
+	-L src/rust-layers \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -35,6 +36,13 @@ CHECK_DEPS =
 CLEAN_DEPS =
 AZURE_DEPS = \
 	src/rust-geom/libgeom.dummy
+GLUT_DEPS = \
+    src/rust-opengles/libopengles.dummy
+LAYERS_DEPS = \
+	src/rust-geom/libgeom.dummy \
+    src/rust-opengles/libopengles.dummy \
+    src/rust-glut/libglut.dummy \
+    src/rust-azure/libazure.dummy \
 
 ifeq ($(OSTYPE),darwin)
     SERVO_DEPS += src/rust-cocoa/libcocoa.dummy
@@ -43,6 +51,7 @@ ifeq ($(OSTYPE),darwin)
     CHECK_DEPS += check-rust-cocoa
     CLEAN_DEPS += clean-rust-cocoa
     AZURE_DEPS += src/rust-cocoa/libcocoa.dummy src/rust-geom/libgeom.dummy
+    LAYERS_DEPS += src/rust-cocoa/libcocoa.dummy
 endif
 
 SERVO_DEPS += \
@@ -54,6 +63,7 @@ SERVO_DEPS += \
 	src/rust-geom/libgeom.dummy \
     src/rust-opengles/libopengles.dummy \
     src/rust-glut/libglut.dummy \
+    src/rust-layers/liblayers.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -65,6 +75,7 @@ CHECK_DEPS += \
 	check-rust-geom \
 	check-rust-opengles \
 	check-rust-glut \
+	check-rust-layers \
 	check-servo \
 	$(NULL)
 
@@ -79,6 +90,7 @@ CLEAN_DEPS += \
 	clean-rust-geom \
 	clean-rust-opengles \
 	clean-rust-glut \
+	clean-rust-layers \
 	clean-servo \
 	$(NULL)
 
@@ -128,8 +140,12 @@ src/rust-geom/libgeom.dummy:
 src/rust-opengles/libopengles.dummy:
 	$(MAKE) -C src/rust-opengles
 
-src/rust-glut/libglut.dummy:
-	$(MAKE) -C src/rust-glut
+src/rust-glut/libglut.dummy: $(GLUT_DEPS)
+	RUSTFLAGS="-L ../rust-opengles" $(MAKE) -C src/rust-glut
+
+src/rust-layers/liblayers.dummy: $(LAYERS_DEPS)
+	RUSTFLAGS="-L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
+        $(MAKE) -C src/rust-layers
 
 check: $(CHECK_DEPS)
 
@@ -171,7 +187,12 @@ check-rust-opengles:
 
 .PHONY: check-rust-glut
 check-rust-glut:
-	$(MAKE) check -C src/rust-glut
+	RUSTFLAGS="-L ../rust-opengles" $(MAKE) check -C src/rust-glut
+
+.PHONY: check-rust-layers
+check-rust-layers:
+	RUSTFLAGS="-L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
+        $(MAKE) check -C src/rust-layers
 
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
diff --git a/configure.in b/configure.in
index 975945c8154..dc6c997be9d 100755
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,7 @@ mkdir -p src/rust-cocoa || exit $?
 mkdir -p src/rust-stb-image || exit $?
 mkdir -p src/rust-geom || exit $?
 mkdir -p src/rust-glut || exit $?
+mkdir -p src/rust-layers || exit $?
 
 (cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
 (cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
@@ -28,3 +29,5 @@ mkdir -p src/rust-glut || exit $?
 (cd src/rust-stb-image && sh ${SRCDIR}/src/rust-stb-image/configure) || exit $?
 (cd src/rust-geom && sh ${SRCDIR}/src/rust-geom/configure) || exit $?
 (cd src/rust-glut && sh ${SRCDIR}/src/rust-glut/configure) || exit $?
+(cd src/rust-layers && sh ${SRCDIR}/src/rust-layers/configure) || exit $?
+
diff --git a/src/rust-glut b/src/rust-glut
index ee552b7a521..2ebb1301b90 160000
--- a/src/rust-glut
+++ b/src/rust-glut
@@ -1 +1 @@
-Subproject commit ee552b7a521bf3de19c60906f911966c18326d60
+Subproject commit 2ebb1301b905daa23fcfccec4b798b8392326966
diff --git a/src/rust-layers b/src/rust-layers
new file mode 160000
index 00000000000..0272b9e05e3
--- /dev/null
+++ b/src/rust-layers
@@ -0,0 +1 @@
+Subproject commit 0272b9e05e312cf3913c199269c01636cbd9423f
diff --git a/src/rust-opengles b/src/rust-opengles
index f111c99124a..2c0c1334931 160000
--- a/src/rust-opengles
+++ b/src/rust-opengles
@@ -1 +1 @@
-Subproject commit f111c99124a3f0cce5818d4d7a0ee80c93cf85ad
+Subproject commit 2c0c13349317a81eae3e749c7bd4ae847ff85f08