ChangeLogTag: Tue May 24 14:15:36 2005 J.T. Conklin <jtc@acorntoolworks.com>

4 files changed, 109 insertions, 114 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e9b7cd1142c..58aa303fd5b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 24 14:15:36 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/RTEvent.mpc:
+	* orbsvcs/orbsvcs/RTEvent_Serv.mpc:
+	* orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+
+	  Removed RTEvent MPC group.  This causes problems when project
+	  Makefile.am's are aggregated.
+
 Tue May 24 11:59:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* orbsvcs/orbsvcs/Time_Utilities.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index df6a5b85649..bb113218e00 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -16,34 +16,28 @@ project(RTEvent) : orbsvcslib, core, svc_utils {
 
   // This could be simplified if the cpp files for RTEvent were
   // in their own directory.
-  Source_Files(ORBSVCS_COMPONENTS) {
-    RTEvent {
-      Event_Utilities.cpp
-      RtecDefaultEventDataC.cpp
-      RtecEventCommC.cpp
-      RtecEventChannelAdminC.cpp
-      RtecUDPAdminC.cpp
-    }
+  Source_Files {
+    Event_Utilities.cpp
+    RtecDefaultEventDataC.cpp
+    RtecEventCommC.cpp
+    RtecEventChannelAdminC.cpp
+    RtecUDPAdminC.cpp
   }
 
-  Header_Files (ORBSVCS_COMPONENTS) {
-    RTEvent {
-      Event_Utilities.h
-      RtecDefaultEventDataC.h
-      RtecEventCommC.h
-      RtecEventChannelAdminC.h
-      RtecUDPAdminC.h
-    }
+  Header_Files {
+    Event_Utilities.h
+    RtecDefaultEventDataC.h
+    RtecEventCommC.h
+    RtecEventChannelAdminC.h
+    RtecUDPAdminC.h
   }
 
-  Inline_Files (ORBSVCS_COMPONENTS) {
-    RTEvent {
-      Event_Utilities.i
-      RtecDefaultEventDataC.inl
-      RtecEventCommC.inl
-      RtecEventChannelAdminC.inl
-      RtecUDPAdminC.inl
-    }
+  Inline_Files {
+    Event_Utilities.i
+    RtecDefaultEventDataC.inl
+    RtecEventCommC.inl
+    RtecEventChannelAdminC.inl
+    RtecUDPAdminC.inl
   }
 
   Resource_Files{
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index b3c4879b0dd..e6ccf146625 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -9,75 +9,73 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
   IDL_Files {
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    RTEvent {
-      Event/ECG_Adapters.cpp
-      Event/ECG_Address_Server_Base.cpp
-      Event/ECG_CDR_Message_Receiver.cpp
-      Event/ECG_CDR_Message_Sender.cpp
-      Event/ECG_Complex_Address_Server.cpp
-      Event/ECG_Mcast_EH.cpp
-      Event/ECG_Mcast_Gateway.cpp
-      Event/ECG_Simple_Address_Server.cpp
-      Event/ECG_Simple_Mcast_EH.cpp
-      Event/ECG_UDP_EH.cpp
-      Event/ECG_UDP_Out_Endpoint.cpp
-      Event/ECG_UDP_Receiver.cpp
-      Event/ECG_UDP_Sender.cpp
-      Event/ECG_ConsumerEC_Control.cpp
-      Event/ECG_Reactive_ConsumerEC_Control.cpp
-      Event/ECG_Reconnect_ConsumerEC_Control.cpp
-      Event/EC_And_Filter.cpp
-      Event/EC_Basic_Factory.cpp
-      Event/EC_Basic_Filter_Builder.cpp
-      Event/EC_Bitmask_Filter.cpp
-      Event/EC_Channel_Destroyer.cpp
-      Event/EC_Conjunction_Filter.cpp
-      Event/EC_ConsumerAdmin.cpp
-      Event/EC_ConsumerControl.cpp
-      Event/EC_Default_Factory.cpp
-      Event/EC_Default_ProxyConsumer.cpp
-      Event/EC_Default_ProxySupplier.cpp
-      Event/EC_Disjunction_Filter.cpp
-      Event/EC_Dispatching.cpp
-      Event/EC_Dispatching_Task.cpp
-      Event/EC_Event_Channel.cpp
-      Event/EC_Event_Channel_Base.cpp
-      Event/EC_Factory.cpp
-      Event/EC_Filter.cpp
-      Event/EC_Filter_Builder.cpp
-      Event/EC_Gateway.cpp
-      Event/EC_Gateway_IIOP.cpp
-      Event/EC_Gateway_IIOP_Factory.cpp
-      Event/EC_Group_Scheduling.cpp
-      Event/EC_Lifetime_Utils.cpp
-      Event/EC_Masked_Type_Filter.cpp
-      Event/EC_MT_Dispatching.cpp
-      Event/EC_Negation_Filter.cpp
-      Event/EC_Null_Factory.cpp
-      Event/EC_Null_Scheduling.cpp
-      Event/EC_ObserverStrategy.cpp
-      Event/EC_Per_Supplier_Filter.cpp
-      Event/EC_Prefix_Filter_Builder.cpp
-      Event/EC_ProxyConsumer.cpp
-      Event/EC_ProxySupplier.cpp
-      Event/EC_Proxy_Disconnector.cpp
-      Event/EC_QOS_Info.cpp
-      Event/EC_Reactive_ConsumerControl.cpp
-      Event/EC_Reactive_Dispatching.cpp
-      Event/EC_Reactive_SupplierControl.cpp
-      Event/EC_Reactive_Timeout_Generator.cpp
-      Event/EC_Scheduling_Strategy.cpp
-      Event/EC_SupplierAdmin.cpp
-      Event/EC_SupplierControl.cpp
-      Event/EC_Supplier_Filter.cpp
-      Event/EC_Supplier_Filter_Builder.cpp
-      Event/EC_Timeout_Filter.cpp
-      Event/EC_Timeout_Generator.cpp
-      Event/EC_Trivial_Supplier_Filter.cpp
-      Event/EC_Type_Filter.cpp
-      Event/EC_UDP_Admin.cpp
-    }
+  Source_Files {
+    Event/ECG_Adapters.cpp
+    Event/ECG_Address_Server_Base.cpp
+    Event/ECG_CDR_Message_Receiver.cpp
+    Event/ECG_CDR_Message_Sender.cpp
+    Event/ECG_Complex_Address_Server.cpp
+    Event/ECG_Mcast_EH.cpp
+    Event/ECG_Mcast_Gateway.cpp
+    Event/ECG_Simple_Address_Server.cpp
+    Event/ECG_Simple_Mcast_EH.cpp
+    Event/ECG_UDP_EH.cpp
+    Event/ECG_UDP_Out_Endpoint.cpp
+    Event/ECG_UDP_Receiver.cpp
+    Event/ECG_UDP_Sender.cpp
+    Event/ECG_ConsumerEC_Control.cpp
+    Event/ECG_Reactive_ConsumerEC_Control.cpp
+    Event/ECG_Reconnect_ConsumerEC_Control.cpp
+    Event/EC_And_Filter.cpp
+    Event/EC_Basic_Factory.cpp
+    Event/EC_Basic_Filter_Builder.cpp
+    Event/EC_Bitmask_Filter.cpp
+    Event/EC_Channel_Destroyer.cpp
+    Event/EC_Conjunction_Filter.cpp
+    Event/EC_ConsumerAdmin.cpp
+    Event/EC_ConsumerControl.cpp
+    Event/EC_Default_Factory.cpp
+    Event/EC_Default_ProxyConsumer.cpp
+    Event/EC_Default_ProxySupplier.cpp
+    Event/EC_Disjunction_Filter.cpp
+    Event/EC_Dispatching.cpp
+    Event/EC_Dispatching_Task.cpp
+    Event/EC_Event_Channel.cpp
+    Event/EC_Event_Channel_Base.cpp
+    Event/EC_Factory.cpp
+    Event/EC_Filter.cpp
+    Event/EC_Filter_Builder.cpp
+    Event/EC_Gateway.cpp
+    Event/EC_Gateway_IIOP.cpp
+    Event/EC_Gateway_IIOP_Factory.cpp
+    Event/EC_Group_Scheduling.cpp
+    Event/EC_Lifetime_Utils.cpp
+    Event/EC_Masked_Type_Filter.cpp
+    Event/EC_MT_Dispatching.cpp
+    Event/EC_Negation_Filter.cpp
+    Event/EC_Null_Factory.cpp
+    Event/EC_Null_Scheduling.cpp
+    Event/EC_ObserverStrategy.cpp
+    Event/EC_Per_Supplier_Filter.cpp
+    Event/EC_Prefix_Filter_Builder.cpp
+    Event/EC_ProxyConsumer.cpp
+    Event/EC_ProxySupplier.cpp
+    Event/EC_Proxy_Disconnector.cpp
+    Event/EC_QOS_Info.cpp
+    Event/EC_Reactive_ConsumerControl.cpp
+    Event/EC_Reactive_Dispatching.cpp
+    Event/EC_Reactive_SupplierControl.cpp
+    Event/EC_Reactive_Timeout_Generator.cpp
+    Event/EC_Scheduling_Strategy.cpp
+    Event/EC_SupplierAdmin.cpp
+    Event/EC_SupplierControl.cpp
+    Event/EC_Supplier_Filter.cpp
+    Event/EC_Supplier_Filter_Builder.cpp
+    Event/EC_Timeout_Filter.cpp
+    Event/EC_Timeout_Generator.cpp
+    Event/EC_Trivial_Supplier_Filter.cpp
+    Event/EC_Type_Filter.cpp
+    Event/EC_UDP_Admin.cpp
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index 41596e93849..f20126be145 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -8,31 +8,25 @@ project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   IDL_Files {
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    RTEvent {
-      RtecDefaultEventDataS.cpp
-      RtecEventCommS.cpp
-      RtecEventChannelAdminS.cpp
-      RtecUDPAdminS.cpp
-    }
+  Source_Files {
+    RtecDefaultEventDataS.cpp
+    RtecEventCommS.cpp
+    RtecEventChannelAdminS.cpp
+    RtecUDPAdminS.cpp
   }
 
-  Header_Files(ORBSVCS_COMPONENTS) {
-    RTEvent {
-      RtecDefaultEventDataS.h
-      RtecEventCommS.h
-      RtecEventChannelAdminS.h
-      RtecUDPAdminS.h
-    }
+  Header_Files {
+    RtecDefaultEventDataS.h
+    RtecEventCommS.h
+    RtecEventChannelAdminS.h
+    RtecUDPAdminS.h
   }
 
-  Inline_Files(ORBSVCS_COMPONENTS) {
-    RTEvent {
-      RtecDefaultEventDataS.inl
-      RtecEventCommS.inl
-      RtecEventChannelAdminS.inl
-      RtecUDPAdminS.inl
-    }
+  Inline_Files {
+    RtecDefaultEventDataS.inl
+    RtecEventCommS.inl
+    RtecEventChannelAdminS.inl
+    RtecUDPAdminS.inl
   }
 
   Template_Files {