Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>

32 files changed, 71 insertions, 93 deletions

diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index e168447bd5a..6724439b7c4 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -1,4 +1,4 @@
-project: messaging, strategies {
+project(*server): messaging, server, strategies {
   requires += corba_messaging
 
   Source_Files {
@@ -8,7 +8,7 @@ project: messaging, strategies {
 }
 
 
-project(client): messaging, strategies {
+project(*client): messaging, server, strategies {
   exename  = client
   requires += corba_messaging
 
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index 30410cf5041..f1ee9d20e41 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,7 +1,7 @@
-project(client): server, strategies {
+project(*client): taoserver, strategies, dynamicinterface {
   exename   = client
-  depends  += IDL_Cubit_Server DynamicInterface
-  libs     += TAO_DynamicInterface
+  after    += IDL_Cubit_Server_Exe 
+  libs     += 
   idlflags += -Gd
 
   Source_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index 4b122cd44f5..322c702a920 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -1,4 +1,4 @@
-project(IDL Cubit Server): server, strategies {
+project(*Server): taoserver, strategies {
   idlflags += -Gd
 
   Source_Files {
@@ -11,7 +11,7 @@ project(IDL Cubit Server): server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies {
   exename   = client
   idlflags += -Gd
 
@@ -23,7 +23,7 @@ project(client): server, strategies {
   }
 }
 
-project(collocation): server, strategies {
+project(*collocation): taoserver, strategies {
   exename   = collocation/collocation_test
   idlflags += -Gd
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index 95c692c616f..b330bcc57ef 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   Source_Files {
     tmplinst.cpp
     Timer.cpp
@@ -9,7 +9,7 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies {
   exename = client
 
   Source_Files {
diff --git a/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
index b4d7798dfeb..51fd4a10708 100644
--- a/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH/Single_Threaded/Single_Threaded.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*AMH server): taoserver, strategies {
   idlflags += -GH
   requires += ami
 
@@ -8,7 +8,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(*AMH client): taoclient, strategies {
   idlflags += -GH
   requires += ami
 
diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc
index 1e2c79c0468..caea1f693ad 100644
--- a/TAO/performance-tests/Latency/AMI/AMI.mpc
+++ b/TAO/performance-tests/Latency/AMI/AMI.mpc
@@ -1,4 +1,4 @@
-project: messaging, strategies {
+project(*latency server): messaging, taoserver, strategies {
   idlflags -= -Sc
   idlflags += -GC
   requires += ami
@@ -10,7 +10,7 @@ project: messaging, strategies {
   }  
 }
  
-project(client): messaging, strategies {
+project(*latency client): messaging, taoserver, strategies {
   exename   = client
   idlflags -= -Sc
   idlflags += -GC
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index b766f9d5502..a54b77e76af 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*latency server): taoserver, strategies {
   avoids += minimum_corba
 
   Source_Files {
@@ -7,10 +7,8 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*latency client): taoserver, strategies, dynamicinterface {
   exename  = client
-  depends += DynamicInterface
-  libs    += TAO_DynamicInterface
   avoids  += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 822dda7b290..a09345a6fe5 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
-project: server, strategies {
-  depends += DynamicInterface
-  libs    += TAO_DynamicInterface
+project(*latency server): taoserver, strategies, dynamicinterface {
   avoids  += minimum_corba
 
   IDL_Files {
@@ -12,7 +10,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(*latency client): taoclient, strategies {
   avoids += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index a073c153a49..11703566fbe 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   avoids += minimum_corba
 
   Source_Files {
@@ -7,10 +7,8 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(*client): taoserver, strategies, dynamicinterface {
   exename  = client
-  depends += DynamicInterface
-  libs    += TAO_DynamicInterface
   avoids  += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index a4459ae3fde..bcfe645d131 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   avoids += minimum_corba
 
   Source_Files {
@@ -7,7 +7,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(*client): taoclient, strategies {
   avoids += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index c829a60b5aa..0d491f6e4b4 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,11 +1,11 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project: client, strategies {
+project(*client) : taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
index 4f27fdfdf35..edf85ac9ddc 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*latency server): taoserver, strategies {
   Source_Files {
     Roundtrip.cpp
     Worker_Thread.cpp
@@ -6,7 +6,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(*latency client): taoclient, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index e4bfb2a8701..f66ba34400d 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -1,11 +1,11 @@
-project: server {
+project(*server): taoserver {
   Source_Files {
-    Hello.cpp
+    Memory_Growth.cpp
     server.cpp
   }
 }
 
-project: client {
+project(*client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index 076d4d98fd5..e699ea13391 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,3 +1,3 @@
-project(create reference): server {
+project: taoserver {
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc
index 14c9bf2f374..bbe63e5b7a2 100644
--- a/TAO/performance-tests/POA/Demux/Demux.mpc
+++ b/TAO/performance-tests/POA/Demux/Demux.mpc
@@ -1,4 +1,4 @@
-project: namingexe {
+project(*poa server): namingexe {
   Source_Files {
     demux_test_server.cpp
     demux_test_i.cpp
@@ -6,7 +6,7 @@ project: namingexe {
   }
 }
 
-project(client): namingexe {
+project(*poa client): namingexe {
   exename = client
 
   Source_Files {
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index bce0ae4a4c2..3773b7f6b89 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -1,4 +1,4 @@
-project: server {
+project(*server): taoserver {
   Source_Files {
     Factory.cpp
     Simple.cpp
@@ -6,14 +6,14 @@ project: server {
   }
 }
 
-project: client {
+project(*client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
   }
 }
 
-project(collocated): server {
+project(*collocated): taoserver {
   exename = collocated
 
   Source_Files {
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index 7e0b0afdb61..fafea6dc2b4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -1,3 +1,3 @@
-project(registration): server {
+project(registration): taoserver {
   exename = registration
 }
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index fbdd68ba00e..11f18462fe0 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -1,4 +1,4 @@
-project: server {
+project(*server): taoserver {
   Source_Files {
     PP_Test_Server.cpp
     PP_Test_i.cpp
@@ -6,7 +6,7 @@ project: server {
   }
 }
 
-project: client {
+project(*client) : taoclient {
   Source_Files {
     PP_TestC.cpp
     PP_Test_Client.cpp
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 87f832826b4..38eacbb4a8c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,8 +1,6 @@
-project: taolib_with_idl {
-  sharedname = RTCORBA_Common
-  depends   += PortableServer
-  libs      += TAO_PortableServer TAO
-  requires  += rt_corba
-  idlflags  += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h
-  dllflags    = RTCORBA_COMMON_BUILD_DLL
+project(RTCORBA_Common): taolib_with_idl, portableserver {
+  sharedname   = RTCORBA_Common
+  requires    += rt_corba
+  idlflags    += -Wb,export_macro=RTCORBA_COMMON_Export -Wb,export_include=rtcorba_common_export.h
+  dynamicflags = RTCORBA_COMMON_BUILD_DLL
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
index d96b93a86ad..01472f35f36 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
@@ -1,18 +1,10 @@
-project: rt_server, strategies {
-  depends  += Common
-  libs     += RTCORBA_Common
-  includes += ../Common
-
+project(*server): rt_server, strategies, rtcorbacommon {
   Source_Files {
     server.cpp
   }
 }
 
-project: rt_client, strategies {
-  depends  += Common
-  libs     += RTCORBA_Common
-  includes += ../Common
-
+project(*client): rt_client, strategies, rtcorbacommon {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
index d96b93a86ad..01472f35f36 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
@@ -1,18 +1,10 @@
-project: rt_server, strategies {
-  depends  += Common
-  libs     += RTCORBA_Common
-  includes += ../Common
-
+project(*server): rt_server, strategies, rtcorbacommon {
   Source_Files {
     server.cpp
   }
 }
 
-project: rt_client, strategies {
-  depends  += Common
-  libs     += RTCORBA_Common
-  includes += ../Common
-
+project(*client): rt_client, strategies, rtcorbacommon {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index 9a70b67972e..21de87f2cdb 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -1,11 +1,11 @@
-project: rt_server, messaging_only {
+project(*oneways server): rt_server, messaging {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project: rt_client, messaging_only {
+project(*oneways client): rt_client, messaging {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 1fb55017b86..dcd9ab3ae37 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -1,10 +1,10 @@
-project: rt_server {
+project(*RTCorba server): rt_server {
   Source_Files {
     server.cpp
   }
 }
 
-project: rt_client {
+project(*RTCorba client): rt_client {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc
index b4d7798dfeb..ddc76182b9b 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH/Single_Threaded/Single_Threaded.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*AMH sequence server): server, strategies {
   idlflags += -GH
   requires += ami
 
@@ -8,7 +8,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(* AMH sequence client): client, strategies {
   idlflags += -GH
   requires += ami
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
index 1e2c79c0468..0238ad5ff7a 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
@@ -1,4 +1,4 @@
-project: messaging, strategies {
+project(* sequence server): messaging, strategies {
   idlflags -= -Sc
   idlflags += -GC
   requires += ami
@@ -10,7 +10,7 @@ project: messaging, strategies {
   }  
 }
  
-project(client): messaging, strategies {
+project(* sequence client): messaging, strategies {
   exename   = client
   idlflags -= -Sc
   idlflags += -GC
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 822dda7b290..49c6abac707 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,5 +1,5 @@
-project: server, strategies {
-  depends += DynamicInterface
+project(* sequence server) : server, strategies {
+  after += DynamicInterface
   libs    += TAO_DynamicInterface
   avoids  += minimum_corba
 
@@ -12,7 +12,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(* sequence client): client, strategies {
   avoids += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index a073c153a49..011aad78b25 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(* sequence server): server, strategies {
   avoids += minimum_corba
 
   Source_Files {
@@ -7,9 +7,9 @@ project: server, strategies {
   }
 }
 
-project(client): server, strategies {
+project(* sequence client): server, strategies {
   exename  = client
-  depends += DynamicInterface
+  after += DynamicInterface
   libs    += TAO_DynamicInterface
   avoids  += minimum_corba
 
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index a4459ae3fde..43ec77f05a1 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(* sequence server) : server, strategies {
   avoids += minimum_corba
 
   Source_Files {
@@ -7,7 +7,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(* sequence client): client, strategies {
   avoids += minimum_corba
 
   Source_Files {
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index c829a60b5aa..aa1d790c1a9 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,11 +1,11 @@
-project: server, strategies {
+project(* sequence server): server, strategies {
   Source_Files {
     Roundtrip.cpp
     server.cpp
   }
 }
 
-project: client, strategies {
+project(* sequence client): client, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
index 4f27fdfdf35..dfa17b43c8d 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(* sequence server): server, strategies {
   Source_Files {
     Roundtrip.cpp
     Worker_Thread.cpp
@@ -6,7 +6,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(* sequence client): client, strategies {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index b094a1ddbea..87940c2d100 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -1,4 +1,4 @@
-project: server, strategies {
+project(*server): taoserver, strategies {
   Source_Files {
     Receiver_Factory.cpp
     Receiver.cpp
@@ -6,7 +6,7 @@ project: server, strategies {
   }
 }
 
-project: client, strategies {
+project(*client):taoclient, strategies {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc
new file mode 100644
index 00000000000..d90104a2381
--- /dev/null
+++ b/TAO/performance-tests/perf.mwc
@@ -0,0 +1,2 @@
+workspace {
+}