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

printing/printing.gyp

Index: printing/printing.gyp
===================================================================
--- printing/printing.gyp	(revision 82994)
+++ printing/printing.gyp	(working copy)
@@ -125,6 +125,16 @@
           ],
         }],
         ['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.
@@ -135,22 +145,6 @@
             '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',
-                ],
-              },
-            }],
-          ],
         }],
       ],
     },
@@ -201,6 +195,34 @@
         }],
       ],
     },
+    {
+      'target_name': 'cups',
+      'type': 'none',
+      'conditions': [
+        ['use_cups==1', {
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_CUPS',
+            ],
+            'conditions': [
+              ['OS=="mac"', {
+                'link_settings': {
+                  'libraries': [
+                    '$(SDKROOT)/usr/lib/libcups.dylib',
+                  ]
+                },
+              }, {
+                'link_settings': {
+                  'libraries': [

[Mark Mentovai, 2011/04/28 15:13:53]

I really only wanted to get cups-config out of the Mac workflow, if you want to
put the cflags/ldflags invocations of cups-config here in the non-Mac section, I
think that’s fine. Given the variation in the Linux world, it might even be a
good idea.

Your call.

+                    '<!@(cups-config --libs)',
+                  ],
+                },
+              }],
+            ],
+          },
+        }],
+      ],
+    },
   ],
 }