Changeset 531

Show
Ignore:
Timestamp:
08/20/07 15:03:00 (16 years ago)
Author:
arnonym
Message:

Install the maudio-files into <prefix>/share/libffado.

Adopt the cachedir-path.

Break creation of cachedir on install. Will fix it tomorrow...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/libffado-scons_porting_work/SConstruct

    r528 r531  
    4343opts.Save( "cache/options.cache", env ) 
    4444 
    45 env.Append( CCFLAGS = "-Wall -g -fpic" ) 
    46  
    4745if not env.GetOption('clean'): 
    4846        conf = Configure( env, custom_tests={ 'CheckForPKGConfig' : CheckForPKGConfig, 'CheckForPKG' : CheckForPKG }, conf_dir='cache', log_file='cache/config.log' ) 
    …… 
    7270 
    7371if env['DEBUG']: 
    74         env.AppendUnique( CCFLAGS=["-DDEBUG"] ) 
     72        print "Doing a debug build" 
     73        # -Werror could be added to, which would force the devs to really remove all the warnings :-) 
     74        env.AppendUnique( CCFLAGS=["-DDEBUG","-Wall","-g"] ) 
     75 
    7576 
    7677if env['ENABLE_BEBOB']: 
    …… 
    9495env.MergeFlags( ["!pkg-config --cflags --libs liblo"] ) 
    9596 
    96 #env.AppendUnique( CCFLAGS = "-Wall -Werror -g -fpic" ) 
    97 env.AppendUnique( CCFLAGS = env.Split("-Wall -g -fpic") ) 
    98 #env.AppendUnique( LINKFLAGS = env.Split("-Wl,-rpath $libdir -Wl,soname -Wl,libffado.so.1") ) 
    99  
    10097 
    10198# 
    …… 
    106103env['libdir'] = os.path.join( env['PREFIX'], "lib" ) 
    107104env['includedir'] = os.path.join( env['PREFIX'], "include" ) 
     105env['sharedir'] = os.path.join( env['PREFIX'], "share/libffado" ) 
    108106env['cachedir'] = os.path.join( env['PREFIX'], "var/cache/libffado" ) 
    109107 
    …… 
    123121env.Alias( "install", env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) ) 
    124122 
    125 if not os.path.exists( env['cachedir'] ): 
    126         env.Alias( "install", os.makedirs( env["cachedir"] ) ) 
    127123 
    128124env.SConscript( dirs=['src','libffado','tests','support'], exports="env" ) 
    …… 
    131127if not env.GetOption('clean'): 
    132128        Default( 'src' ) 
     129        #env.Alias( "install", env["cachedir"], os.makedirs( env["cachedir"] ) ) 
     130        env.Alias( "install", env.Install( env["cachedir"], "" ) ) #os.makedirs( env["cachedir"] ) ) 
    133131 
     132 

  • branches/libffado-scons_porting_work/src/devicemanager.cpp

    r527 r531  
    522522    Glib::ustring cachePath; 
    523523    char* pCachePath; 
    524     if ( asprintf( &pCachePath, "%s/libffado/",  CACHEDIR ) < 0 ) { 
     524    if ( asprintf( &pCachePath, "%s/",  CACHEDIR ) < 0 ) { 
    525525        debugError( "Could not create path string for cache pool (trying '/var/cache/libffado' instead)\n" ); 
    526526        cachePath == "/var/cache/libffado/"; 

  • branches/libffado-scons_porting_work/src/SConscript

    r527 r531  
    7070        bebob/GenericMixer.cpp \ 
    7171        maudio/maudio_avdevice.cpp \ 
     72' ) 
     73bebob_pkgdata = env.Split( '\ 
     74        maudio/refdesign.xml \ 
     75        maudio/fw410.xml \ 
     76        maudio/fwap.xml \ 
    7277' ) 
    7378 
    …… 
    149154        env1.Alias( "install", env1.Install( "$libdir", ffadolib ) ) 
    150155 
     156# 
     157# Install the *_pkgdata to $sharedir 
     158# 
     159for data in bebob_pkgdata: 
     160        env1.Alias( "install", env1.Install( "$sharedir", data ) ) 
    151161 
    152162#