[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 62f7b7a3d13e128238eb3424fbb12531adf8e78d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 01:40:45 2009 +0000

    2009-11-13  Yaar Schnitman  <yaar at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Chromium WebKit Port to compile as dynamic lib
    
            https://bugs.webkit.org/show_bug.cgi?id=31478
    
            * WebKit.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b756277..9c861c0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13  Yaar Schnitman  <yaar at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Chromium WebKit Port to compile as dynamic lib
+
+        https://bugs.webkit.org/show_bug.cgi?id=31478
+
+        * WebKit.gyp:
+
 2009-11-13  Aaron Boodman  <aa at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 8550e5a..ab08dc9 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -34,14 +34,17 @@
     ],
     'variables': {
         'conditions': [
-            # Location of the chromium src directory.
+            # Location of the chromium src directory and target type is different
+            # if webkit is built inside chromium or as standalone project.
             ['inside_chromium_build==0', {
                 # Webkit is being built outside of the full chromium project.
                 # e.g. via build-webkit --chromium
                 'chromium_src_dir': '.',
+                'webkit_target_type': 'shared_library',
             },{
                 # WebKit is checked out in src/chromium/third_party/WebKit
                 'chromium_src_dir': '../../../..',
+                'webkit_target_type': 'static_library',
             }],
             # We can't turn on warnings on Windows and Linux until we upstream the
             # WebKit API.
@@ -53,7 +56,7 @@
     'targets': [
         {
             'target_name': 'webkit',
-            'type': '<(library)',
+            'type': '<(webkit_target_type)',
             'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
             'dependencies': [
                 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',

-- 
WebKit Debian packaging