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

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

Issue 4691001: Make GConf dependency optional. (Closed)
Patch Set: Created 10 years, 1 month 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/gtk/browser_titlebar.h » ('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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 'libraries': [ 181 'libraries': [
182 '<!@(<(pkg-config) --libs-only-l gdk-2.0)', 182 '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
183 ], 183 ],
184 }, 184 },
185 }]] 185 }]]
186 }, 186 },
187 { 187 {
188 'target_name': 'gconf', 188 'target_name': 'gconf',
189 'type': 'settings', 189 'type': 'settings',
190 'conditions': [ 190 'conditions': [
191 ['_toolset=="target"', { 191 ['use_gconf==1 and _toolset=="target"', {
192 'direct_dependent_settings': { 192 'direct_dependent_settings': {
193 'cflags': [ 193 'cflags': [
194 '<!@(<(pkg-config) --cflags gconf-2.0)', 194 '<!@(<(pkg-config) --cflags gconf-2.0)',
195 ], 195 ],
196 'defines': [
197 'USE_GCONF',
198 ],
196 }, 199 },
197 'link_settings': { 200 'link_settings': {
198 'ldflags': [ 201 'ldflags': [
199 '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', 202 '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)',
200 ], 203 ],
201 'libraries': [ 204 'libraries': [
202 '<!@(<(pkg-config) --libs-only-l gconf-2.0)', 205 '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
203 ], 206 ],
204 }, 207 },
205 }]] 208 }]]
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 ], 351 ],
349 }, 352 },
350 ], 353 ],
351 } 354 }
352 355
353 # Local Variables: 356 # Local Variables:
354 # tab-width:2 357 # tab-width:2
355 # indent-tabs-mode:nil 358 # indent-tabs-mode:nil
356 # End: 359 # End:
357 # vim: set expandtab tabstop=2 shiftwidth=2: 360 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/gtk/browser_titlebar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698