[or-cvs] r15044: Separate clean and reallyclean Makefile rules Add a rule for (torbrowser/trunk/build-scripts)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-06-08 16:05:10 -0400 (Sun, 08 Jun 2008)
New Revision: 15044

Modified:
   torbrowser/trunk/build-scripts/Makefile
Log:
Separate clean and reallyclean Makefile rules
Add a rule for building both Tor Browser Bundles and Tor IM Browser Bundles

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-06-08 20:03:31 UTC (rev 15043)
+++ torbrowser/trunk/build-scripts/Makefile	2008-06-08 20:05:10 UTC (rev 15044)
@@ -22,9 +22,6 @@
 FIREFOX_SRC=/c/build/FirefoxPortable
 PIDGIN_SRC=/c/build/PidginPortable
 
-## Do we install Pidgin?
-USE_PIDGIN=1
-
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
 WGET:=/c/Python25/python.exe $(shell pwd)/pyget.py
@@ -44,7 +41,11 @@
 
 ## Version and name of the compressed bundle (also used for source)
 VERSION=1.0.3
+ifeq ($(USE_PIDGIN),1)
+COMPRESSED_NAME=tor-im-browser-$(VERSION)
+else
 COMPRESSED_NAME=tor-browser-$(VERSION)
+endif
 
 ## Extensions to install by default
 DEFAULT_EXTENSIONS=torbutton.xpi
@@ -68,6 +69,12 @@
 
 bundle: bundle_en-US
 
+all-bundles-both:
+	USE_PIDGIN=1 make all-bundles
+	USE_PIDGIN=1 make clean
+	USE_PIDGIN=0 make all-bundles
+	USE_PIDGIN=0 make clean
+
 all-bundles: all-compressed-bundles all-split-bundles
 
 all-compressed-bundles: compressed-bundle_ar \
@@ -99,13 +106,15 @@
 clean:
 	rm -fr $(DEST) *.stamp
 	rm -f *~
-	rm -fr *.xpi
-	rm -f "Tor Browser.exe"
+	rm -fr *.xpi *.jar
 	rm -fr $(NAME)_*
-	rm -fr $(COMPRESSED_NAME)_*.exe
-	rm -fr $(COMPRESSED_NAME)_*.rar
 	cd ../src/RelativeLink/ && $(MAKE) clean
 
+## Also remove the output files
+reallyclean: clean
+	rm -fr $(COMPRESSED_NAME)_*.exe
+	rm -fr $(COMPRESSED_NAME)_*.rar	
+
 ##
 ## Generate a non-localized bundle and put in $(DEST)
 ##