From 1cb3bb593fdc01118b57e05d493e35967897b61c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 3 May 2012 16:16:50 -0700
Subject: [PATCH] Half-support out of tree builds

---
 Makefile.in | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c8f0e0765bd..d31a1928a42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,8 @@ ifeq ($(UNAME),Linux)
     OSTYPE=linux
 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')
 
@@ -58,13 +59,13 @@ servo-test: $(SERVO_DEPS)
 	$(RUSTC) $(RUSTFLAGS) --test -o $@ $<
 
 src/rust-azure/libazure.dummy:
-	make -C src/rust-azure
+	make -C $(VPATH)/src/rust-azure
 
 src/rust-sdl/libsdl.dummy:
-	make -C src/rust-sdl
+	make -C $(VPATH)/src/rust-sdl
 
 src/rust-cocoa/libcocoa.dummy:
-	make -C src/rust-cocoa
+	make -C $(VPATH)/src/rust-cocoa
 
 check: $(CHECK_DEPS)
 
@@ -73,30 +74,30 @@ check-servo: servo-test
 
 .PHONY: check-azure
 check-azure:
-	make check -C src/rust-azure
+	make check -C $(VPATH)/src/rust-azure
 
 .PHONY: check-sdl
 check-sdl:
-	make check -C src/rust-sdl
+	make check -C $(VPATH)/src/rust-sdl
 
 .PHONY: check-cocoa
 check-cocoa:
-	make check -C src/rust-cocoa
+	make check -C $(VPATH)/src/rust-cocoa
 
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
 .PHONY: clean-azure
 clean-azure:
-	make clean -C src/rust-azure
+	make clean -C $(VPATH)/src/rust-azure
 
 .PHONY: clean-sdl
 clean-sdl:
-	make clean -C src/rust-sdl
+	make clean -C $(VPATH)/src/rust-sdl
 
 .PHONY: clean-cocoa
 clean-cocoa:
-	make clean -C src/rust-cocoa
+	make clean -C $(VPATH)/src/rust-cocoa
 
 .PHONY: clean-servo
 clean-servo:
@@ -108,15 +109,15 @@ package: servo
 	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-azure
-	cp Info.plist Servo.app/Contents/
+	cp $(VPATH)/Info.plist Servo.app/Contents/
 	cp servo Servo.app/Contents/MacOS/
-	cp 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 src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
+	cp $(VPATH)/src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
+	cp $(VPATH)/src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/
+	cp $(VPATH)/src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
 
 else
 
 .PHONY: package
 package:
 
-endif
\ No newline at end of file
+endif