Changeset 1816
- Timestamp:
- 04/27/10 14:34:59 (11 years ago)
- Files:
-
- trunk/libffado/external/SConscript (modified) (2 diffs)
- trunk/libffado/SConstruct (modified) (5 diffs)
- trunk/libffado/support/SConscript (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/external/SConscript
r1336 r1816 1 1 # 2 # Copyright (C) 2007 -2008Arnold Krille3 # Copyright (C) 2007 -2008 Pieter Palmers2 # Copyright (C) 2007, 2008, 2010 Arnold Krille 3 # Copyright (C) 2007, 2008 Pieter Palmers 4 4 # 5 5 # This file is part of FFADO … … 26 26 env = env.Clone() 27 27 28 env.SConscript( dirs=["dbus", "libconfig"], exports="env" ) 28 dirs=['libconfig'] 29 29 30 if env['DBUS1_FLAGS']: 31 dirs.append('dbus') 32 33 env.SConscript( dirs=dirs, exports="env" ) 34 trunk/libffado/SConstruct
r1763 r1816 1 1 #! /usr/bin/python 2 2 # 3 # Copyright (C) 2007 -2008Arnold Krille4 # Copyright (C) 2007 -2008 Pieter Palmers3 # Copyright (C) 2007, 2008, 2010 Arnold Krille 4 # Copyright (C) 2007, 2008 Pieter Palmers 5 5 # Copyright (C) 2008 Jonathan Woithe 6 6 # … … 217 217 # 218 218 allpresent = 1; 219 # for DBUS C++ bindings 219 # for DBUS C++ bindings and cache-serialization. 220 220 allpresent &= conf.CheckHeader( "expat.h" ) 221 221 allpresent &= conf.CheckLib( 'expat', 'XML_ExpatVersion', '#include <expat.h>' ) 222 222 223 223 pkgs = { 224 224 'libraw1394' : '1.3.0', 225 225 'libiec61883' : '1.1.0', 226 'dbus-1' : '1.0',227 226 } 228 227 … … 301 300 """ 302 301 303 # ALSA checks 304 pkg = 'alsa' 305 name2 = pkg.replace("+","").replace(".","").replace("-","").upper() 306 env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, '1.0.0' ) 302 # 303 # Optional pkg-config 304 # 305 pkgs = { 306 'alsa': '0', 307 'dbus-1': '1.0', 308 } 309 for pkg in pkgs: 310 name2 = pkg.replace("+","").replace(".","").replace("-","").upper() 311 env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] ) 307 312 308 313 # 309 314 # Get the directory where dbus stores the service-files 310 315 # 311 env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip() 316 if env['DBUS1_FLAGS']: 317 env['dbus_service_dir'] = conf.GetPKGVariable( 'dbus-1', 'session_bus_services_dir' ).strip() 318 # this is required to indicate that the DBUS version we use has support 319 # for platform dependent threading init functions 320 # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is 321 # always true 322 env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" ) 323 else: 324 print """ 325 The dbus-headers where not found. The dbus-server for ffado will therefor not be built. 326 """ 312 327 313 328 config_guess = conf.ConfigGuess() … … 328 343 env.MergeFlags( "-Werror" ) 329 344 330 331 # this is required to indicate that the DBUS version we use has support332 # for platform dependent threading init functions333 # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is334 # always true335 env.MergeFlags( "-DDBUS_HAS_THREADS_INIT_DEFAULT" )336 345 337 346 if env['ENABLE_ALL']: … … 381 390 env.Alias( "install", env['sharedir'] ) 382 391 env.Alias( "install", env['bindir'] ) 383 env.Alias( "install", env['pypkgdir'] ) 392 if build_mixer: 393 env.Alias( "install", env['pypkgdir'] ) 384 394 385 395 # trunk/libffado/support/SConscript
r1638 r1816 1 1 # 2 # Copyright (C) 2007 -2008Arnold Krille3 # Copyright (C) 2007 -2008 Pieter Palmers2 # Copyright (C) 2007, 2008, 2010 Arnold Krille 3 # Copyright (C) 2007, 2008 Pieter Palmers 4 4 # 5 5 # This file is part of FFADO … … 26 26 env = env.Clone() 27 27 28 env.SConscript( dirs=["mixer-qt4","firmware","dbus","tools","alsa"], exports="env" ) 28 dirs=["mixer-qt4","firmware","tools","alsa"] 29 30 if env['DBUS1_FLAGS']: 31 dirs.append('dbus') 32 33 env.SConscript( dirs=dirs, exports="env" ) 34 35 # vim: et