From cb0331cf4b9918bb039f4c7f0292f743b32ebd88 Mon Sep 17 00:00:00 2001 From: sletz Date: Mon, 17 Mar 2008 16:23:33 +0000 Subject: [PATCH] jack_control renamed in jack_server_control git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2022 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/Makefile | 8 ++++---- macosx/Jackdmp.xcodeproj/project.pbxproj | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 247aa4e4..c97ef301 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -65,7 +65,7 @@ CXXFLAGS := -g -O3 -fPIC -DJACKMP -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\ all : $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) \ $(TARGET_LINUX_SERVER) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_DUMMY) \ - synchroClient synchroServer synchroServerClient testSem jack_test inprocess jack_load jack_unload jack_control + synchroClient synchroServer synchroServerClient testSem jack_test inprocess jack_load jack_unload jack_server_control freebob : $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) \ $(TARGET_LINUX_SERVER) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_FREEBOB) $(TARGET_LINUX_DUMMY) \ @@ -99,8 +99,8 @@ jack_load: ipload.o jack_unload: ipunload.o $(CXX) $(CXXFLAGS) ipunload.o -L. -ljackmp -o jack_unload -jack_control: control.o - $(CXX) $(CXXFLAGS) control.o -L. -ljackservermp -o jack_control +jack_server_control: control.o + $(CXX) $(CXXFLAGS) control.o -L. -ljackservermp -o jack_server_control $(TARGET_LINUX_SERVER_LIB) : $(objects_common_server_lib) $(CXX) $(CXXFLAGS) -shared $(objects_common_server_lib) $(LIB_LINUX) -o $(TARGET_LINUX_SERVER_LIB) @@ -186,7 +186,7 @@ remove: clean : rm -f *.o rm -f $(TARGET_LINUX_SERVER) $(TARGET_LINUX_SERVER_LIB) $(TARGET_LINUX_CLIENT_LIB) $(TARGET_LINUX_WRAPPER_LIB) $(TARGET_LINUX_ALSA) $(TARGET_LINUX_FREEBOB) $(TARGET_LINUX_FIREWIRE) $(TARGET_LINUX_DUMMY) \ - synchroClient synchroServer synchroServerClient testSem jack_test jack_load jack_unload inprocess.so jack_control + synchroClient synchroServer synchroServerClient testSem jack_test jack_load jack_unload inprocess.so jack_server_control depend : #makedepend -w120 -Y -- $(CXXFLAGS) -- $(sources) diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index f2de9977..f6557c95 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -872,7 +872,7 @@ isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = 4BA7FEB90D8E76270017FF73 /* jack_control Universal */; + remoteGlobalIDString = 4BA7FEB90D8E76270017FF73; remoteInfo = "jack_control Universal"; }; 4BD624D20CBCF55700DE782F /* PBXContainerItemProxy */ = { @@ -1108,7 +1108,7 @@ 4BA692B20CBE4C2D00EAD520 /* ipload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipload.c; path = "../example-clients/ipload.c"; sourceTree = SOURCE_ROOT; }; 4BA692D40CBE4C9000EAD520 /* jack_unload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_unload; sourceTree = BUILT_PRODUCTS_DIR; }; 4BA692D60CBE4CC600EAD520 /* ipunload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipunload.c; path = "../example-clients/ipunload.c"; sourceTree = SOURCE_ROOT; }; - 4BA7FEC30D8E76270017FF73 /* jack_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_control; sourceTree = BUILT_PRODUCTS_DIR; }; + 4BA7FEC30D8E76270017FF73 /* jack_server_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_server_control; sourceTree = BUILT_PRODUCTS_DIR; }; 4BA7FEC80D8E76650017FF73 /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = "../example-clients/control.c"; sourceTree = SOURCE_ROOT; }; 4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortType.cpp; path = ../common/JackPortType.cpp; sourceTree = SOURCE_ROOT; }; 4BAB95B70B9E20B800A0C723 /* JackPortType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortType.h; path = ../common/JackPortType.h; sourceTree = SOURCE_ROOT; }; @@ -1749,7 +1749,7 @@ 4B0A296D0D5231DC002EFF74 /* jack_mp_thread_wait */, 4B0A2A650D524AB2002EFF74 /* jack_mp_thread_wait */, 4B57F5950D72C27900B4E719 /* jack_thread_wait1 */, - 4BA7FEC30D8E76270017FF73 /* jack_control */, + 4BA7FEC30D8E76270017FF73 /* jack_server_control */, ); name = Products; sourceTree = ""; @@ -3749,9 +3749,9 @@ productReference = 4BA692D40CBE4C9000EAD520 /* jack_unload */; productType = "com.apple.product-type.tool"; }; - 4BA7FEB90D8E76270017FF73 /* jack_control Universal */ = { + 4BA7FEB90D8E76270017FF73 /* jack_server_control Universal */ = { isa = PBXNativeTarget; - buildConfigurationList = 4BA7FEBF0D8E76270017FF73 /* Build configuration list for PBXNativeTarget "jack_control Universal" */; + buildConfigurationList = 4BA7FEBF0D8E76270017FF73 /* Build configuration list for PBXNativeTarget "jack_server_control Universal" */; buildPhases = ( 4BA7FEBA0D8E76270017FF73 /* Headers */, 4BA7FEBB0D8E76270017FF73 /* Sources */, @@ -3762,10 +3762,10 @@ ); dependencies = ( ); - name = "jack_control Universal"; + name = "jack_server_control Universal"; productInstallPath = /usr/local/bin; productName = jack_lsp; - productReference = 4BA7FEC30D8E76270017FF73 /* jack_control */; + productReference = 4BA7FEC30D8E76270017FF73 /* jack_server_control */; productType = "com.apple.product-type.tool"; }; 4BD623ED0CBCF0F000DE782F /* inprocess */ = { @@ -3891,7 +3891,7 @@ 4B699D27097D421600A18468 /* testSem Universal */, 4B699D3F097D421600A18468 /* zombie Universal */, 4BE6C6910A3E096F005A203A /* jack_test Universal */, - 4BA7FEB90D8E76270017FF73 /* jack_control Universal */, + 4BA7FEB90D8E76270017FF73 /* jack_server_control Universal */, 4BE99D260AD7A04800C59091 /* jack_cpu Universal */, 4BA692A60CBE4BC700EAD520 /* jack_load Universal */, 4BA692CA0CBE4C9000EAD520 /* jack_unload Universal */, @@ -5241,7 +5241,7 @@ }; 4BA7FECD0D8E76810017FF73 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 4BA7FEB90D8E76270017FF73 /* jack_control Universal */; + target = 4BA7FEB90D8E76270017FF73 /* jack_server_control Universal */; targetProxy = 4BA7FECC0D8E76810017FF73 /* PBXContainerItemProxy */; }; 4BD624D30CBCF55700DE782F /* PBXTargetDependency */ = { @@ -11500,7 +11500,7 @@ Jackservermp, ); OTHER_REZFLAGS = ""; - PRODUCT_NAME = jack_control; + PRODUCT_NAME = jack_server_control; REZ_EXECUTABLE = YES; SDKROOT = ""; SECTORDER_FLAGS = ""; @@ -12629,7 +12629,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Default; }; - 4BA7FEBF0D8E76270017FF73 /* Build configuration list for PBXNativeTarget "jack_control Universal" */ = { + 4BA7FEBF0D8E76270017FF73 /* Build configuration list for PBXNativeTarget "jack_server_control Universal" */ = { isa = XCConfigurationList; buildConfigurations = ( 4BA7FEC00D8E76270017FF73 /* Development */,