diff options
| author | Matt Madia <mattmadia@gmail.com> | 2012-07-08 20:12:07 +0000 |
|---|---|---|
| committer | Matt Madia <mattmadia@gmail.com> | 2012-07-08 20:12:07 +0000 |
| commit | 7101dd4b29e3b2732e4852af6b14b2fa9d08f5be (patch) | |
| tree | 635cda67002947382aadc784f9c045d434d86338 | |
| parent | fbd52296f33708bd923ba1625845fa4e4a79964e (diff) | |
Whitespace cleanup. No functional change.hrev44300
| -rw-r--r-- | build/jam/OptionalBuildFeatures | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 8e4fc879d2..17bf69868d 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)" ; } |