diff --git a/Makefile.in b/Makefile.in index b1b80ddb0bd..1f5f98fffdd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,6 +28,7 @@ RUSTLIBS = \ -L src/rust-opengles \ -L src/rust-glut \ -L src/rust-layers \ + -L src/rust-http-client \ $(NULL) RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') @@ -68,6 +69,7 @@ SERVO_DEPS += \ src/rust-opengles/libopengles.dummy \ src/rust-glut/libglut.dummy \ src/rust-layers/liblayers.dummy \ + src/rust-http-client/libhttp_client.dummy \ $(NULL) CHECK_DEPS += \ @@ -80,6 +82,7 @@ CHECK_DEPS += \ check-rust-opengles \ check-rust-glut \ check-rust-layers \ + check-rust-http-client \ check-servo \ $(NULL) @@ -96,6 +99,7 @@ CLEAN_DEPS += \ clean-rust-opengles \ clean-rust-glut \ clean-rust-layers \ + clean-rust-http-client \ clean-servo \ $(NULL) @@ -152,6 +156,9 @@ src/rust-layers/liblayers.dummy: $(LAYERS_DEPS) RUSTFLAGS="$(RUSTFLAGS) -L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \ $(MAKE) -C src/rust-layers +src/rust-http-client/libhttp_client.dummy: + $(MAKE) -C src/rust-http-client + check: $(CHECK_DEPS) check-servo: servo-test @@ -199,6 +206,10 @@ check-rust-layers: $(LAYERS_DEPS) RUSTFLAGS="$(RUSTFLAGS) -L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \ $(MAKE) check -C src/rust-layers +.PHONY: check-rust-http-client +check-rust-http-client: + $(MAKE) check -C src/rust-http-client + .PHONY: clean clean: $(CLEAN_DEPS) @@ -254,6 +265,10 @@ clean-rust-glut: clean-rust-layers: $(MAKE) clean -C src/rust-layers +.PHONY: clean-rust-http-client +clean-rust-http-client: + $(MAKE) clean -C src/rust-http-client + .PHONY: clean-servo clean-servo: rm -f servo servo-test diff --git a/configure.in b/configure.in index 24911354be7..aa2579ad679 100755 --- a/configure.in +++ b/configure.in @@ -16,6 +16,7 @@ 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 $? +mkdir -p src/rust-http-client || exit $? (cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $? (cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $? @@ -30,4 +31,4 @@ mkdir -p src/rust-layers || 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 $? - +(cd src/rust-http-client && sh ${SRCDIR}/src/rust-http-client/configure) || exit $? diff --git a/src/servo/servo.rc b/src/servo/servo.rc index 812d03295aa..ecf51aa254f 100755 --- a/src/servo/servo.rc +++ b/src/servo/servo.rc @@ -16,6 +16,7 @@ use geom; use glut; use layers; use opengles; +use http_client; mod dom { mod base;