Changeset 526

Show
Ignore:
Timestamp:
08/20/07 06:39:51 (16 years ago)
Author:
arnonym
Message:

installing ffado should work now (it does here). simply do "scons install" to get the lib, header and pkg-config file installed to the PREFIX...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/libffado-scons_porting_work/config.h.in

    r519 r526  
    22 
    33/* Name of package */ 
    4 #define PACKAGE "libffado" 
     4#define PACKAGE $PACKAGE 
    55 
    66/* Define to the address where bug reports for this package should be sent. */ 
    …… 
    88 
    99/* Define to the full name of this package. */ 
    10 #define PACKAGE_NAME "libffado" 
     10#define PACKAGE_NAME "$PACKAGE" 
    1111 
    1212/* Define to the full name and version of this package. */ 
    13 #define PACKAGE_STRING "libffado 1.999.5" 
     13#define PACKAGE_STRING "$PACKAGE $VERSION" 
    1414 
    1515/* Define to the one symbol short name of this package. */ 
    16 #define PACKAGE_TARNAME "libffado" 
     16#define PACKAGE_TARNAME "$PACKAGE" 
    1717 
    1818/* Define to the version of this package. */ 
    19 #define PACKAGE_VERSION "1.999.5" 
     19#define PACKAGE_VERSION $VERSION 
    2020 
    2121/* Define to 1 if SSE assembly is available. */ 
    …… 
    2323 
    2424/* Version number of package */ 
    25 #define VERSION "1.999.5" 
     25#define VERSION "$VERSION" 
    2626 

  • branches/libffado-scons_porting_work/libffado.pc.in

    r445 r526  
    1 prefix=@prefix@ 
    2 exec_prefix=@exec_prefix@ 
    3 libdir=@libdir@ 
    4 includedir=@includedir@ 
     1prefix=$PREFIX 
     2exec_prefix=$bindir 
     3libdir=$libdir 
     4includedir=$includedir 
    55 
    66Name: libffado 
    77Description: FFADO 
    8 Version: @VERSION@ 
     8Version: $VERSION 
    99Libs: -L${libdir} -lffado 
    1010Cflags: -I${includedir} 

  • branches/libffado-scons_porting_work/libffado/SConscript

    r519 r526  
    11#! /usr/bin/env python 
     2 
     3import os.path 
    24 
    35Import( 'env' ) 
    …… 
    57env = env.Copy() 
    68 
    7 env.AppendUnique( CPPPATH=["#/src"] ) 
    8 env.AppendUnique( LIBPATH=["#/src"] ) 
    9 env.AppendUnique( LIBS=["ffado"] ) 
     9env.Install( os.path.join(env['includedir'],"libffado"), "ffado.h" ) 
    1010 
    11 #env.AppendUnique( CCFLAGS=['-DENABLE_BEBOB'] ) 
    12  
    13 for app in ["test-ffado", "test-extplugcmd", "test-fw410", "test-volume", "test-mixer", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]: 
    14         env.Program( target=app, source = app+".cpp" ) 
    15  
    16 #env.Program( target="test-ffado", source = "test-ffado.cpp" ) 
    17 #env.Program( target="", source = ".cpp" ) 
    18  
    19 env.Program( target="test-sytmonitor", source = env.Split( "test-sytmonitor.cpp SytMonitor.cpp" ) ) 
    20  
    21 env.SConscript( dirs="streaming", exports="env" ) 
    22  

  • branches/libffado-scons_porting_work/SConstruct

    r521 r526  
    55sys.path.append( "./admin" ) 
    66from pkgconfig import * 
     7 
     8if not os.path.isdir( "cache" ): 
     9        os.mkdir( "cache" ) 
    710 
    811opts = Options( "cache/options.cache" ) 
    …… 
    2629specify them only once, scons will save the last value you used and re-use 
    2730that. 
     31To really undo your settings and return to the factory defaults, remove the 
     32"cache"-folder and the file ".sconsign.dblite" from this directory. 
     33For example with: "rm -Rf .sconsign.dblite cache" 
    2834 
    2935Currently it seems as if only the BEBOB and the MOTU drivers are 
    …… 
    3743opts.Save( "cache/options.cache", env ) 
    3844 
    39 #env['CXXFLAGS']+="-Wall -Werror -g -fpic" 
    40 env['CFLAGS']+="-Wall -g -fpic" 
     45#env.Append( CCFLAGS = "-Wall -Werror -g -fpic" ) 
     46env.Append( CCFLAGS = "-Wall -g -fpic" ) 
    4147 
    4248 
    …… 
    97103env.AppendUnique( CPPPATH=["#/"] ) 
    98104 
     105env['bindir'] = env['PREFIX'] + "/bin" 
     106env['libdir'] = env['PREFIX'] + "/lib" 
     107env['includedir'] = env['PREFIX'] + "/include" 
     108 
     109env.Alias( "install", env['libdir'] ) 
     110env.Alias( "install", env['includedir'] ) 
     111 
     112env['PACKAGE'] = "libffado" 
     113env['VERSION'] = "1.999.5" 
     114env['LIBVERSION'] = "1.0.0" 
    99115 
    100116# 
    …… 
    103119 
    104120env.ScanReplace( "config.h.in" ) 
     121pkgconfig = env.ScanReplace( "libffado.pc.in" ) 
     122env.Alias( "install", env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) ) 
    105123 
    106 env.SConscript( dirs=['src','tests','support'], exports="env" ) 
     124env.SConscript( dirs=['src','libffado','tests','support'], exports="env" ) 
    107125 
    108126# By default only src is built but all is cleaned 

  • branches/libffado-scons_porting_work/src/SConscript

    r519 r526  
    11#! /usr/bin/env python 
     2 
     3import os 
    24 
    35Import( 'env' ) 
    …… 
    115117        source += bounce_source 
    116118 
     119ffadolib = env.SharedLibrary( "ffado", source ) 
    117120 
    118 #source += dice_source + bounce_source + metric_halo_source + rme_source + amdtp_source 
     121env.Alias( "install", env.InstallAs( os.path.join('$libdir','libffado.so.$LIBVERSION'), ffadolib ) ) 
     122env.Ignore( ffadolib, os.path.join('$libdir','libffado.so') ) 
     123#env.Ignore( os.path.join('$libdir','libffado.so'), ffadolib ) 
     124#env.Ignore( os.path.join('$libdir','libffado.so.0'), "install" ) 
    119125 
    120 env.SharedLibrary( target="ffado", source=source ) 
     126env.Alias( "install", env.Command( target=env['libdir']+"/libffado.so", source=env['libdir']+"/libffado.so.$LIBVERSION", action="ln -s libffado.so.%s $libdir/libffado.so" % env['LIBVERSION'] ) ) 
     127env.Alias( "install", env.Command( target="$libdir/libffado.so.%s" % str(env['LIBVERSION']).rsplit('.',1)[0], source=env['libdir']+"/libffado.so.$LIBVERSION", action="ln -s $SOURCE $TARGET" ) ) 
     128env.Alias( "install", env.Command( target="$libdir/libffado.so.%s" % str(env['LIBVERSION']).rsplit('.',2)[0], source=env['libdir']+"/libffado.so.$LIBVERSION", action="ln -s $SOURCE $TARGET" ) ) 
    121129 
    122130#