Changeset 570

Show
Ignore:
Timestamp:
08/25/07 11:55:22 (15 years ago)
Author:
arnonym
Message:

Make use of the exported FLAGS from the CheckForPkg?.

And I don't think the object-cache needs to be devided as scons is rather good at identifying not be file-descriptor but by a hash of filename and content and compile-flags...

Files:

Legend:

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

    r566 r570  
    2323CacheDir( 'cache/objects' ) 
    2424 
    25 dbus_env.MergeFlags( ["!pkg-config --cflags --libs dbus-1"] ) 
     25dbus_env.MergeFlags( env['DBUS1_FLAGS'] ) 
    2626 
    2727# add the local version of libdbus++ 
  • trunk/libffado/SConstruct

    r566 r570  
    2020opts = Options( "cache/"+build_base+"options.cache" ) 
    2121 
     22# 
     23# If this is just to display a help-text for the variable used via ARGUMENTS, then its wrong... 
    2224opts.Add( "BUILDDIR", "Path to place the built files in", "") 
    2325 
     
    7577if not os.path.isdir( "cache/" + build_base ): 
    7678        os.makedirs( "cache/" + build_base ) 
    77 if not os.path.isdir( "cache/" + build_base + 'objects' ): 
    78         os.makedirs( "cache/" + build_base + 'objects' ) 
    79  
    80 CacheDir( 'cache/' + build_base + 'objects' ) 
     79if not os.path.isdir( 'cache/objects' ): 
     80        os.makedirs( 'cache/objects' ) 
     81 
     82CacheDir( 'cache/objects' ) 
    8183 
    8284opts.Save( 'cache/' + build_base + "options.cache", env ) 
     
    142144        env.AppendUnique( CCFLAGS=["-DENABLE_BOUNCE"] ) 
    143145 
    144 env.MergeFlags( ["!pkg-config --cflags --libs libraw1394"] ) 
    145 env.MergeFlags( ["!pkg-config --cflags --libs libavc1394"] ) 
    146 env.MergeFlags( ["!pkg-config --cflags --libs libiec61883"] ) 
    147 env.MergeFlags( ["!pkg-config --cflags --libs alsa"] ) 
    148 env.MergeFlags( ["!pkg-config --cflags --libs libxml++-2.6"] ) 
    149 env.MergeFlags( ["!pkg-config --cflags --libs liblo"] ) 
    150  
     146
     147# TODO: Most of these flags aren't needed for all the apps/libs compiled here. 
     148# The relevant MergeFlags-calls should be moved to the SConscript-files where 
     149# its needed... 
     150env.MergeFlags( env['LIBRAW1394_FLAGS'] ) 
     151env.MergeFlags( env['LIBAVC1394_FLAGS'] ) 
     152env.MergeFlags( env['LIBIEC61883_FLAGS'] ) 
     153env.MergeFlags( env['ALSA_FLAGS'] ) 
     154env.MergeFlags( env['LIBXML26_FLAGS'] ) 
     155env.MergeFlags( env['LIBLO_FLAGS'] ) 
    151156 
    152157#