Clean up dependencies on X11 libraries

build/linux/system.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['sysroot!=""', {
         'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
       }, {
@@ skipping 278 matching lines @@
               'process_outputs_as_sources': 1,
             },
           ],
         }],
       ],
     },
     {
       'target_name': 'glib',
       'type': 'none',
       'toolsets': ['host', 'target'],
+      'dependencies': [
+        'xtst'
+      ],
       'variables': {
         'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
       },
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags <(glib_packages))',
             ],
           },
@@ skipping 13 matching lines @@
           },
           'link_settings': {
             'ldflags': [
               '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))',
             ],
             'libraries': [
               '<!@(pkg-config --libs-only-l <(glib_packages))',
             ],
           },
         }],
-        ['use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXtst' ]
-          }
-        }],
       ],
     },
     {
       'target_name': 'gnome_keyring',
       'type': 'none',
       'conditions': [
         ['use_gnome_keyring==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags gnome-keyring-1)',
@@ skipping 598 matching lines @@
       'link_settings': {
         'ldflags': [
           '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)',
         ],
         'libraries': [
           '<!@(<(pkg-config) --libs-only-l xrender)',
         ],
       },
     },
     {
+      'target_name': 'xscrnsaver',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(<(pkg-config) --cflags xscrnsaver)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)',
+        ],
+        'libraries': [
+          '<!@(<(pkg-config) --libs-only-l xscrnsaver)',
+        ],
+      },
+    },
+    {
       'target_name': 'xtst',
       'type': 'none',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags xtst)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l xtst)',
-        ],
-      },
+      'toolsets': ['host', 'target'],
+      'conditions': [
+        ['_toolset=="target"', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags xtst)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l xtst)',
+            ],
+          },
+        }, {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags xtst)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other xtst)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l xtst)',
+            ],
+          },
+        }]
+      ]
     }
   ],
 }