Chromium Code Reviews| Index: build/linux/system.gyp |
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
| index 09ee713634dec18e4cb2b8d842b66d7715ce6d81..8a27c207ddc7fcdc2cf0575afedb0cc89abcc7f5 100644 |
| --- a/build/linux/system.gyp |
| +++ b/build/linux/system.gyp |
| @@ -658,6 +658,46 @@ |
| }, |
| ], |
| }], |
| + ['use_pango==1 and use_cairo==1', { |
| + 'targets': [ |
| + { |
| + 'target_name': 'pangocairo', |
| + 'type': 'none', |
|
Nico
2015/01/13 22:55:50
Please keep the target available unconditionally,
sfunkenhauser-google
2015/01/14 17:13:58
Done.
|
| + 'toolsets': ['host', 'target'], |
| + 'conditions': [ |
| + ['_toolset=="target"', { |
| + 'direct_dependent_settings': { |
| + 'cflags': [ |
| + '<!@(<(pkg-config) --cflags pangocairo pangoft2)', |
| + ], |
| + }, |
| + 'link_settings': { |
| + 'ldflags': [ |
| + '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)', |
| + ], |
| + 'libraries': [ |
| + '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)', |
| + ], |
| + }, |
| + }, { |
| + 'direct_dependent_settings': { |
| + 'cflags': [ |
| + '<!@(pkg-config --cflags pangocairo pangoft2)', |
| + ], |
| + }, |
| + 'link_settings': { |
| + 'ldflags': [ |
| + '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)', |
| + ], |
| + 'libraries': [ |
| + '<!@(pkg-config --libs-only-l pangocairo pangoft2)', |
| + ], |
| + }, |
| + }], |
| + ], |
| + }, |
| + ], |
| + }], |
| ], # conditions |
| 'targets': [ |
| { |
| @@ -1106,42 +1146,6 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'pangocairo', |
| - 'type': 'none', |
| - 'toolsets': ['host', 'target'], |
| - 'conditions': [ |
| - ['_toolset=="target"', { |
| - 'direct_dependent_settings': { |
| - 'cflags': [ |
| - '<!@(<(pkg-config) --cflags pangocairo pangoft2)', |
| - ], |
| - }, |
| - 'link_settings': { |
| - 'ldflags': [ |
| - '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)', |
| - ], |
| - 'libraries': [ |
| - '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)', |
| - ], |
| - }, |
| - }, { |
| - 'direct_dependent_settings': { |
| - 'cflags': [ |
| - '<!@(pkg-config --cflags pangocairo pangoft2)', |
| - ], |
| - }, |
| - 'link_settings': { |
| - 'ldflags': [ |
| - '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)', |
| - ], |
| - 'libraries': [ |
| - '<!@(pkg-config --libs-only-l pangocairo pangoft2)', |
| - ], |
| - }, |
| - }], |
| - ], |
| - }, |
| - { |
| 'target_name': 'ssl', |
| 'type': 'none', |
| 'conditions': [ |