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

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

Issue 6648002: Make DBUS an optional dependency so Chromium can be built without it.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « build/common.gypi ('k') | chrome/browser/browser_main.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ], 316 ],
317 }, 317 },
318 }], 318 }],
319 ], 319 ],
320 }], 320 }],
321 ], 321 ],
322 }, 322 },
323 { 323 {
324 'target_name': 'dbus-glib', 324 'target_name': 'dbus-glib',
325 'type': 'settings', 325 'type': 'settings',
326 'direct_dependent_settings': { 326 'conditions': [
327 'cflags': [ 327 ['use_dbus==1 and _toolset=="target"', {
328 '<!@(<(pkg-config) --cflags dbus-glib-1)', 328 'direct_dependent_settings': {
329 ], 329 'cflags': [
330 }, 330 '<!@(<(pkg-config) --cflags dbus-glib-1)',
331 'link_settings': { 331 ],
332 'ldflags': [ 332 'defines': [
333 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', 333 'USE_DBUS',
334 ], 334 ],
335 'libraries': [ 335 },
336 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', 336 'link_settings': {
337 ], 337 'ldflags': [
338 }, 338 '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
339 ],
340 'libraries': [
341 '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
342 ],
343 },
344 }]
345 ]
339 }, 346 },
340 { 347 {
341 'target_name': 'libresolv', 348 'target_name': 'libresolv',
342 'type': 'settings', 349 'type': 'settings',
343 'link_settings': { 350 'link_settings': {
344 'libraries': [ 351 'libraries': [
345 '-lresolv', 352 '-lresolv',
346 ], 353 ],
347 }, 354 },
348 }, 355 },
(...skipping 22 matching lines...) Expand all
371 ], 378 ],
372 }, 379 },
373 ], 380 ],
374 } 381 }
375 382
376 # Local Variables: 383 # Local Variables:
377 # tab-width:2 384 # tab-width:2
378 # indent-tabs-mode:nil 385 # indent-tabs-mode:nil
379 # End: 386 # End:
380 # vim: set expandtab tabstop=2 shiftwidth=2: 387 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698