From 88c195d43ad2baa77bd637a42a315978dd54802d Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 24 Nov 2008 16:04:31 +0000
Subject: [PATCH] Correct wscript for jack_disconnect installation, various
 renaming.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3117 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/wscript                                               | 5 -----
 .../{jack_server_control.cpp => server_control.cpp}          | 0
 example-clients/wscript                                      | 4 ++--
 macosx/wscript                                               | 3 ---
 tests/wscript                                                | 2 +-
 5 files changed, 3 insertions(+), 11 deletions(-)
 rename example-clients/{jack_server_control.cpp => server_control.cpp} (100%)

diff --git a/common/wscript b/common/wscript
index 683bd1fb..1c0a1c4f 100644
--- a/common/wscript
+++ b/common/wscript
@@ -30,9 +30,6 @@ def create_jack_process_obj(bld, target, sources, uselib = None):
         process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
         #process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
         process.env.append_value("LINKFLAGS", "")
-    #steph
-    #process.inst_var = bld.env['ADDON_DIR']
-    #process.inst_dir = '/'
     process.install_path = '${ADDON_DIR}/'
     process.uselib_local = uselib.name
     return process
@@ -231,6 +228,4 @@ def build(bld):
                 'JACK_VERSION': bld.env['JACK_VERSION'],
                 }
     obj.install_path = '${PREFIX}/lib/pkgconfig/'
-    #steph  
-    #obj.fun = subst_func # @VAR@ -> ${VAR}
     obj.fun = misc.subst_func
diff --git a/example-clients/jack_server_control.cpp b/example-clients/server_control.cpp
similarity index 100%
rename from example-clients/jack_server_control.cpp
rename to example-clients/server_control.cpp
diff --git a/example-clients/wscript b/example-clients/wscript
index ea2ea43c..c1d96e56 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -19,7 +19,7 @@ example_programs = {
     'jack_evmon' : 'evmon.c',
     'jack_monitor_client' : 'monitor_client.c',
     'jack_thru' : 'thru_client.c',
-    'jack_server_control' : 'jack_server_control.cpp',
+    'jack_server_control' : 'server_control.cpp',
     }
 
 example_libs = {
@@ -112,6 +112,6 @@ def build(bld):
         lib.uselib_local = 'serverlib'
         lib.install_path = '${ADDON_DIR}/'
 
-    bld.symlink_as('${PREFIX}/jack_connect', 'bin/jack_disconnect')
+    bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
 
     bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0755)
diff --git a/macosx/wscript b/macosx/wscript
index c48418d7..a67869c0 100644
--- a/macosx/wscript
+++ b/macosx/wscript
@@ -23,9 +23,6 @@ def create_jack_audio_driver_obj(bld, target, sources, uselib = None):
     driver.includes = ['.', '../macosx', '../posix', '../common', '../common/jack']
     driver.target = target
     driver.source = sources
-    #steph
-    #driver.inst_var = bld.env['ADDON_DIR']
-    #driver.inst_dir = '/'
     driver.install_path = '${ADDON_DIR}/'
     driver.uselib_local = 'serverlib'
     driver.env.append_value("LINKFLAGS", "-framework CoreAudio -framework CoreServices -framework AudioUnit")
diff --git a/tests/wscript b/tests/wscript
index 70c860b1..91eb9fa2 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -9,7 +9,7 @@ test_programs = {
     'jack_test': ['jack_test.cpp'],
     'jack_cpu': ['jack_cpu.c'],
     'jdelay': ['jdelay.cpp'],
-    'multiple_metro' : ['external_metro.cpp'],
+    'jack_multiple_metro' : ['external_metro.cpp'],
     }
 
 def build(bld):