Linux: clean up the usage of "use_cups" gyp switch:

printing/printing.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 107 matching lines @@
             # of the print backend and enables a custom implementation instead.
             'PRINT_BACKEND_AVAILABLE',
           ],
           'sources': [
             'backend/win_helper.cc',
             'backend/win_helper.h',
             'backend/print_backend_win.cc',
           ],
         }],
         ['use_cups==1', {
+          'dependencies': [
+            'cups',
+          ],
+          'conditions': [
+            ['OS!="mac"', {
+              'dependencies': [
+                '../build/linux/system.gyp:libgcrypt',
+              ],
+            }],
+          ],
           'defines': [
             # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
             # of the print backend and enables a custom implementation instead.
             'PRINT_BACKEND_AVAILABLE',
           ],
           'sources': [
             'backend/cups_helper.cc',
             'backend/cups_helper.h',
             'backend/print_backend_cups.cc',
           ],
-          'conditions': [
-            ['OS=="mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/usr/lib/libcups.dylib',
-                ]
-              },
-            }, {
-              'link_settings': {
-                'libraries': [
-                  '-lcups',
-                  '-lgcrypt',
-                ],
-              },
-            }],
-          ],
         }],
       ],
     },
     {
       'target_name': 'printing_unittests',
       'type': 'executable',
       'msvs_guid': '8B2EE5D9-41BC-4AA2-A401-2DC143A05D2E',
       'dependencies': [
         'printing',
         '../testing/gtest.gyp:gtest',
@@ skipping 30 matching lines @@
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
+    {
+      'target_name': 'cups',
+      'type': 'none',
+      'conditions': [
+        ['use_cups==1', {
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_CUPS',
+            ],
+            'cflags': [
+              '<!@(cups-config --cflags)',

[Mark Mentovai, 2011/04/28 14:17:28]

I’d like to avoid running cups-config at all on the Mac, where it’s pointless
and returns empty strings anyway.

[Paweł Hajdan Jr., 2011/04/28 15:07:39]

Done.

+            ],
+            'ldflags': [
+              '<!@(cups-config --ldflags)',
+            ],
+            'conditions': [
+              ['OS=="mac"', {
+                'link_settings': {
+                  'libraries': [
+                    '$(SDKROOT)/usr/lib/libcups.dylib',
+                  ]
+                },
+              }, {
+                'link_settings': {
+                  'libraries': [
+                    '<!@(cups-config --libs)',
+                  ],
+                },
+              }],
+            ],
+          },
+        }],
+      ],
+    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: