Use gyp targets to link in X11 libraries instead of setting -lXfoo

This sets up gyp targets for the various X11 libraries we use and uses
pkg-config to determine the correct cflags/ldflags incantations to use to
link against them instead of listing out -lXfoo lines in libraries sections
in gyp targets throughout the tree.  This is more likely to generate the right
lines and makes the dependencies a bit more explicit.

BUG=339518

Review URL: https://codereview.chromium.org/153223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248939 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/ui/ui.gyp b/ui/ui.gyp
index 28148e3..e731809 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -527,25 +527,23 @@
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
+            # TODO(jamesr): Targets using X11 should declare dependencies on the
+            # appropriate build/linux/system.gyp targets themselves instead of
+            # independently picking it up from ui.
             'link_settings': {
               'libraries': [
                 '-lX11',
                 '-lXcursor',
-                '-lXrender',  # For XRender* function calls in x11_util.cc.
+                '-lXrender',
               ],
             },
           },
-          'link_settings': {
-            'libraries': [
-              '-lX11',
-              '-lXcursor',
-              '-lXrender',  # For XRender* function calls in x11_util.cc.
-            ],
-          },
           'dependencies': [
             '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xcursor',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xfixes',
+            '../build/linux/system.gyp:xrender',  # For XRender* function calls in x11_util.cc.
           ],
         }],
         ['use_ozone==0', {