Remove wrapper library stuff

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

SConstruct

@@ -71,7 +71,6 @@ opts.AddOptions(
     BoolOption('BUILD_EXAMPLES', 'Build the example clients in their directory', True),
     BoolOption('INSTALL_EXAMPLES', 'Install the example clients in the BINDIR directory', True),
     BoolOption('BUILD_DOXYGEN_DOCS', 'Build doxygen documentation', False),
-    BoolOption('FULL_MIMIC', 'Mimic jack-1.0 installation layout as much as possible', True),
     )
 
 #
@@ -186,19 +185,11 @@ env['BINDIR'] = env.subst(env['BINDIR'])
 env['LIBDIR'] = env.subst(env['LIBDIR'])
 env['INCLUDEDIR'] = env.subst(env['INCLUDEDIR'])
 
-if env['FULL_MIMIC']:
-    env['SERVER'] = 'jackd'
-    env['CLIENTLIB'] = 'jack'
-    env['SERVERLIB'] = 'jackserver'
-    env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jack"
-    env['INSTALL_ADDON_DIR'] = env['DESTDIR'] + env.subst(env['LIBDIR']) + "/jack"
-else:
-    env['SERVER'] = 'jackdmp'
-    env['CLIENTLIB'] = 'jackmp'
-    env['SERVERLIB'] = 'jackservermp'
-    env['WRAPPERLIB'] = 'jack'
-    env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jackmp"
-    env['INSTALL_ADDON_DIR'] = env['DESTDIR'] + env.subst(env['LIBDIR']) + "/jackmp"
+env['SERVER'] = 'jackd'
+env['CLIENTLIB'] = 'jack'
+env['SERVERLIB'] = 'jackserver'
+env['ADDON_DIR'] = env.subst(env['LIBDIR']) + "/jack"
+env['INSTALL_ADDON_DIR'] = env['DESTDIR'] + env.subst(env['LIBDIR']) + "/jack"
 
 env['INSTALL_PREFIX'] = env['DESTDIR'] + env['PREFIX']
 env['INSTALL_BINDIR'] = env['DESTDIR'] + env['BINDIR']

common/SConscript

@@ -122,12 +122,6 @@ srcfiles_common_clientlib = [
     'JackTools.cpp'
     ]
 
-if not env['FULL_MIMIC']:
-    srcfiles_common_wrapperlib = [
-        'JackAPIWrapper.cpp',
-        'ringbuffer.c'
-        ]
-
 jack_headers = [
     'intclient.h',
     'jack.h',
@@ -153,18 +147,11 @@ if env['PLATFORM'] == 'posix':
 clientlib = libenv.SharedLibrary(env['CLIENTLIB'], srcfiles_common_clientlib)
 serverlib = libenv.SharedLibrary(env['SERVERLIB'], srcfiles_common_serverlib)
 env.Install( env['INSTALL_LIBDIR'], [clientlib, serverlib])
-if not env['FULL_MIMIC']:
-    # TODO: the next line generates a warning because of the LIBS variable addition
-    # Is there a clean way to do that ?
-    wrapperlib = libenv.SharedLibrary(env['WRAPPERLIB'], srcfiles_common_wrapperlib, LIBS='dl')
-    env.Install( env['INSTALL_LIBDIR'], [wrapperlib])
 env.Alias('install', env['INSTALL_LIBDIR'])
 
 # Handle the way we name libraries on a POSIX system
 if env['PLATFORM'] == 'posix':
     libs = [(env['CLIENTLIB'], clientlib), (env['SERVERLIB'], serverlib)]
-    if not env['FULL_MIMIC']:
-        libs.append((env['WRAPPERLIB'], wrapperlib))
     for lib_name, lib in libs:
         env.Command('#/common/lib' + lib_name + '.so.' + str(env['JACKAPI_MAJOR_VERSION']), lib, symlinkcmd)
         env.Command('#/common/lib' + lib_name + '.so', '#/common/lib' + lib_name + '.so.' + str(env['JACKAPI_MAJOR_VERSION']), symlinkcmd)