Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add rust-http-client to the build

Browse source
This commit is contained in:
Brian Anderson 2012-07-26 20:16:48 -07:00
parent de70e64827
commit a92de77791
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile.in
View file

@ -28,6 +28,7 @@ RUSTLIBS = \
-L src/rust-opengles \ -L src/rust-opengles \
-L src/rust-glut \ -L src/rust-glut \
-L src/rust-layers \ -L src/rust-layers \
-L src/rust-http-client \
$(NULL) $(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -68,6 +69,7 @@ SERVO_DEPS += \
src/rust-opengles/libopengles.dummy \ src/rust-opengles/libopengles.dummy \
src/rust-glut/libglut.dummy \ src/rust-glut/libglut.dummy \
src/rust-layers/liblayers.dummy \ src/rust-layers/liblayers.dummy \
src/rust-http-client/libhttp_client.dummy \
$(NULL) $(NULL)
CHECK_DEPS += \ CHECK_DEPS += \
@ -80,6 +82,7 @@ CHECK_DEPS += \
check-rust-opengles \ check-rust-opengles \
check-rust-glut \ check-rust-glut \
check-rust-layers \ check-rust-layers \
check-rust-http-client \
check-servo \ check-servo \
$(NULL) $(NULL)
@ -96,6 +99,7 @@ CLEAN_DEPS += \
clean-rust-opengles \ clean-rust-opengles \
clean-rust-glut \ clean-rust-glut \
clean-rust-layers \ clean-rust-layers \
clean-rust-http-client \
clean-servo \ clean-servo \
$(NULL) $(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" \ RUSTFLAGS="$(RUSTFLAGS) -L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
$(MAKE) -C src/rust-layers $(MAKE) -C src/rust-layers
src/rust-http-client/libhttp_client.dummy:
$(MAKE) -C src/rust-http-client
check: $(CHECK_DEPS) check: $(CHECK_DEPS)
check-servo: servo-test 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" \ RUSTFLAGS="$(RUSTFLAGS) -L ../rust-geom -L ../rust-opengles -L ../rust-glut -L ../rust-azure -L ../rust-cocoa" \
$(MAKE) check -C src/rust-layers $(MAKE) check -C src/rust-layers
.PHONY: check-rust-http-client
check-rust-http-client:
$(MAKE) check -C src/rust-http-client
.PHONY: clean .PHONY: clean
clean: $(CLEAN_DEPS) clean: $(CLEAN_DEPS)
@ -254,6 +265,10 @@ clean-rust-glut:
clean-rust-layers: clean-rust-layers:
$(MAKE) clean -C src/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 .PHONY: clean-servo
clean-servo: clean-servo:
rm -f servo servo-test rm -f servo servo-test

3
configure.in
View file

@ -16,6 +16,7 @@ mkdir -p src/rust-stb-image || exit $?
mkdir -p src/rust-geom || exit $? mkdir -p src/rust-geom || exit $?
mkdir -p src/rust-glut || exit $? mkdir -p src/rust-glut || exit $?
mkdir -p src/rust-layers || 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/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
(cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || 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-geom && sh ${SRCDIR}/src/rust-geom/configure) || exit $?
(cd src/rust-glut && sh ${SRCDIR}/src/rust-glut/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-layers && sh ${SRCDIR}/src/rust-layers/configure) || exit $?
(cd src/rust-http-client && sh ${SRCDIR}/src/rust-http-client/configure) || exit $?

1
src/servo/servo.rc
View file

@ -16,6 +16,7 @@ use geom;
use glut; use glut;
use layers; use layers;
use opengles; use opengles;
use http_client;
mod dom { mod dom {
mod base; mod base;