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 /chrome/chrome.gyp | |
| 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 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 73aeb1e..3f53f8e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -807,6 +807,9 @@ ], }], ['use_cups==1', { + 'dependencies': [ + '../printing/printing.gyp:cups', + ], 'defines': [ # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation # of cloud print system, and allows to use custom implementaiton. @@ -815,22 +818,6 @@ 'sources': [ 'service/cloud_print/print_system_cups.cc', ], - 'conditions': [ - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/usr/lib/libcups.dylib', - ] - }, - }, { - 'link_settings': { - 'libraries': [ - '-lcups', - '-lgcrypt', - ], - }, - }], - ], }], ['remoting==1', { 'dependencies': [ |