Changeset 755

Timestamp:

12/08/07 05:44:49 (16 years ago)

Author:

ppalmers

Message:

add a scons option to build static versions of the tools

Files:

• trunk/libffado/SConstruct (modified) (2 diffs)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/support/dbus/SConscript (modified) (2 diffs)
• trunk/libffado/support/firmware/SConscript (modified) (4 diffs)
• trunk/libffado/tests/SConscript (modified) (2 diffs)

trunk/libffado/SConstruct

@@ -69 +69 @@
-  If you just want to use ffado with jack without the tools, you can disable this.\
-""", True ),
+    BoolOption( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ),
-        )
-
@@ -198 +199 @@
-        env['ENABLE_GENERICAVC'] = True
-
+env['BUILD_STATIC_LIB'] = False
+if env['BUILD_STATIC_TOOLS']:
+    print "Building static versions of the tools..."
+    env['BUILD_STATIC_LIB'] = True
+
-if build_base:
-        env['build_base']="#/"+build_base

trunk/libffado/src/SConscript

@@ -225 +225 @@
-ffadolib = libenv.SharedLibrary( "ffado", source )
-
+if libenv['BUILD_STATIC_LIB']:
+    ffadolib_static = libenv.StaticLibrary( "ffado", source )
+
-for file in version_dependent_files:
-    Depends(file, '#/config.h')

trunk/libffado/support/dbus/SConscript

@@ -42 +42 @@
-env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml')
-
+static_env = env.Copy()
+
-apps = {
-}
@@ -59 +61 @@
-    if app.find( "test" ) == -1:
-        env.Install( "$bindir", app )
+
+# static versions
+if static_env['BUILD_STATIC_TOOLS']:
+    static_env.Append(LIBS=File('#/src/libffado.a'))
+    for app in apps.keys():
+        static_app = app + "-static"
+        static_env.Program( target=static_app, source = static_env.Split( apps[app] ) )

trunk/libffado/support/firmware/SConscript

@@ -26 +26 @@
-env = env.Copy()
-
-#
-# For the debugging apps
-#
-env.PrependUnique( LIBPATH=env['build_base']+"src" )
-env.PrependUnique( LIBS="ffado" )
-env.AppendUnique( CPPPATH=["#/", "#/src"] )
-
@@ -38 +33 @@
-    env.MergeFlags( env['LIBAVC1394_FLAGS'] )
-    env.MergeFlags( env['LIBIEC61883_FLAGS'] )
-    env.MergeFlags( env['ALSA_FLAGS'] )
-    env.MergeFlags( env['LIBXML26_FLAGS'] )
+
+static_env = env.Copy()
-
-apps = {
@@ -45 +41 @@
-
-installapps = []
+
+env.PrependUnique( LIBPATH=env['build_base']+"src" )
+env.PrependUnique( LIBS="ffado" )
-
-if env['ENABLE_BEBOB']:
@@ -58 +57 @@
-    if app.find( "test" ) == -1:
-        env.Install( "$bindir", app )
+
+# static versions
+if static_env['BUILD_STATIC_TOOLS']:
+    static_env.Append(LIBS=File('#/src/libffado.a'))
+    for app in apps.keys():
+        static_app = app + "-static"
+        static_env.Program( target=static_app, source = static_env.Split( apps[app] ) )

trunk/libffado/tests/SConscript

@@ -34 +34 @@
-        env.MergeFlags( env['LIBXML26_FLAGS'] )
-
+static_env = env.Copy()
+
-#
-# deactivate as they don't seem ported to the new api: test-extplugcmd,
@@ -60 +62 @@
-env.SConscript( dirs="streaming", exports="env" )
-
+# static versions
+if static_env['BUILD_STATIC_TOOLS']:
+    static_env.Append(LIBS=File('#/src/libffado.a'))
+    for app in apps.keys():
+        static_app = app + "-static"
+        static_env.Program( target=static_app, source = static_env.Split( apps[app] ) )