[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [torbrowser/master] update makefile names in makefiles

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [torbrowser/master] update makefile names in makefiles
From: erinn@xxxxxxxxxxxxxx
Date: Thu, 6 Jan 2011 13:35:19 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 06 Jan 2011 08:35:25 -0500
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Mon, 3 Jan 2011 20:25:25 +0100
Subject: update makefile names in makefiles
Commit: bdf8d711b08935bbd37979270dc30347d1cb2c44

---
 build-scripts/linux.mk |   30 +++++++++++++++---------------
 build-scripts/osx.mk   |   38 +++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index fd3da4c..98949d8 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -7,18 +7,18 @@
 ###
 ### You want to do the following currently supported activities:
 # This downloads and compiles everything
-### make -f Makefile.linux build-all-binaries
+### make -f linux.mk build-all-binaries
 # This makes a generic bundle
-### make -f Makefile.linux generic-bundle
+### make -f linux.mk generic-bundle
 # This makes the English bundle
-### make -f Makefile.linux bundle_en-US
+### make -f linux.mk bundle_en-US
 # This makes the German bundle
-### make -f Makefile.linux bundle_de
+### make -f linux.mk bundle_de
 # This makes the German compressed bundle
-### make -f Makefile.linux compressed-bundle_de 
+### make -f linux.mk compressed-bundle_de 
 # It's possible you may also want to do:
-### make -f Makefile.linux build-all-binaries
-### make -f Makefile.linux all-compressed-bundles
+### make -f linux.mk build-all-binaries
+### make -f linux.mk all-compressed-bundles
 ### ...
 ### Look in tbbl-dist/ for your files.
 ###
@@ -258,10 +258,10 @@ EXTENSIONS_DIR=extensions
 bundle: bundle_en-US
 
 all-bundles-both:
-	USE_PIDGIN=1 make -f Makefile.linux all-bundles
-	make -f Makefile.linux clean
-	USE_PIDGIN=0 make -f Makefile.linux all-bundles
-	make -f Makefile.linux clean
+	USE_PIDGIN=1 make -f linux.mk all-bundles
+	make -f linux.mk clean
+	USE_PIDGIN=0 make -f linux.mk all-bundles
+	make -f linux.mk clean
 
 all-bundles: all-compressed-bundles
 
@@ -298,7 +298,7 @@ clean:
 
 ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST)
 generic-bundle.stamp:
-	make -f Makefile.linux generic-bundle
+	make -f linux.mk generic-bundle
 generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper
 	touch generic-bundle.stamp
 
@@ -445,12 +445,12 @@ langpack_%.xpi:
 ##
 
 bundle_%:
-	LANGCODE=$* make -f Makefile.linux bundle-localized
+	LANGCODE=$* make -f linux.mk bundle-localized
 compressed-bundle_%:
-	LANGCODE=$* make -f Makefile.linux compressed-bundle-localized
+	LANGCODE=$* make -f linux.mk compressed-bundle-localized
 
 bundle-localized_%.stamp:
-	make -f Makefile.linux copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref
+	make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 773e205..7363ca4 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -7,18 +7,18 @@
 ###
 ### You want to do the following currently supported activities:
 # This downloads and compiles everything
-### make -f Makefile.osx build-all-binaries
+### make -f osx.mk build-all-binaries
 # This makes a generic bundle
-### make -f Makefile.osx generic-bundle
+### make -f osx.mk generic-bundle
 # This makes the English bundle
-### make -f Makefile.osx bundle_en-US
+### make -f osx.mk bundle_en-US
 # This makes the German bundle
-### make -f Makefile.osx bundle_de
+### make -f osx.mk bundle_de
 # This makes the German compressed bundle
-### make -f Makefile.osx compressed-bundle_de 
+### make -f osx.mk compressed-bundle_de 
 # It's possible you may also want to do:
-### make -f Makefile.osx build-all-binaries
-### make -f Makefile.osx all-compressed-bundles
+### make -f osx.mk build-all-binaries
+### make -f osx.mk all-compressed-bundles
 ### ...
 ### Look in tbbosx-dist/ for your files.
 ###
@@ -251,14 +251,14 @@ EXTENSIONS_DIR=extensions
 bundle: bundle_en-US
 
 all-bundles-both:
-	USE_PIDGIN=1 make -f Makefile.osx all-bundles
-	make -f Makefile.osx clean
-	USE_PIDGIN=0 make -f Makefile.osx all-bundles
-	make -f Makefile.osx clean
-	USE_SANDBOX=1 make -f Makefile.osx all-bundles
-	make -f Makefile.osx clean
-	USE_SANDBOX=0 make -f Makefile.osx all-bundles
-	make -f Makefile.osx clean
+	USE_PIDGIN=1 make -f osx.mk all-bundles
+	make -f osx.mk clean
+	USE_PIDGIN=0 make -f osx.mk all-bundles
+	make -f osx.mk clean
+	USE_SANDBOX=1 make -f osx.mk all-bundles
+	make -f osx.mk clean
+	USE_SANDBOX=0 make -f osx.mk all-bundles
+	make -f osx.mk clean
 
 all-bundles: all-compressed-bundles
 
@@ -294,7 +294,7 @@ clean:
 
 ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST)
 generic-bundle.stamp:
-	make -f Makefile.osx generic-bundle
+	make -f osx.mk generic-bundle
 generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper
 	touch generic-bundle.stamp
 
@@ -438,11 +438,11 @@ langpack_%.xpi:
 ##
 
 bundle_%:
-	LANGCODE=$* make -f Makefile.osx bundle-localized
+	LANGCODE=$* make -f osx.mk bundle-localized
 compressed-bundle_%:
-	LANGCODE=$* make -f Makefile.osx compressed-bundle-localized
+	LANGCODE=$* make -f osx.mk compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f Makefile.osx copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
+	make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
-- 
1.7.1

Prev by Author: [or-cvs] [torbrowser/master] lock down firefox a bit more, bump tbb versions for pending release, and change Makefile names for easier usage
Next by Author: [or-cvs] [torbrowser/master] add torbutton target back
Previous by thread: [or-cvs] r24041: {arm} Adding summaries for the rest of the general category option (arm/trunk/src)
Next by thread: [or-cvs] [torbrowser/master] add torbutton target back
Index(es):
- Author
- Thread