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

Revert "Stop building Ragel"

Browse source 
This reverts commit ad047d1f74.
This commit is contained in:
Brian Anderson 2012-07-26 17:50:08 -07:00
parent 7d443f14ab
commit f9ae85fcbe
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile.in
View file

@ -84,6 +84,7 @@ CHECK_DEPS += \
$(NULL) $(NULL)
CLEAN_DEPS += \ CLEAN_DEPS += \
clean-ragel \
clean-harfbuzz \ clean-harfbuzz \
clean-rust-harfbuzz \ clean-rust-harfbuzz \
clean-mozjs \ clean-mozjs \
@ -110,8 +111,11 @@ libservo.dummy: $(SERVO_DEPS)
servo-test: $(SERVO_DEPS) servo-test: $(SERVO_DEPS)
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) --test -o $@ $< $(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) --test -o $@ $<
src/harfbuzz/src/.libs/libharfbuzz.a: src/ragel/ragel/ragel:
$(MAKE) -C src/harfbuzz CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++" $(MAKE) -C src/ragel
src/harfbuzz/src/.libs/libharfbuzz.a: src/ragel/ragel/ragel
$(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++"
src/mozjs/libjs_static.a: src/mozjs/libjs_static.a:
$(MAKE) -C src/mozjs $(MAKE) -C src/mozjs
@ -198,6 +202,10 @@ check-rust-layers: $(LAYERS_DEPS)
.PHONY: clean .PHONY: clean
clean: $(CLEAN_DEPS) clean: $(CLEAN_DEPS)
.PHONY: clean-ragel
clean-ragel:
$(MAKE) clean -C src/ragel
.PHONY: clean-harfbuzz .PHONY: clean-harfbuzz
clean-harfbuzz: clean-harfbuzz:
$(MAKE) clean -C src/harfbuzz $(MAKE) clean -C src/harfbuzz

2
configure.in
View file

@ -3,6 +3,7 @@
SRCDIR="$(cd $(dirname $0) && pwd)" SRCDIR="$(cd $(dirname $0) && pwd)"
sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
mkdir -p src/ragel || exit $?
mkdir -p src/harfbuzz || exit $? mkdir -p src/harfbuzz || exit $?
mkdir -p src/mozjs || exit $? mkdir -p src/mozjs || exit $?
mkdir -p src/rust-harfbuzz || exit $? mkdir -p src/rust-harfbuzz || exit $?
@ -16,6 +17,7 @@ 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 $?
(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 $?
(cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure --enable-debug --disable-optimize) || exit $? (cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure --enable-debug --disable-optimize) || exit $?
(cd src/rust-opengles && sh ${SRCDIR}/src/rust-opengles/configure) || exit $? (cd src/rust-opengles && sh ${SRCDIR}/src/rust-opengles/configure) || exit $?