diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 06:49:30 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 06:49:30 +0000 |
| commit | 732fa94a7ac29dd39eb6afcb321ba97921660383 (patch) | |
| tree | b075741f6fe9b3a067d1a32321428a38a10069e1 /build | |
| parent | 63a8ba1e1fb71156beff23b4a26828dbc387c734 (diff) | |
| download | chromium_src-732fa94a7ac29dd39eb6afcb321ba97921660383.zip chromium_src-732fa94a7ac29dd39eb6afcb321ba97921660383.tar.gz chromium_src-732fa94a7ac29dd39eb6afcb321ba97921660383.tar.bz2 | |
Linux: clean up the usage of "use_cups" gyp switch:
This CL removes duplication and fixes a build error
on system with no CUPS. It uses cups-config instead of
hardcoding flags.
Also, it removes a superfluous dependency on gcrypt
from chrome_browser.gypi. printing uses gcrypt explicitly,
but chrome/browser doesn't. It was just blindly copy-pasted.
I just extracted libgcrypt target to build/linux/system.gyp,
and switched to libgcrypt-config instead of hardcoding flags.
BUG=none
Review URL: http://codereview.chromium.org/6883221
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index cbe51940..9a160b7 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -270,6 +270,23 @@ }]] }, { + 'target_name': 'libgcrypt', + 'type': 'settings', + 'conditions': [ + ['_toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(libgcrypt-config --cflags)', + ], + }, + 'link_settings': { + 'libraries': [ + '<!@(libgcrypt-config --libs)', + ], + }, + }]] + }, + { 'target_name': 'selinux', 'type': 'settings', 'conditions': [ |