[haiku-commits] haiku: hrev44300 - build/jam

From: mattmadia@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 9 Jul 2012 02:07:15 +0200 (CEST)
hrev44300 adds 1 changeset to branch 'master'
old head: fbd52296f33708bd923ba1625845fa4e4a79964e
new head: 7101dd4b29e3b2732e4852af6b14b2fa9d08f5be

----------------------------------------------------------------------------

7101dd4: Whitespace cleanup. No functional change.

                                        [ Matt Madia <mattmadia@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44300
Commit:      7101dd4b29e3b2732e4852af6b14b2fa9d08f5be
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7101dd4
Author:      Matt Madia <mattmadia@xxxxxxxxx>
Date:        Sun Jul  8 20:12:07 2012 UTC

----------------------------------------------------------------------------

1 file changed, 18 insertions(+), 19 deletions(-)
build/jam/OptionalBuildFeatures |   37 +++++++++++++++++------------------

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 8e4fc87..17bf698 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -421,33 +421,32 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 
 
 # WebKit
+HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
 if $(TARGET_ARCH) = x86 {
        if $(HAIKU_GCC_VERSION[1]) < 4 {
                Echo "WebKit support not available on gcc 
$(HAIKU_GCC_VERSION[1])" ;
        } else {
-           HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
+               local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
+                       : $(baseURL)/$(HAIKU_WEBKIT_FILE) ] ;
 
-           local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
-                   : $(baseURL)/$(HAIKU_WEBKIT_FILE) ] ;
+               HAIKU_WEBKIT_DIR = [ FDirName 
$(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+                       $(HAIKU_WEBKIT_FILE:B) ] ;
 
-           HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
-                   $(HAIKU_WEBKIT_FILE:B) ] ;
+               HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive 
$(HAIKU_WEBKIT_DIR)
+                       : include/ : $(zipFile) : extracted-webkit ] ;
 
-           HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive 
$(HAIKU_WEBKIT_DIR)
-                   : include/ : $(zipFile) : extracted-webkit ] ;
-
-           HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
-                   :
-                   lib/libwtf.so
-                   lib/libjavascriptcore.so
-                   lib/libwebcore.so
-                   lib/libwebkit.so
-                   : $(zipFile)
-                   : extracted-webkit
-           ] ;
+               HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+                       :
+                       lib/libwtf.so
+                       lib/libjavascriptcore.so
+                       lib/libwebcore.so
+                       lib/libwebkit.so
+                       : $(zipFile)
+                       : extracted-webkit
+               ] ;
 
-           HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
-    }
+               HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] 
;
+       }
 } else {
        Echo "WebKit support not available on $(TARGET_ARCH)" ;
 }
[haiku-commits] haiku: hrev44300 - build/jam

Other related posts:
