Merge control branch.

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

2 files changed, 11 insertions, 21 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 67321ace..a80f5895 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -33,38 +33,27 @@ env.AppendUnique(CPPPATH=['#/', '#/common'])
 
 test_programs = {
     'synchroClient': [
-        'testSynchroClient.cpp',
-        '#/common/JackPosixSemaphore.cpp',
-        '#/common/JackPosixThread.cpp',
-        '#/common/JackError.c',
-        '#/common/JackFifo.cpp'
+        'testSynchroClient.cpp'
         ],
     'synchroServer': [
-        'testSynchroServer.cpp',
-        '#/common/JackPosixSemaphore.cpp',
-        '#/common/JackPosixThread.cpp',
-        '#/common/JackError.c',
-        '#/common/JackFifo.cpp'
+        'testSynchroServer.cpp'
         ],
     'synchroServerClient': [
-        'testSynchroServerClient.cpp',
-        '#/common/JackPosixSemaphore.cpp',
-        '#/common/JackPosixThread.cpp',
-        '#/common/JackError.c',
-        '#/common/JackFifo.cpp'
-        ],
+        'testSynchroServerClient.cpp'
+         ],
     'testSem': [
-        'testSem.cpp',
-        '#/common/JackPosixSemaphore.cpp',
-        '#/common/JackPosixThread.cpp',
-        '#/common/JackError.c',
-        '#/common/JackFifo.cpp'
+        'testSem.cpp'
         ],
     'jack_test': [
         'jack_test.cpp'
         ],
 }
 
+# Libraries to link
+extra_libs = {}
+for test_program in test_programs:
+    extra_libs[test_program] = ['jackserver']
+
 #
 # Build section
 #
diff --git a/tests/testSem.cpp b/tests/testSem.cpp
index bfed3928..3ef24fc7 100644
--- a/tests/testSem.cpp
+++ b/tests/testSem.cpp
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef __APPLE__
 #include "JackMachSemaphore.h"