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

Side by Side Diff: build/linux/system.gyp

Issue 7467031: Add libdbus dependency for Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert all.gyp Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | dbus/dbus.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1 )', 405 '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1 )',
406 ], 406 ],
407 'libraries': [ 407 'libraries': [
408 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)', 408 '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
409 ], 409 ],
410 }, 410 },
411 }], 411 }],
412 ], 412 ],
413 }, 413 },
414 { 414 {
415 'target_name': 'dbus',
416 'type': 'settings',
417 'direct_dependent_settings': {
418 'cflags': [
419 '<!@(<(pkg-config) --cflags dbus-1)',
420 ],
421 },
422 'link_settings': {
423 'ldflags': [
424 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
425 ],
426 'libraries': [
427 '<!@(<(pkg-config) --libs-only-l dbus-1)',
428 ],
429 },
430 },
431 {
432 # TODO(satorux): Remove this once dbus-glib clients are gone.
415 'target_name': 'dbus-glib', 433 'target_name': 'dbus-glib',
416 'type': 'settings', 434 'type': 'settings',
417 'direct_dependent_settings': { 435 'direct_dependent_settings': {
418 'cflags': [ 436 'cflags': [
419 '<!@(<(pkg-config) --cflags dbus-glib-1)', 437 '<!@(<(pkg-config) --cflags dbus-glib-1)',
420 ], 438 ],
421 }, 439 },
422 'link_settings': { 440 'link_settings': {
423 'ldflags': [ 441 'ldflags': [
424 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', 442 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 ], 475 ],
458 'libraries': [ 476 'libraries': [
459 '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)" )', 477 '<!@(<(pkg-config) --libs-only-l "ibus-1.0 >= <(ibus_min_version)" )',
460 ], 478 ],
461 }, 479 },
462 }], 480 }],
463 ], 481 ],
464 }, 482 },
465 ], 483 ],
466 } 484 }
OLDNEW
« no previous file with comments | « no previous file | dbus/dbus.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698