swtich from uselib/uselib_local to use

common/wscript

@@ -35,7 +35,7 @@ def create_jack_process_obj(bld, target, sources, uselib = None):
         #process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
         process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
     process.install_path = '${ADDON_DIR}/'
-    process.uselib_local = uselib.name
+    process.use = [uselib.name]
     return process
 
 def build(bld):
@@ -111,7 +111,7 @@ def build(bld):
     serverlib.includes = includes
     serverlib.name         = 'serverlib'
     serverlib.target       = 'jackserver'
-    serverlib.uselib = uselib
+    serverlib.use = uselib
     serverlib.install_path = '${LIBDIR}'
     serverlib.source = [] + common_libsources
     serverlib.source += [
@@ -193,7 +193,7 @@ def build(bld):
         netlib.includes = includes
         netlib.name         = 'netlib'
         netlib.target       = 'jacknet'
-        netlib.uselib = ['SAMPLERATE', 'CELT', 'PTHREAD' , 'RT']
+        netlib.use = ['SAMPLERATE', 'CELT', 'PTHREAD' , 'RT']
         netlib.install_path = '${LIBDIR}'
         netlib.source = [
             'JackNetAPI.cpp',
@@ -223,10 +223,10 @@ def build(bld):
 
     clientlib = bld(features = ['cxx', 'cxxshlib'])
     clientlib.defines = 'HAVE_CONFIG_H'
-    clientlib.uselib = uselib
+    clientlib.use = uselib
     clientlib.install_path = '${LIBDIR}'
     if bld.env['BUILD_JACKDBUS'] == True and bld.env['BUILD_JACKD'] == False:
-        clientlib.uselib.append('DBUS-1')
+        clientlib.use.append('DBUS-1')
     clientlib.includes = includes
     clientlib.name         = 'clientlib'
     clientlib.target       = 'jack'
@@ -287,7 +287,7 @@ def build(bld):
 
     if bld.env['BUILD_ADAPTER'] == True:
         process = create_jack_process_obj(bld, 'netadapter', net_adapter_sources, serverlib)
-        process.uselib = 'SAMPLERATE'
+        process.use = 'SAMPLERATE'
 
     audio_adapter_sources = [
         'JackResampler.cpp',
@@ -301,17 +301,17 @@ def build(bld):
          audio_adapter_sources += ['../macosx/coreaudio/JackCoreAudioAdapter.cpp']
          process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
          process.env.append_value("LINKFLAGS", "-framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreServices")
-         process.uselib = 'SAMPLERATE'
+         process.use = 'SAMPLERATE'
 
     if bld.env['BUILD_ADAPTER'] and bld.env['IS_LINUX'] and bld.env['BUILD_DRIVER_ALSA']:
          audio_adapter_sources += ['../linux/alsa/JackAlsaAdapter.cpp']
          process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
-         process.uselib = ['ALSA', 'SAMPLERATE']
+         process.use = ['ALSA', 'SAMPLERATE']
 
     if bld.env['BUILD_ADAPTER'] and bld.env['IS_SUN']:
          audio_adapter_sources += ['../solaris/oss/JackOSSAdapter.cpp', 'memops.c']
          process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)
-         process.uselib = 'SAMPLERATE'
+         process.use = 'SAMPLERATE'
 
     #audio_adapter_sources += ['../windows/JackPortAudioAdapter.cpp']
     #process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib)

dbus/wscript

@@ -65,12 +65,12 @@ def build(bld):
         'sigsegv.c',
 	'reserve.c',
         ]
+    obj.use = ['serverlib']
     if bld.env['IS_LINUX']:
-        obj.uselib = 'PTHREAD DL RT DBUS-1 EXPAT'
+        obj.use += ['PTHREAD', 'DL', 'RT', 'DBUS-1', 'EXPAT']
     if bld.env['IS_MACOSX']:
-        obj.uselib = 'PTHREAD DL DBUS-1 EXPAT'
-    obj.uselib_local = 'serverlib'
-    obj.target       = 'jackdbus'
+        obj.use += ['PTHREAD', 'DL', 'DBUS-1', 'EXPAT']
+    obj.target = 'jackdbus'
 
     # process org.jackaudio.service.in -> org.jackaudio.service
     obj = bld(

example-clients/wscript

@@ -65,63 +65,62 @@ def build(bld):
         os_incdir = ['../solaris', '../posix']
     for example_program, example_program_source in list(example_programs.items()):
         if example_program == 'jack_server_control':
-            uselib_local = 'serverlib'
+            use = ['serverlib']
         elif example_program == 'jack_net_slave':
             if not bld.env['BUILD_NETLIB']:
                 continue
-            uselib_local = 'netlib'
+            use = ['netlib']
         elif example_program == 'jack_net_master':
             if not bld.env['BUILD_NETLIB']:
                 continue
-            uselib_local = 'netlib'
+            use = ['netlib']
         else:
-            uselib_local = 'clientlib'
+            use = ['clientlib']
 
         prog = bld(features='c cprogram')
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = example_program_source
+        prog.use = use
         if bld.env['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
             #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
             prog.env.append_value("LINKFLAGS", "")
         if bld.env['IS_LINUX']:
-            prog.uselib = 'RT'
+            prog.use += ['RT']
         if bld.env['IS_SUN']:
             prog.env.append_value("LINKFLAGS", "-lm")
 
-        prog.uselib_local = uselib_local
-                     
         prog.target = example_program
    
     if bld.env['BUILD_EXAMPLE_CLIENT_TRANSPORT']:
         prog = bld(features = 'c cprogram')
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'transport.c'
+        prog.use = ['clientlib']
         if bld.env['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
             #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
             prog.env.append_value("LINKFLAGS", "")
         if bld.env['IS_LINUX']:
-            prog.uselib = 'RT READLINE NCURSES'
+            prog.use += ['RT', 'READLINE', 'NCURSES']
         if bld.env['IS_MACOSX']:
-            prog.uselib = 'READLINE NCURSES'
-        prog.uselib_local = 'clientlib'
+            prog.use += ['READLINE', 'NCURSES']
         prog.target = 'jack_transport'
 
     if bld.env['BUILD_EXAMPLE_CLIENT_REC']:
         prog = bld(features = 'c cprogram')
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'capture_client.c'
+        prog.use = ['clientlib']
         if bld.env['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
             #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
             prog.env.append_value("LINKFLAGS", "")
-            prog.uselib = 'SNDFILE'
+            prog.use += ['SNDFILE']
         if bld.env['IS_LINUX']:
-            prog.uselib = 'RT SNDFILE'
+            prog.use += ['RT', 'SNDFILE']
         if bld.env['IS_SUN']:
-            prog.uselib = 'RT SNDFILE'
-        prog.uselib_local = 'clientlib'
+            prog.use += ['RT', 'SNDFILE']
         prog.target = 'jack_rec'
 
     if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
@@ -129,7 +128,7 @@ def build(bld):
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = ['netsource.c', '../common/netjack_packet.c']
         prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR")
-        prog.uselib = 'CELT SAMPLERATE'
+        prog.use = ['CELT', 'SAMPLERATE']
         prog.uselib_local = 'clientlib'
         prog.target = 'jack_netsource'
 
@@ -138,16 +137,14 @@ def build(bld):
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = ['alsa_in.c', '../common/memops.c']
         prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR")
-        prog.uselib = 'ALSA SAMPLERATE'
-        prog.uselib_local = 'clientlib'
+        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE']
         prog.target = 'alsa_in'
 
         prog = bld(features = 'c cprogram')
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = ['alsa_out.c', '../common/memops.c']
         prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR")
-        prog.uselib = 'ALSA SAMPLERATE'
-        prog.uselib_local = 'clientlib'
+        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE']
         prog.target = 'alsa_out'
 
     for example_lib, example_lib_source in list(example_libs.items()):
@@ -162,7 +159,7 @@ def build(bld):
             lib.env.append_value("LINKFLAGS", "")
         if bld.env['IS_SUN']:
             lib.env.append_value("LINKFLAGS", "-lm")
-        lib.uselib_local = 'serverlib'
+        lib.use = 'serverlib'
         lib.install_path = '${ADDON_DIR}/'
 
     bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')

linux/wscript

@@ -24,9 +24,10 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
     driver.target = target
     driver.source = sources
     driver.install_path = '${ADDON_DIR}/'
+    driver.use = []#['serverlib']
     if uselib:
-        driver.uselib = uselib
-    driver.uselib_local = 'serverlib'
+        driver.use += uselib
+    #driver.uselib_local = 'serverlib'
     return driver
 
 def build(bld):
@@ -35,12 +36,12 @@ def build(bld):
         jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus', '../']
         jackd.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
         jackd.source = ['../common/Jackdmp.cpp']
+        jackd.use = ['serverlib']
         if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: 
             jackd.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c'] 
-            jackd.uselib = 'PTHREAD DL RT DBUS-1'
+            jackd.use += ['PTHREAD', 'DL', 'RT', 'DBUS-1']
         else:
-            jackd.uselib = 'PTHREAD DL RT'		
-        jackd.uselib_local = 'serverlib'
+            jackd.use += ['PTHREAD', 'DL', 'RT']
         jackd.target = 'jackd'
   	
     create_jack_driver_obj(bld, 'dummy', '../common/JackDummyDriver.cpp')
@@ -75,15 +76,15 @@ def build(bld):
                        ]
 
     if bld.env['BUILD_DRIVER_ALSA'] == True:
-        create_jack_driver_obj(bld, 'alsa', alsa_driver_src, "ALSA")
+        create_jack_driver_obj(bld, 'alsa', alsa_driver_src, ["ALSA"])
         create_jack_driver_obj(bld, 'alsarawmidi', alsarawmidi_driver_src,
-                               "ALSA")
+                               ["ALSA"])
 
     if bld.env['BUILD_DRIVER_FREEBOB'] == True:
-        create_jack_driver_obj(bld, 'freebob', 'freebob/JackFreebobDriver.cpp', "LIBFREEBOB")
+        create_jack_driver_obj(bld, 'freebob', 'freebob/JackFreebobDriver.cpp', ["LIBFREEBOB"])
 
     if bld.env['BUILD_DRIVER_FFADO'] == True:
-        create_jack_driver_obj(bld, 'firewire', ffado_driver_src, "LIBFFADO")
+        create_jack_driver_obj(bld, 'firewire', ffado_driver_src, ["LIBFFADO"])
 
     create_jack_driver_obj(bld, 'net', '../common/JackNetDriver.cpp')
 
@@ -91,5 +92,5 @@ def build(bld):
 
     create_jack_driver_obj(bld, 'netone', [ '../common/JackNetOneDriver.cpp',
                                             '../common/netjack.c',
-                                            '../common/netjack_packet.c' ], "SAMPLERATE CELT" )
+                                            '../common/netjack_packet.c' ], ["SAMPLERATE", "CELT"])
 

tests/wscript

@@ -28,6 +28,5 @@ def build(bld):
         if bld.env['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64")
             #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64")
-        prog.env.append_value("LINKFLAGS", "")
-        prog.uselib_local = 'clientlib'
+        prog.use = 'clientlib'
         prog.target = test_program