Half-support out of tree builds

This commit is contained in:
Patrick Walton 2012-05-03 16:16:50 -07:00
parent 675c2cb144
commit 1cb3bb593f

View file

@ -12,7 +12,8 @@ ifeq ($(UNAME),Linux)
OSTYPE=linux OSTYPE=linux
endif endif
RUSTFLAGS += -L src/rust-azure -L src/rust-sdl -L src/rust-cocoa RUSTFLAGS += -L $(VPATH)/src/rust-azure -L $(VPATH)/src/rust-sdl \
-L $(VPATH)/src/rust-cocoa
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -58,13 +59,13 @@ servo-test: $(SERVO_DEPS)
$(RUSTC) $(RUSTFLAGS) --test -o $@ $< $(RUSTC) $(RUSTFLAGS) --test -o $@ $<
src/rust-azure/libazure.dummy: src/rust-azure/libazure.dummy:
make -C src/rust-azure make -C $(VPATH)/src/rust-azure
src/rust-sdl/libsdl.dummy: src/rust-sdl/libsdl.dummy:
make -C src/rust-sdl make -C $(VPATH)/src/rust-sdl
src/rust-cocoa/libcocoa.dummy: src/rust-cocoa/libcocoa.dummy:
make -C src/rust-cocoa make -C $(VPATH)/src/rust-cocoa
check: $(CHECK_DEPS) check: $(CHECK_DEPS)
@ -73,30 +74,30 @@ check-servo: servo-test
.PHONY: check-azure .PHONY: check-azure
check-azure: check-azure:
make check -C src/rust-azure make check -C $(VPATH)/src/rust-azure
.PHONY: check-sdl .PHONY: check-sdl
check-sdl: check-sdl:
make check -C src/rust-sdl make check -C $(VPATH)/src/rust-sdl
.PHONY: check-cocoa .PHONY: check-cocoa
check-cocoa: check-cocoa:
make check -C src/rust-cocoa make check -C $(VPATH)/src/rust-cocoa
.PHONY: clean .PHONY: clean
clean: $(CLEAN_DEPS) clean: $(CLEAN_DEPS)
.PHONY: clean-azure .PHONY: clean-azure
clean-azure: clean-azure:
make clean -C src/rust-azure make clean -C $(VPATH)/src/rust-azure
.PHONY: clean-sdl .PHONY: clean-sdl
clean-sdl: clean-sdl:
make clean -C src/rust-sdl make clean -C $(VPATH)/src/rust-sdl
.PHONY: clean-cocoa .PHONY: clean-cocoa
clean-cocoa: clean-cocoa:
make clean -C src/rust-cocoa make clean -C $(VPATH)/src/rust-cocoa
.PHONY: clean-servo .PHONY: clean-servo
clean-servo: clean-servo:
@ -108,11 +109,11 @@ package: servo
mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa
mkdir -p Servo.app/Contents/MacOS/src/rust-sdl mkdir -p Servo.app/Contents/MacOS/src/rust-sdl
mkdir -p Servo.app/Contents/MacOS/src/rust-azure mkdir -p Servo.app/Contents/MacOS/src/rust-azure
cp Info.plist Servo.app/Contents/ cp $(VPATH)/Info.plist Servo.app/Contents/
cp servo Servo.app/Contents/MacOS/ cp servo Servo.app/Contents/MacOS/
cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/ cp $(VPATH)/src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
cp src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/ cp $(VPATH)/src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/
cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/ cp $(VPATH)/src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
else else