Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: build/linux/system.gyp

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | ui/ui.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index bfef936e1f443c5761a037808de3d27909b3fe89..8c0c0d19cdbdef213fc6473af77fc461e98eab2b 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -330,9 +330,7 @@
},
}],
['use_x11==1', {
- 'link_settings': {
- 'libraries': [ '-lXtst' ]
- }
+ 'dependencies': [ 'xtst' ],
}],
],
},
@@ -797,6 +795,69 @@
],
},
{
+ 'target_name': 'xcursor',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
piman 2014/02/04 00:25:14 nit: you don't need that conditional if you don't
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xcursor)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xcursor)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xcursor)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
+ 'target_name': 'xcomposite',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xcomposite)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xcomposite)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xcomposite)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
+ 'target_name': 'xdamage',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xdamage)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xdamage)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xdamage)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
'target_name': 'xext',
'type': 'none',
'conditions': [
@@ -839,6 +900,27 @@
],
},
{
+ 'target_name': 'xi',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xi)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xi)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
'target_name': 'xrandr',
'type': 'none',
'toolsets': ['host', 'target'],
@@ -874,5 +956,47 @@
}],
],
},
+ {
+ 'target_name': 'xrender',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xrender)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xrender)',
+ ],
+ },
+ }],
+ ],
+ },
+ {
+ 'target_name': 'xtst',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags xtst)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l xtst)',
+ ],
+ },
+ }],
+ ],
+ }
],
}
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | ui/ui.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698