Mon Feb 25 22:19:46 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

9 files changed, 18 insertions, 14 deletions

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 34a7b2c47a7..87b18edc6fa 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -291,7 +291,7 @@ FactoryClient::run_test (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "The FactoryClient will test the Cos Event Channel Factory\n"));
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
index 2ca49905292..0e342ef78dd 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
@@ -5,7 +5,7 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
   FactoryDriver driver;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index d74001a0687..695bb3c5de2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -2,8 +2,9 @@
 // $Id$
 
 project : orbsvcsexe, rtevent_serv, event_skel, naming {
-  after += CosEC_RtEC_Based_lib
-  libs += CosEC_RtEC_Based
+  after   += CosEC_RtEC_Based_lib
+  exename  = RtEC_Based_CosEC
+  libs    += CosEC_RtEC_Based
 
   specific (automake) {
     includes += $(srcdir)/../lib
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index fc4bd909e0e..456d1712db5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -239,7 +239,7 @@ RtEC_Based_CosEC::shutdown (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 8598acf7d98..98c5602a60b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -5,7 +5,7 @@
 #include "CosEvent_Utilities.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Basic basic;
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index d3d306ab424..76c9233f7b1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -2,8 +2,9 @@
 // $Id$
 
 project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
-  after += CosEC_RtEC_Based_lib
-  libs += CosEC_RtEC_Based
+  after   += CosEC_RtEC_Based_lib
+  exename  = Basic
+  libs    += CosEC_RtEC_Based
 
   specific (automake) {
     includes += $(srcdir)/../../lib
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 099d0f4b492..009b5b33292 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -147,7 +147,7 @@ Consumer::init_Consumer (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Consumer cons;
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index c67b64d7ae6..26e13fb8f74 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -2,8 +2,9 @@
 // $Id$
 
 project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
-  after += CosEC_RtEC_Based_lib
-  libs += CosEC_RtEC_Based
+  after    += CosEC_RtEC_Based_lib
+  exename   = Consumer
+  libs     += CosEC_RtEC_Based
   libpaths += ../../lib
 
   specific (automake) {
@@ -19,8 +20,9 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
 }
 
 project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
-  after += CosEC_RtEC_Based_lib *Cons
-  libs += CosEC_RtEC_Based
+  after    += CosEC_RtEC_Based_lib *Cons
+  exename   = Supplier
+  libs     += CosEC_RtEC_Based
   libpaths += ../../lib
 
   source_files {
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index d5c45142eeb..c192fe0ab28 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -142,7 +142,7 @@ Supplier::run (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Supplier supp;