Index: WebCore/WebCore.gyp/WebCore.gyp |
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp |
index 317318318c7f86fd8e077360074ffe0b6ecc2c33..66bd2a124950ba43170dbba80673a2a948e2a220 100644 |
--- a/WebCore/WebCore.gyp/WebCore.gyp |
+++ b/WebCore/WebCore.gyp/WebCore.gyp |
@@ -856,17 +856,13 @@ |
}, |
}, |
{ |
- 'target_name': 'webcore', |
+ # TODO: To be the remaining, there must be other sibbling projects. |
+ # Will be done in a separate change to keep the diff simpler. |
+ 'target_name': 'webcore_remaining', |
'type': '<(library)', |
'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6', |
'dependencies': [ |
'webcore_prerequisites', |
- # Exported. |
- 'webcore_bindings', |
- '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', |
- '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', |
- '<(chromium_src_dir)/skia/skia.gyp:skia', |
- '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', |
], |
'sources': [ |
'<@(webcore_files)', |
@@ -960,21 +956,6 @@ |
'../dom/default/PlatformMessagePortChannel.h', |
], |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '<@(webcore_include_dirs)', |
- ], |
- 'mac_framework_dirs': [ |
- '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', |
- ], |
- }, |
- 'export_dependent_settings': [ |
- 'webcore_bindings', |
- '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', |
- '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', |
- '<(chromium_src_dir)/skia/skia.gyp:skia', |
- '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', |
- ], |
'link_settings': { |
'mac_bundle_resources': [ |
'../Resources/aliasCursor.png', |
@@ -1027,9 +1008,6 @@ |
'dependencies': [ |
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', |
], |
- 'export_dependent_settings': [ |
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', |
- ], |
'conditions': [ |
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', { |
'defines': [ |
@@ -1240,12 +1218,6 @@ |
# Again, Skia is not used on Mac. |
'../platform/chromium/DragImageChromiumSkia.cpp', |
], |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '../../WebKitLibraries', |
- '../../WebKit/mac/WebCoreSupport', |
- ], |
- }, |
}], |
['OS=="win"', { |
'dependencies': [ |
@@ -1265,9 +1237,6 @@ |
# This is needed because Event.h in this directory is blocked |
# by a system header on windows. |
'include_dirs++': ['../dom'], |
- 'direct_dependent_settings': { |
- 'include_dirs+++': ['../dom'], |
- }, |
}], |
['OS!="linux" and OS!="freebsd"', { |
'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']] |
@@ -1290,5 +1259,56 @@ |
}], |
], |
}, |
+ { |
+ 'target_name': 'webcore', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'webcore_remaining', |
+ # Exported. |
+ 'webcore_bindings', |
+ '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', |
+ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', |
+ '<(chromium_src_dir)/skia/skia.gyp:skia', |
+ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', |
+ ], |
+ 'export_dependent_settings': [ |
+ 'webcore_bindings', |
+ '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', |
+ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', |
+ '<(chromium_src_dir)/skia/skia.gyp:skia', |
+ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'include_dirs': [ |
+ '<@(webcore_include_dirs)', |
+ ], |
+ 'mac_framework_dirs': [ |
+ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', |
+ ], |
+ }, |
+ 'conditions': [ |
+ ['javascript_engine=="v8"', { |
+ 'dependencies': [ |
+ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', |
+ ], |
+ 'export_dependent_settings': [ |
+ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', |
+ ], |
+ }], |
+ ['OS=="mac"', { |
+ 'direct_dependent_settings': { |
+ 'include_dirs': [ |
+ '../../WebKitLibraries', |
+ '../../WebKit/mac/WebCoreSupport', |
+ ], |
+ }, |
+ }], |
+ ['OS=="win"', { |
+ 'direct_dependent_settings': { |
+ 'include_dirs+++': ['../dom'], |
+ }, |
+ }], |
+ ], |
+ }, |
], # targets |
} |