[llvm-commits] [hlvm] r38226 - /hlvm/trunk/Makefile

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:01:21 2007
New Revision: 38226

URL: http://llvm.org/viewvc/llvm-project?rev=38226&view=rev
Log:
Add an SCONSOPTS variable to control options given to scons on every invocation.
This helps with -Q (quiet) and -j (parallel build) options.

Modified:
    hlvm/trunk/Makefile

Modified: hlvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/Makefile?rev=38226&r1=38225&r2=38226&view=diff

==============================================================================
--- hlvm/trunk/Makefile (original)
+++ hlvm/trunk/Makefile Sat Jul  7 19:01:21 2007
@@ -18,42 +18,44 @@
 # Specify where you want HLVM to be installed
 MYPREFIX := /proj/install/hlvm
 
+SCONSOPTS := -Q -j 2
+
 .PHONY: all debug Debug optimized Optimized release Release check clean \
 	install hlvm tools
 
 all:
-	scons -Q mode=$(MYMODE)
+	scons $(SCONSOPTS) mode=$(MYMODE)
 
 debug Debug:
-	scons -Q mode=Debug debug=1 assertions=1 optimized=0 inline=0 \
-	small=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	scons $(SCONSOPTS)  mode=Debug debug=1 assertions=1 optimized=0 \
+	inline=0 small=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
 
 optimized Optimized:
-	scons -Q mode=Optimized debug=0 assertions=1 optimized=1 inline=1 \
-	small=0 strip=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	scons $(SCONSOPTS)  mode=Optimized debug=0 assertions=1 optimized=1 \
+	inline=1 small=0 strip=0 confpath=$(MYPATH) prefix=$(MYPREFIX)
 
 release Release:
-	scons -Q mode=Release debug=0 assertions=0 optimized=1 inline=1 \
-	small=1 strip=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	scons $(SCONSOPTS) mode=Release debug=0 assertions=0 optimized=1 \
+	inline=1 small=1 strip=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
 
 profile Profile:
-	scons -Q mode=Profile debug=0 assertions=0 optimized=1 inline=1 \
-	small=0 strip=0 profile=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
+	scons $(SCONSOPTS) mode=Profile debug=0 assertions=0 optimized=1  \
+	inline=1 small=0 strip=0 profile=1 confpath=$(MYPATH) prefix=$(MYPREFIX)
 
-check:  all
-	scons -Q check mode=$(MYMODE)
+check: 
+	scons $(SCONSOPTS) check mode=$(MYMODE)
 
 clean:
-	scons -Q --clean mode=$(MYMODE)
+	scons $(SCONSOPTS) --clean mode=$(MYMODE)
 
 install:
-	scons -Q install mode=$(MYMODE)
+	scons $(SCONSOPTS) install mode=$(MYMODE)
 
 doc:
-	scons -Q docs mode=$(MYMODE)
+	scons $(SCONSOPTS) docs mode=$(MYMODE)
 
 hlvm:
-	cd hlvm ; scons -Q -u mode=$(MYMODE)
+	cd hlvm ; scons $(SCONSOPTS) -u mode=$(MYMODE)
 
 tools:
-	cd tools ; scons -Q -u mode=$(MYMODE)
+	cd tools ; scons $(SCONSOPTS) -u mode=$(MYMODE)