diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 09:09:30 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 09:09:30 +0000 |
| commit | 6ee05a5b3e33668d67deb9a000ba5d32b3104c7a (patch) | |
| tree | 0d78e2b5b7840b20c4f03d609e6ea507709ad251 /remoting/remoting_host.gypi | |
| parent | a464cc798130d851a1bb61d7b150fe4b9118d94d (diff) | |
| download | chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.zip chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.tar.gz chromium_src-6ee05a5b3e33668d67deb9a000ba5d32b3104c7a.tar.bz2 | |
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
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 620f722..b240fb7 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -253,15 +253,15 @@ 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:x11', + '../build/linux/system.gyp:xext', + '../build/linux/system.gyp:xfixes', + '../build/linux/system.gyp:xi', + '../build/linux/system.gyp:xrandr', + '../build/linux/system.gyp:xtst', ], 'link_settings': { 'libraries': [ - '-lX11', - '-lXext', - '-lXfixes', - '-lXtst', - '-lXi', - '-lXrandr', '-lpam', ], }, |