[tor-commits] [flashproxy/master] Add bundle-building support for gnulinux-x86_64.

[dcf at torproject.org]

commit 7ec5e140240432256f776513bdff047fd1a7c1e0
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Apr 6 18:42:07 2013 -0700

    Add bundle-building support for gnulinux-x86_64.
---
 doc/Makefile |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 5ed4118..9ebd485 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,23 +17,31 @@ BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)
 PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE)
 
 BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz
+BUNDLE_GNULINUX_X86_64 = tor-browser-gnu-linux-x86_64-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz
 
 PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz
+PT_BUNDLE_GNULINUX_X86_64 = tor-pluggable-transports-browser-gnu-linux-x86_64-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz
 
 all:
 	@echo "Try one of these:"
 	@echo $$'\tmake gnulinux-i686'
+	@echo $$'\tmake gnulinux-x86_64'
 	@echo
 	@echo "Configure version numbers at the top of this makefile."
 	@echo "Before starting, you need to run \"make dist\" in the flashproxy directory."
 
 gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686)
+gnulinux-x86_64: $(PT_BUNDLE_GNULINUX_X86_64)
 
 $(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING)
 $(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686)
 
-$(PT_BUNDLE_GNULINUX_I686): TBBDIR = $(WORKDIR)/tor-browser_en-US
-$(PT_BUNDLE_GNULINUX_I686):
+$(PT_BUNDLE_GNULINUX_X86_64): WORKDIR = work/gnulinux-x86_64-$(PT_BUNDLE_VERSION_STRING)
+$(PT_BUNDLE_GNULINUX_X86_64): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_X86_64)
+
+# Shared GNU/Linux 32-bit and 64-bit target.
+$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor-browser_en-US
+$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64):
 	# Download and check signature.
 	$(MAKE) checksig-$(BUNDLE_GNULINUX)
 
@@ -58,7 +66,8 @@ $(PT_BUNDLE_GNULINUX_I686):
 	tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US
 
 # Download targets.
-$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc:
+$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc \
+$(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc:
 	rm -f "$@"
 	wget --no-clobber "$(BUNDLE_DIST_URL)/linux/$@"
 
@@ -67,4 +76,4 @@ checksig-%: % %.asc
 
 # Need Bash for certain wildcards.
 SHELL = /bin/bash
-.PHONY: checksig-% gnulinux-i686
+.PHONY: checksig-% gnulinux-i686 gnulinux-x86_64