Clean up dependencies on X11 libraries

build/linux/system.gyp

Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e785b8ef5731c9f9920e975c6eab88288c63fa86..94163fc21fd4d96ad0bae68f8437a4e0a399943a 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -296,6 +296,9 @@
       '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',
       },
@@ -329,11 +332,6 @@
             ],
           },
         }],
-        ['use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXtst' ]
-          }
-        }],
       ],
     },
     {
@@ -952,21 +950,57 @@
       },
     },
     {
-      'target_name': 'xtst',
+      'target_name': 'xscrnsaver',
       'type': 'none',
       'direct_dependent_settings': {
         'cflags': [
-          '<!@(<(pkg-config) --cflags xtst)',
+          '<!@(<(pkg-config) --cflags xscrnsaver)',
         ],
       },
       'link_settings': {
         'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
+          '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)',
         ],
         'libraries': [
-          '<!@(<(pkg-config) --libs-only-l xtst)',
+          '<!@(<(pkg-config) --libs-only-l xscrnsaver)',
         ],
       },
+    },
+    {
+      'target_name': 'xtst',
+      'type': 'none',
+      '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)',
+            ],
+          },
+        }]
+      ]
     }
   ],
 }