From 7ff8b9bfb27f6c7ca0ac6d42e027f3aa1551b70b Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 10 Apr 2013 23:54:02 +0000
Subject: [PATCH] Merge revision 1206 changes: - Linux: Simplify gtk-related
 dependencies in cef.gyp.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1207 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef3/cef.gyp | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/cef3/cef.gyp b/cef3/cef.gyp
index db9f4c3d6..3d6f63e99 100644
--- a/cef3/cef.gyp
+++ b/cef3/cef.gyp
@@ -99,11 +99,6 @@
             '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-        }],
         [ 'OS=="mac"', {
           'product_name': 'cefclient',
           'dependencies': [
@@ -212,6 +207,9 @@
           ],
         }],
         [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:gtk',
+          ],
           'sources': [
             '<@(includes_linux)',
             '<@(cefclient_sources_linux)',
@@ -415,6 +413,11 @@
             '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',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-        }],
         ['OS=="win"', {
           'configurations': {
             'Debug_Base': {
@@ -491,20 +489,8 @@
         [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies':[
             '<(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)',
         '<@(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.