[tor-commits] [torbrowser/master] update build targets for better automatic building

[erinn at torproject.org]

commit 6b2c454261728e45a8787e7062b7ad19f2338d48
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 21 03:10:20 2011 +0200

    update build targets for better automatic building
---
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 8859cd0..0bcefb3 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -124,7 +124,7 @@ copy-firefox:
 	cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox
 
 # source-dance unpack-source
-build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo
+build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox
 	echo "If we're here, we've done something right."
 
 ## Location of compiled libraries
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index ebd265d..0b07e67 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -113,7 +113,7 @@ copy-firefox:
 	-rm -rf $(FETCH_DIR)/Firefox.app
 	cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app
 
-build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor
+build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox
 	echo "If we're here, we've done something right."
 
 ## Location of compiled libraries
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index e8991a2..28b7d82 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -46,6 +46,9 @@ fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fe
 fetch-zlib:
 	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
 
+fetch-qt:
+	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL)
+
 fetch-openssl:
 	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)