diff --git a/Makefile.in b/Makefile.in index fe7ab696f63..b1b80ddb0bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,6 +84,7 @@ CHECK_DEPS += \ $(NULL) CLEAN_DEPS += \ + clean-ragel \ clean-harfbuzz \ clean-rust-harfbuzz \ clean-mozjs \ @@ -110,8 +111,11 @@ libservo.dummy: $(SERVO_DEPS) servo-test: $(SERVO_DEPS) $(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) --test -o $@ $< -src/harfbuzz/src/.libs/libharfbuzz.a: - $(MAKE) -C src/harfbuzz CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++" +src/ragel/ragel/ragel: + $(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: $(MAKE) -C src/mozjs @@ -198,6 +202,10 @@ check-rust-layers: $(LAYERS_DEPS) .PHONY: clean clean: $(CLEAN_DEPS) +.PHONY: clean-ragel +clean-ragel: + $(MAKE) clean -C src/ragel + .PHONY: clean-harfbuzz clean-harfbuzz: $(MAKE) clean -C src/harfbuzz diff --git a/configure.in b/configure.in index 1114f2cc428..24911354be7 100755 --- a/configure.in +++ b/configure.in @@ -3,6 +3,7 @@ SRCDIR="$(cd $(dirname $0) && pwd)" sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile +mkdir -p src/ragel || exit $? mkdir -p src/harfbuzz || exit $? mkdir -p src/mozjs || 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-layers || exit $? +(cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || 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/rust-opengles && sh ${SRCDIR}/src/rust-opengles/configure) || exit $?