ChangeLogTag: Tue Jun 6 17:25:15 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 34 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 554daf4e18b..e00fa490922 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jun  6 17:25:15 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/tao_idl.mpc:
+
+          Combined two automake specific sections into one.
+
+        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc:
+        * orbsvcs/tests/FtRtEvent/FtRtEvent.mpc:
+
+          Replaced a gnuace specific section to link in tje TAO_Strategies
+          library with the inheritance of the strategies base project.
+
 Tue Jun  6 17:02:57 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
         * tests/DII_Collocation_Tests/Client_Task.cpp:
@@ -10,9 +23,9 @@ Tue Jun  6 17:02:57 UTC 2006  Yan Dai  <dai_y@ociweb.com>
         * tests/DII_Collocation_Tests/Server_Task.cpp:
         * tests/DII_Collocation_Tests/Server_Task.h:
         * tests/DII_Collocation_Tests/Test.idl:
-        
-          Added incomplete twoway test. More test cases (OUT, INOUT and 
-          RETURN) need be added. 
+
+          Added incomplete twoway test. More test cases (OUT, INOUT and
+          RETURN) need be added.
 
 Tue Jun  6 14:48:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
@@ -334,11 +347,11 @@ Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
         * tests/DII_Collocation_Tests/Server_Task.cpp:
         * tests/DII_Collocation_Tests/Server_Task.h:
         * tests/DII_Collocation_Tests/Test.idl:
-        
-          These files are moved to the tests/DII_Collocation_Tests/oneway 
+
+          These files are moved to the tests/DII_Collocation_Tests/oneway
           directory since a new test for twoway collocated DII request
           is added.
-          
+
         * tests/DII_Collocation_Tests/oneway/Client_Task.cpp:
         * tests/DII_Collocation_Tests/oneway/Client_Task.h:
         * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
@@ -350,9 +363,9 @@ Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
         * tests/DII_Collocation_Tests/oneway/Server_Task.cpp:
         * tests/DII_Collocation_Tests/oneway/Server_Task.h:
         * tests/DII_Collocation_Tests/oneway/Test.idl:
-        
+
           These files are moved from tests/DII_Collocation_Tests directory.
-        
+
         * tests/DII_Collocation_Tests/twoway/Client_Task.cpp:
         * tests/DII_Collocation_Tests/twoway/Client_Task.h:
         * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
@@ -366,10 +379,10 @@ Thu Jun  1 23:13:58 UTC 2006  Yan Dai  <dai_y@ociweb.com>
         * tests/DII_Collocation_Tests/twoway/Test.idl:
 
           Added a test for twoway collocation DII request via invoke ().
-          This test should fail now for the same reason as the 
+          This test should fail now for the same reason as the
           oneway collocation DII request. See bugzilla bug #2545
-          for details. 
-          
+          for details.
+
 Thu Jun  1 17:53:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
@@ -404,8 +417,8 @@ Thu Jun  1 16:54:56 UTC 2006  Yan Dai  <dai_y@ociweb.com>
         * tests/DII_Collocation_Tests/Test.idl:
 
           Added new DII_Collocation_Tests test to show bug #2545.
-          The test crashes on get_in_arg() or gives incorrect arguments 
-          when the request is collocated oneway request and has "IN" 
+          The test crashes on get_in_arg() or gives incorrect arguments
+          when the request is collocated oneway request and has "IN"
           arguments. See bugzilla bug #2545.
 
 Thu Jun  1 14:16:06 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 2fb895074f4..bdc0f5492be 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -9,6 +9,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 
   specific (automake) {
     includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
+    macros      += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\"
   } else {
     includes    += include be_include fe
   }
@@ -21,10 +22,6 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
     optimize =
   }
 
-  specific(automake) {
-    macros += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\"
-  }
-
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
       ifeq ($(ACE_CC_PREPROCESSOR),)
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index fcf1d07ad22..88dc0523ae3 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,12 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel {
+project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies {
   after    += FaultTolerance
   exename   = ftrtec_factory_service
-
-  specific(gnuace) {
-   lit_libs += TAO_Strategies
-  }
 }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
index 7625ff12fa2..50c652b095d 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
@@ -1,16 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-  project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient {
+project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient, strategies {
   exename   = ftrtec_gateway_service
   includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
 
   Source_Files {
     FTRTEC_Gateway_Service.cpp
   }
-
-  specific(gnuace) {
-   lit_libs += TAO_Strategies
-  }
 }
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
index ef3f12c10cd..774382d8d09 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
+++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Consumer):  orbsvcsexe, ftrteventclient {
-  exename   = consumer
-  specific(gnuace) {
-   lit_libs += TAO_Strategies
-  }
+project(*Consumer):  orbsvcsexe, ftrteventclient, strategies {
+  exename = consumer
+
   Source_Files {
     consumer.cpp
     PushConsumer.cpp
@@ -16,12 +14,9 @@ project(*Consumer):  orbsvcsexe, ftrteventclient {
   }
 }
 
-project(*Supplier):  orbsvcsexe, ftrteventclient {
-  exename   = supplier
+project(*Supplier):  orbsvcsexe, ftrteventclient, strategies {
+  exename = supplier
 
-   specific(gnuace) {
-   lit_libs += TAO_Strategies
-  }
   Source_Files {
     supplier.cpp
     PushSupplier.cpp