Changeset 33:a5ded39b49e5

Show
Ignore:
Timestamp:
08/23/06 19:48:52 (2 years ago)
Author:
vadim@mbdsys.com
Message:

SConscript simplifications

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eXosip/SConscript

    r31 r33  
    1212include_path = [ 
    1313        'include', 
    14         '#libosip2/include', 
     14        '#/libosip2/include', 
    1515] 
    1616 
    …… 
    5050        defines['USE_HTTP_TUNNEL'] = 1 
    5151 
    52 if env['shared_phapi']: 
    53    exosipobj = env.SharedObject( source=sources, CPPDEFINES = defines, CPPPATH = include_path) 
    54 else: 
    55    exosipobj = env.StaticObject( source=sources, CPPDEFINES = defines, CPPPATH = include_path) 
    56     
    57 lib = env.StaticLibrary('eXosip', source = exosipobj) 
    58 BJ.Component('eXosip', includes = ["#/eXosip/include"], libpath = [lib[0].dir], libs = ["eXosip"], uses = ['osip'], node = lib ) 
     52eXosip  =  BJ.Library(env, 'eXosip', source = sources,  
     53       uses = ['osip'], 
     54       includes = ["#/eXosip/include"], 
     55       CPPDEFINES = defines, CPPPATH = include_path 
     56       ) 
    5957 
     58 

  • httptunnel/SConscript

    r31 r33  
    2323 
    2424 
    25 BJ.Use(env, uses) 
    26  
    27 env.Append(CPPDEFINES = defines, CPPPATH=["."]) 
    28  
    29 if env['shared_phapi']: 
    30    ho = env.SharedObject( source = sources) 
    31 else: 
    32    ho = env.StaticObject( source = sources) 
    33  
    34 ht = env.StaticLibrary('httptunnel', source = ho) 
    35 BJ.Component('httptunnel', includes = ['#/httptunnel'], libpath = [ht[0].dir], libs = ['httptunnel'], uses = uses, node = ht) 
     25httptunnel = BJ.Library(env, 'httptunnel', 
     26                source = sources,  
     27                includes = ['#/httptunnel'],  
     28                uses = uses,  
     29                CPPDEFINES = defines, CPPPATH=["."] 
     30                ) 

  • libosip2/SConscript

    r31 r33  
    9999 
    100100 
    101 if env['shared_phapi']: 
    102    osipobj = env.SharedObject(source = osip_sources + osipparser_sources, CPPDEFINES = defines, CPPPATH = includes, LIBS=libs) 
    103 else: 
    104    osipobj = env.StaticObject(source = osip_sources + osipparser_sources, CPPDEFINES = defines, CPPPATH = includes, LIBS=libs) 
     101 
     102osip = BJ.Library(env, 'osip',  
     103     source = osip_sources + osipparser_sources,  
     104     includes = ['#/libosip2/include'], 
     105     CPPDEFINES = defines, CPPPATH = includes, LIBS=libs 
     106     ) 
    105107 
    106108 
    107 osip = env.StaticLibrary('osip', source = osipobj) 
    108  
    109 BJ.Component('osip', includes = ['#libosip2/include'], libpath = [osip[0].dir], libs = ["osip"])  

  • libs/curl/SConscript

    r31 r33  
    111111 
    112112 
    113 env.Append(CPPPATH = include_path, CPPDEFINES = defines, LIBS = libs) 
    114  
    115 BJ.Use(env, uses) 
    116113 
    117114if BJ.osxTarget: 
    118         lib=env.StaticLibrary('veronacurl', sources) 
     115   veronacurl = BJ.Library(env, 'veronacurl', source = sources, 
     116           use = uses, 
     117           includes = ['#/libs/curl/include'],  
     118           CPPPATH = include_path, CPPDEFINES = defines, LIBS = libs) 
    119119else: 
    120         lib=env.SharedLibrary('veronacurl', sources) 
    121  
    122 BJ.Component('veronacurl', includes = ['#/libs/curl/include'], libpath = [ lib[0].dir ],  libs = ['veronacurl'], node = lib) 
     120   veronacurl = BJ.SharedLibrary(env, 'veronacurl', source = sources, 
     121           use = uses, 
     122           includes = ['#/libs/curl/include'],  
     123           CPPPATH = include_path, CPPDEFINES = defines, LIBS = libs)