[tor-commits] [torbrowser/maint-2.2] Move the source-dance target to versions.mk

[erinn@xxxxxxxxxxxxxx]

commit ba2e293ad6710a0d509c1e13ce5d2d5ef7cedce6
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Tue Feb 21 11:40:47 2012 +0100

    Move the source-dance target to versions.mk
---
 build-scripts/linux.mk    |    4 ----
 build-scripts/osx.mk      |    3 ---
 build-scripts/versions.mk |    2 ++
 build-scripts/windows.mk  |    3 ---
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index a66ae77..0badb16 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -33,9 +33,6 @@ TBB_FINAL=$(BUILT_DIR)/TBBL
 ## Include versions (must happen after variable definitions above
 include $(PWD)/versions.mk
 
-source-dance: fetch-source unpack-source
-	echo "We're ready for building now."
-
 ZLIB_OPTS=--shared --prefix=$(BUILT_DIR)
 build-zlib: $(ZLIB_DIR)
 	cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS)
@@ -102,7 +99,6 @@ copy-firefox:
 	cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(BUILD_DIR)
 	cd $(BUILD_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-firefox
 	echo "If we're here, we've done something right."
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 34705bc..6f0bbc1 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -44,9 +44,6 @@ TBB_FINAL=$(BUILT_DIR)/tbbosx-dist
 ## Include versions (must happen after variable definitions above
 include $(PWD)/versions.mk
 
-source-dance: fetch-source unpack-source
-	echo "We're ready for building now."
-
 ZLIB_OPTS=--prefix=$(BUILT_DIR)
 ZLIB_CFLAGS="-arch $(ARCH_TYPE)"
 build-zlib: $(ZLIB_DIR)
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index a89bf13..eae9019 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -95,6 +95,8 @@ vpath %.stamp $(STAMP_DIR)
 
 fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) | $(FETCH_DIR) ;
 
+source-dance: fetch-source unpack-source ;
+
 $(FETCH_DIR):
 	mkdir -p $(FETCH_DIR)
 
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index b1b511a..40ca57c 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -56,9 +56,6 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist
 ## Include versions (must happen after variable definitions above
 include $(PWD)/versions.mk
 
-source-dance: fetch-source unpack-source
-	echo "We're ready for building now."
-
 build-zlib: $(ZLIB_DIR)
 	cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc
 	cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits