ChangeLogTag: Thu Dec 08 20:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 30 insertions, 15 deletions

diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 5f43c5681ad..4763660aedd 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -8,7 +8,9 @@ project(*Server): messaging, taoserver, ami {
   }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami {
+project(*Client): messaging, taoserver, ami {
+  exename = client
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index 4377ad161f0..64853bac615 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -9,6 +9,7 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
+  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 04ff8054866..131fa143ce3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,19 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+project(*Server): messaging, taoserver, ami, namingexe {
   avoids += ace_for_tao
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
-  }  
+  }
 }
- 
-project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+
+project(*Client): messaging, taoserver, ami, namingexe {
+  exename = client
+  after += *Server
   avoids += ace_for_tao
   Source_Files {
     client.cpp
     Iterator_Handler.cpp
-  }  
+  }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index aa35bda1278..f90c6ae59e6 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,20 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami, namingexe {
+project(*Server): messaging, taoserver, ami, namingexe {
   avoids += ace_for_tao
   Source_Files {
     Callback_Handler.cpp
     Push_Iterator_Factory_i.cpp
     server.cpp
-  }  
+  }
 }
- 
-project(*Client): messaging, taoexe, portableserver, ami, namingexe {
+
+project(*Client): messaging, taoserver, ami, namingexe {
+  exename = client
+  after += *Server
   avoids += ace_for_tao
   Source_Files {
     client.cpp
     Callback_i.cpp
     Push_Iterator_Handler.cpp
-  }  
+  }
 }
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 42019ecd282..14996eef97a 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -11,6 +11,7 @@ project(*Server): namingexe, portableserver {
 }
 
 project(*Client): namingexe {
+  after += *Server
   avoids += ace_for_tao
   Source_Files {
     Web_ServerC.cpp
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 62a433a23c3..0d6f29c8993 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,5 +1,6 @@
 //$Id$
 project(*Client) : taoclient, messaging, minimum_corba {
+  after += *Server
   source_files {
     DatabaseC.cpp
     client.cpp
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 897515a3602..693dfa2452d 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Client) : taoclient, anytypecode, minimum_corba {
+  after += *Server
   source_files {
     FileC.cpp
     client.cpp
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index c3a57d77905..766a23d2493 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoserver, strategies {
   idlflags += -Sp -Sd
 
   Source_Files {
@@ -11,7 +11,9 @@ project(*server): taoexe, portableserver, strategies {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
+project(*client): taoserver, strategies {
+  exename = client
+  after += *server
   idlflags += -Sp -Sd
 
   Source_Files {
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index 45de340b324..cf80e74a598 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoserver, strategies {
   idlflags += -Sp -Sd
 
   Source_Files {
@@ -10,8 +10,10 @@ project(*server): taoexe, portableserver, strategies {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
+project(*client): taoserver, strategies {
+  exename = client
   idlflags += -Sp -Sd
+  after += *server
 
   Source_Files {
     client.cpp
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index a6175869bf6..95ebb3da152 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -10,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  after += *Server
   Source_Files {
     interop_wcharC.cpp
     wchar_reference.cpp