* Make sure example clients are linked against libjack.so *always*

* libwrapper is called libjack now except during compile phase:
libjack.so and libjack.so.0 link to libjackmp.so


git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2073 0c269be4-1314-0410-8aa9-9f06e86f4224

SConstruct

@@ -100,11 +100,6 @@ env['JACK_MINOR_VERSION'] = JACK_MINOR_VERSION
 env['JACK_MICRO_VERSION'] = JACK_MICRO_VERSION
 env['JACK_VERSION'] = JACK_VERSION
 
-# Set the lib names
-env['CLIENTLIB'] = 'jackmp'
-env['SERVERLIB'] = 'jackservermp'
-env['WRAPPERLIB'] = 'jackwrapper'
-
 # make sure the necessary dirs exist
 if not os.path.isdir('cache/' + build_base):
     os.makedirs('cache/' + build_base)
@@ -192,13 +187,12 @@ if env['FULL_MIMIC']:
     env['SERVER'] = 'jackd'
     env['CLIENTLIB'] = 'jack'
     env['SERVERLIB'] = 'jackserver'
-    env['WRAPPERLIB'] = 'jackwrapper'
     env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jack"
 else:
     env['SERVER'] = 'jackdmp'
     env['CLIENTLIB'] = 'jackmp'
     env['SERVERLIB'] = 'jackservermp'
-    env['WRAPPERLIB'] = 'jackwrapper'
+    env['WRAPPERLIB'] = 'jack'
     env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jackmp"
 
 env['PREFIX'] = env.subst(env['PREFIX'])

common/SConscript

@@ -164,13 +164,12 @@ if env['PLATFORM'] == 'posix':
 	# When we use the wrapper, we want symlinks named libjack.so[.0] so regular clients can use it as a proxy
 	# this will delete the 2 links installed by jack-1
 	# if jackd if running and not jackdmp, jack-1 libs will be used (hopefully...)
-	# Uncomment when sletz approves
-	env.Command(env['LIBDIR'] + '/libjack.so.0', env['LIBDIR'] + '/lib' + env['WRAPPERLIB'] + '.so.' + env['JACK_VERSION'], symlinkcmd)
-	env.Command(env['LIBDIR'] + '/libjack.so', env['LIBDIR'] + '/libjack.so.0', symlinkcmd)
-	env.Alias('install', env['LIBDIR'] + '/lib' + env['WRAPPERLIB'] + '.so.' + env['JACK_VERSION'])
+	env.Command('#/common/libjack.so.0', '#/common/lib' + env['CLIENTLIB'] + '.so.' + env['JACK_VERSION'], symlinkcmd)
+	env.Command('#/common/libjack.so', '#/common/libjack.so.0', symlinkcmd)
     for lib_name, lib in libs:
-        env.Command('#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), lib, symlinkcmd)
-        env.Command('#/common/lib' + lib_name + '.so', '#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), symlinkcmd)
+        if lib_name != 'jack':
+	    env.Command('#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), lib, symlinkcmd)
+	    env.Command('#/common/lib' + lib_name + '.so', '#/common/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), symlinkcmd)
         env.Command(env['LIBDIR']  + '/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), env['LIBDIR'] + '/lib' + lib_name + '.so.' + env['JACK_VERSION'], symlinkcmd)
         env.Command(env['LIBDIR']  + '/lib' + lib_name + '.so', env['LIBDIR'] + '/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']), symlinkcmd)
         env.Alias('install', env['LIBDIR']  + '/lib' + lib_name + '.so.' + str(env['JACK_MAJOR_VERSION']))

example-clients/SConscript

@@ -55,14 +55,13 @@ example_libs = {
 # Libraries to link
 extra_libs = {}
 for example_program in example_programs:
-    extra_libs[example_program] = [env['CLIENTLIB']]
+    extra_libs[example_program] = ['jack']
 
 # TODO: we need to really test for READLINE... pkgconfig ?
 env['HAS_READLINE']=True
 if env['HAS_READLINE']:
     example_programs['jack_transport'] = 'transport.c'
-    extra_libs['jack_transport'] = ['readline', env['CLIENTLIB']]
-    extra_libs['jack_transport'] += ['ncurses', env['CLIENTLIB']]
+    extra_libs['jack_transport'] = ['readline', 'jack', 'ncurses']
 
 #
 # Build/install section