Changeset 609

Show
Ignore:
Timestamp:
08/31/07 09:24:46 (13 years ago)
Author:
arnonym
Message:

Simplify some things.

CACHEDIR is now hardcoded in config.h to be ~/.ffado. Now the sources need code to create the dir if it doesn't exist.

The install target is now depending on bindir, libdir, sharedir and includedir. That way a lot of env.Alias(...) can go away.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/config.h.in

    r600 r609  
    2727#define VERSION "$VERSION" 
    2828 
    29 #define CACHEDIR "$cachedir" 
     29#define CACHEDIR "~/.ffado" 
     30 
     31#define LIBDIR "$libdir" 
    3032 
    3133#define SHAREDIR "$sharedir" 
  • trunk/libffado/SConstruct

    r608 r609  
    188188env['includedir'] = Template( os.path.join( env['INCLUDEDIR'] ) ).safe_substitute( env ) 
    189189env['sharedir'] = Template( os.path.join( env['SHAREDIR'] ) ).safe_substitute( env ) 
    190 env['cachedir'] = os.path.join( env['PREFIX'], "var/cache/libffado" ) 
    191190 
    192191env.Alias( "install", env['libdir'] ) 
    193192env.Alias( "install", env['includedir'] ) 
     193env.Alias( "install", env['sharedir'] ) 
     194env.Alias( "install", env['bindir'] ) 
    194195 
    195196env['PACKAGE'] = "libffado" 
     
    209210 
    210211pkgconfig = env.ScanReplace( "libffado.pc.in" ) 
    211 env.Alias( "install", env.Install( env['libdir'] + '/pkgconfig', pkgconfig )
     212env.Install( env['libdir'] + '/pkgconfig', pkgconfig
    212213 
    213214subdirs=['external','src','libffado','tests','support','doc'] 
     
    224225    if env['BUILD_TESTS']: 
    225226        Default( 'tests' ) 
    226     # Cachedir has to be fixed... 
    227     #env.Alias( "install", env["cachedir"], os.makedirs( env["cachedir"] ) ) 
    228     #env.Alias( "install", env.Install( env["cachedir"], "" ) ) #os.makedirs( env["cachedir"] ) ) 
     227 
  • trunk/libffado/src/SConscript

    r599 r609  
    144144 
    145145source = ffado_source 
     146pkgdata = [] 
    146147if env['ENABLE_BEBOB']: 
    147148        libenv.AppendUnique( CCFLAGS=["-DENABLE_BEBOB"] ) 
    148149        source += bebob_source 
     150        pkgdata += bebob_pkgdata 
    149151if env['ENABLE_FIREWORKS']: 
    150152        libenv.AppendUnique( CCFLAGS=["-DENABLE_FIREWORKS"] ) 
    151153        source += fireworks_source 
     154        pkgdata += fireworks_pkgdata 
    152155if env['ENABLE_MOTU']: 
    153156        libenv.AppendUnique( CCFLAGS=["-DENABLE_MOTU"] ) 
     
    171174        source += amdtp_source 
    172175        source += genericavc_source 
     176        pkgdata += genericavc_pkgdata 
    173177 
    174178if not env.GetOption( "clean" ): 
     
    210214                ) ) 
    211215else: 
    212         print "Doing simple install" 
    213         libenv.Alias( "install", libenv.Install( "$libdir", ffadolib ) ) 
    214  
    215 
    216 # Install the *_pkgdata to $sharedir 
    217 
    218 for data in bebob_pkgdata: 
    219         libenv.Alias( "install", libenv.Install( "$sharedir", data ) ) 
    220  
    221 for data in genericavc_pkgdata: 
    222         libenv.Alias( "install", libenv.Install( "$sharedir", data ) ) 
    223  
    224 for data in fireworks_pkgdata: 
    225         libenv.Alias( "install", libenv.Install( "$sharedir", data ) ) 
     216        #print "Doing simple install" 
     217        libenv.Install( "$libdir", ffadolib ) 
     218 
     219
     220# Install the pkgdata to $sharedir 
     221
     222for data in pkgdata: 
     223        libenv.Install( "$sharedir", data ) 
    226224 
    227225# 
     
    244242        env2.Program( target=app, source = env.Split( apps[app] ) ) 
    245243 
    246 env2.Alias( "install", env2.Install( "$bindir", "bebob-sync" ) ) 
    247 env2.Alias( "install", env2.Install( "$bindir", "bridgeco-downloader" ) ) 
    248  
     244env2.Install( "$bindir", ["bebob-sync","bridgeco-downloader"] ) 
     245