Changeset 593

Show
Ignore:
Timestamp:
08/29/07 09:41:11 (14 years ago)
Author:
arnonym
Message:

Clean up the default environment even more.

This makes externalenv redundant.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/external/dbus/SConscript

    r588 r593  
    66import sys 
    77 
    8 #Import( 'env' ) 
    9 Import( 'externalenv' ) 
    10 #dbus_env = env.Copy() 
    11  
    12 dbus_env = externalenv.Copy() 
     8Import( 'env' ) 
     9dbus_env = env.Copy() 
    1310 
    1411if dbus_env.has_key('DBUS1_FLAGS'): 
     
    2017dbus_env.AppendUnique( LIBS=["dbus-c++"] ) 
    2118dbus_env.AppendUnique( CCFLAGS=["-DDBUS_API_SUBJECT_TO_CHANGE"] ) 
    22  
    23 # this is required to indicate that the DBUS version we use has support 
    24 # for platform dependent threading init functions 
    25 # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is 
    26 # always true 
    27 dbus_env.AppendUnique( CCFLAGS=["-DDBUS_HAS_THREADS_INIT_DEFAULT"] ) 
    2819 
    2920sources = [ 
     
    5344# 
    5445 
    55 tools_env = dbus_env.Copy() 
     46tools_env = dbus_env 
    5647 
    5748introspect_sources = [ 
  • trunk/libffado/SConstruct

    r592 r593  
    166166 
    167167# 
    168 # Create an environment for the externals-directory without all the fancy 
    169 # ffado-defines. Probably the ffado-defines should be gathered in a distinct 
    170 # ffadoenv... 
    171 externalenv = env.Copy() 
    172 Export( 'externalenv' ) 
    173  
    174 
    175 # TODO: Most of these flags aren't needed for all the apps/libs compiled here. 
    176 # The relevant MergeFlags-calls should be moved to the SConscript-files where 
    177 # its needed... 
    178 if env.has_key('LIBRAW1394_FLAGS'): 
    179     env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 
    180 if env.has_key('LIBAVC1394_FLAGS'): 
    181     env.MergeFlags( env['LIBAVC1394_FLAGS'] ) 
    182 if env.has_key('LIBIEC61883_FLAGS'): 
    183     env.MergeFlags( env['LIBIEC61883_FLAGS'] ) 
    184 if env.has_key('ALSA_FLAGS'): 
    185     env.MergeFlags( env['ALSA_FLAGS'] ) 
    186 if env.has_key('LIBXML26_FLAGS'): 
    187     env.MergeFlags( env['LIBXML26_FLAGS'] ) 
    188 if env.has_key('LIBLO_FLAGS'): 
    189     env.MergeFlags( env['LIBLO_FLAGS'] ) 
    190  
    191 
    192 # Some includes in src/*/ are full path (src/*), that should be fixed? 
     168# XXX: Some includes in src/*/ are full path (src/*), that should be fixed? 
    193169env.AppendUnique( CPPPATH=["#/"] ) 
    194170 
  • trunk/libffado/src/SConscript

    r592 r593  
    164164 
    165165libenv.MergeFlags( "-lrt" ) 
     166libenv.MergeFlags( env['LIBRAW1394_FLAGS'] ) 
     167libenv.MergeFlags( env['LIBAVC1394_FLAGS'] ) 
     168libenv.MergeFlags( env['LIBIEC61883_FLAGS'] ) 
     169libenv.MergeFlags( env['ALSA_FLAGS'] ) 
     170libenv.MergeFlags( env['LIBXML26_FLAGS'] ) 
     171libenv.MergeFlags( env['LIBLO_FLAGS'] ) 
    166172 
    167173#env1.AppendUnique( LINKFLAGS = env.Split("-Wl,-rpath $libdir -Wl,-soname -Wl,libffado.so.1 --version-info=1:0:0") ) 
  • trunk/libffado/tests/SConscript

    r588 r593  
    99env.PrependUnique( LIBS=["ffado", "dbus-c++"] ) 
    1010 
    11 env.MergeFlags( ["!pkg-config --cflags --libs dbus-1"] ) 
     11env.MergeFlags( env["DBUS1_FLAGS"] ) 
     12env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 
     13env.MergeFlags( env['LIBXML26_FLAGS'] ) 
    1214 
    1315#