Linux: Simplify gtk-related dependencies in cef.gyp.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1206 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-04-10 23:53:25 +00:00
parent ef5142d9b3
commit 9a34a5d5da

39
cef.gyp
View File

@ -99,11 +99,6 @@
'<(DEPTH)/sandbox/sandbox.gyp:sandbox', '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
], ],
}], }],
['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
[ 'OS=="mac"', { [ 'OS=="mac"', {
'product_name': 'cefclient', 'product_name': 'cefclient',
'dependencies': [ 'dependencies': [
@ -212,6 +207,9 @@
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'sources': [ 'sources': [
'<@(includes_linux)', '<@(includes_linux)',
'<@(cefclient_sources_linux)', '<@(cefclient_sources_linux)',
@ -415,6 +413,11 @@
'tests/unittests/run_all_unittests_mac.mm', 'tests/unittests/run_all_unittests_mac.mm',
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
], ],
}, },
{ {
@ -453,11 +456,6 @@
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
], ],
}], }],
['toolkit_uses_gtk == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
['OS=="win"', { ['OS=="win"', {
'configurations': { 'configurations': {
'Debug_Base': { 'Debug_Base': {
@ -491,20 +489,8 @@
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies':[ 'dependencies':[
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
'<(DEPTH)/build/linux/system.gyp:gtk',
], ],
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
],
},
'link_settings': {
'ldflags': [
'<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
],
'libraries': [
'<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
],
},
}], }],
], ],
}, },
@ -527,6 +513,13 @@
'<@(includes_wrapper)', '<@(includes_wrapper)',
'<@(libcef_dll_wrapper_sources_common)', '<@(libcef_dll_wrapper_sources_common)',
], ],
'conditions': [
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}],
],
}, },
{ {
# Create the pack file for CEF strings. # Create the pack file for CEF strings.