1 files changed, 91 insertions, 96 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 87fab05f21c..5c7c8eadebc 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
+project(CosNotification_IDL) : orbsvcslib, core, event {
+
   custom_only = 1
-  idlflags   += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
+
+  idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
 
   IDL_Files {
     CosNotification.idl
@@ -18,8 +20,8 @@ project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defau
 project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
-  tagchecks   += Notify
-  after       += CosNotification_IDL
+
+  after += CosNotification_IDL
 
   IDL_Files {
   }
@@ -70,7 +72,6 @@ project(CosNotification) : orbsvcslib, core, event {
 project(CosNotification_Skel) : orbsvcslib, core, notification, event_skel, portableserver {
   sharedname   = TAO_CosNotification_Skel
   dynamicflags = TAO_NOTIFY_SKEL_BUILD_DLL
-  tagchecks   += Notify
 
   IDL_Files {
   }
@@ -143,96 +144,91 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel,
   // The following could be simplified if RT stuff was
   // put into another subdirectory.
 
-  Source_Files {
-    Notify/Admin.cpp
-    Notify/AdminProperties.cpp
-    Notify/Bit_Vector.cpp
-    Notify/Buffering_Strategy.cpp
-    Notify/Builder.cpp
-    Notify/Consumer.cpp
-    Notify/ConsumerAdmin.cpp
-    Notify/CosNotify_Initializer.cpp
-    Notify/CosNotify_Service.cpp
-    Notify/Default_Factory.cpp
-    Notify/Delivery_Request.cpp
-    Notify/ETCL_Filter.cpp
-    Notify/ETCL_FilterFactory.cpp
-    Notify/Event.cpp
-    Notify/EventChannel.cpp
-    Notify/EventChannelFactory.cpp
-    Notify/EventType.cpp
-    Notify/EventTypeSeq.cpp
-    Notify/Event_Manager.cpp
-    Notify/Event_Persistence_Factory.cpp
-    Notify/FilterAdmin.cpp
-    Notify/ID_Factory.cpp
-    Notify/Method_Request.cpp
-    Notify/Method_Request_Dispatch.cpp
-    Notify/Method_Request_Event.cpp
-    Notify/Method_Request_Lookup.cpp
-    Notify/Method_Request_Shutdown.cpp
-    Notify/Method_Request_Updates.cpp
-    Notify/Name_Value_Pair.cpp
-    Notify/Notify_Constraint_Interpreter.cpp
-    Notify/Notify_Constraint_Visitors.cpp
-    Notify/Notify_Default_Collection_Factory.cpp
-    Notify/Notify_Default_CO_Factory.cpp
-    Notify/Notify_Default_EMO_Factory.cpp
-    Notify/Notify_Default_POA_Factory.cpp
-    Notify/Notify_EventChannelFactory_i.cpp
-    Notify/Object.cpp
-    Notify/Peer.cpp
-    Notify/Persistent_File_Allocator.cpp
-    Notify/POA_Helper.cpp
-    Notify/Properties.cpp
-    Notify/PropertySeq.cpp
-    Notify/Property_Boolean.cpp
-    Notify/Proxy.cpp
-    Notify/ProxyConsumer.cpp
-    Notify/ProxySupplier.cpp
-    Notify/QoSProperties.cpp
-    Notify/Random_File.cpp
-    Notify/Reactive_Task.cpp
-    Notify/Refcountable.cpp
-    Notify/Reconnection_Registry.cpp
-    Notify/Routing_Slip.cpp
-    Notify/Routing_Slip_Persistence_Manager.cpp
-    Notify/Routing_Slip_Queue.cpp
-    Notify/Service.cpp
-    Notify/Subscription_Change_Worker.cpp
-    Notify/Supplier.cpp
-    Notify/SupplierAdmin.cpp
-    Notify/Standard_Event_Persistence.cpp
-    Notify/ThreadPool_Task.cpp
-    Notify/Timer_Queue.cpp
-    Notify/Timer_Reactor.cpp
-    Notify/Topology_Loader.cpp
-    Notify/Topology_Object.cpp
-    Notify/Topology_Saver.cpp
-    Notify/Worker_Task.cpp
-    Notify/Any/AnyEvent.cpp
-    Notify/Any/CosEC_ProxyPushConsumer.cpp
-    Notify/Any/CosEC_ProxyPushSupplier.cpp
-    Notify/Any/ProxyPushConsumer.cpp
-    Notify/Any/ProxyPushSupplier.cpp
-    Notify/Any/PushConsumer.cpp
-    Notify/Any/PushSupplier.cpp
-    Notify/Sequence/SequenceProxyPushConsumer.cpp
-    Notify/Sequence/SequenceProxyPushSupplier.cpp
-    Notify/Sequence/SequencePushConsumer.cpp
-    Notify/Sequence/SequencePushSupplier.cpp
-    Notify/Structured/StructuredEvent.cpp
-    Notify/Structured/StructuredProxyPushConsumer.cpp
-    Notify/Structured/StructuredProxyPushSupplier.cpp
-    Notify/Structured/StructuredPushConsumer.cpp
-    Notify/Structured/StructuredPushSupplier.cpp
-  }
-
-  Header_Files {
-    Notify/notify_serv_export.h
-  }
-
-  Inline_Files {
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Notify {
+      Notify/Admin.cpp
+      Notify/AdminProperties.cpp
+      Notify/Bit_Vector.cpp
+      Notify/Buffering_Strategy.cpp
+      Notify/Builder.cpp
+      Notify/Consumer.cpp
+      Notify/ConsumerAdmin.cpp
+      Notify/CosNotify_Initializer.cpp
+      Notify/CosNotify_Service.cpp
+      Notify/Default_Factory.cpp
+      Notify/Delivery_Request.cpp
+      Notify/ETCL_Filter.cpp
+      Notify/ETCL_FilterFactory.cpp
+      Notify/Event.cpp
+      Notify/EventChannel.cpp
+      Notify/EventChannelFactory.cpp
+      Notify/EventType.cpp
+      Notify/EventTypeSeq.cpp
+      Notify/Event_Manager.cpp
+      Notify/Event_Persistence_Factory.cpp
+      Notify/FilterAdmin.cpp
+      Notify/ID_Factory.cpp
+      Notify/Method_Request.cpp
+      Notify/Method_Request_Dispatch.cpp
+      Notify/Method_Request_Event.cpp
+      Notify/Method_Request_Lookup.cpp
+      Notify/Method_Request_Shutdown.cpp
+      Notify/Method_Request_Updates.cpp
+      Notify/Name_Value_Pair.cpp
+      Notify/Notify_Constraint_Interpreter.cpp
+      Notify/Notify_Constraint_Visitors.cpp
+      Notify/Notify_Default_Collection_Factory.cpp
+      Notify/Notify_Default_CO_Factory.cpp
+      Notify/Notify_Default_EMO_Factory.cpp
+      Notify/Notify_Default_POA_Factory.cpp
+      Notify/Notify_EventChannelFactory_i.cpp
+      Notify/Object.cpp
+      Notify/Peer.cpp
+      Notify/Persistent_File_Allocator.cpp
+      Notify/POA_Helper.cpp
+      Notify/Properties.cpp
+      Notify/PropertySeq.cpp
+      Notify/Property_Boolean.cpp
+      Notify/Proxy.cpp
+      Notify/ProxyConsumer.cpp
+      Notify/ProxySupplier.cpp
+      Notify/QoSProperties.cpp
+      Notify/Random_File.cpp
+      Notify/Reactive_Task.cpp
+      Notify/Refcountable.cpp
+      Notify/Reconnection_Registry.cpp
+      Notify/Routing_Slip.cpp
+      Notify/Routing_Slip_Persistence_Manager.cpp
+      Notify/Routing_Slip_Queue.cpp
+      Notify/Service.cpp
+      Notify/Subscription_Change_Worker.cpp
+      Notify/Supplier.cpp
+      Notify/SupplierAdmin.cpp
+      Notify/Standard_Event_Persistence.cpp
+      Notify/ThreadPool_Task.cpp
+      Notify/Timer_Queue.cpp
+      Notify/Timer_Reactor.cpp
+      Notify/Topology_Loader.cpp
+      Notify/Topology_Object.cpp
+      Notify/Topology_Saver.cpp
+      Notify/Worker_Task.cpp
+      Notify/Any/AnyEvent.cpp
+      Notify/Any/CosEC_ProxyPushConsumer.cpp
+      Notify/Any/CosEC_ProxyPushSupplier.cpp
+      Notify/Any/ProxyPushConsumer.cpp
+      Notify/Any/ProxyPushSupplier.cpp
+      Notify/Any/PushConsumer.cpp
+      Notify/Any/PushSupplier.cpp
+      Notify/Sequence/SequenceProxyPushConsumer.cpp
+      Notify/Sequence/SequenceProxyPushSupplier.cpp
+      Notify/Sequence/SequencePushConsumer.cpp
+      Notify/Sequence/SequencePushSupplier.cpp
+      Notify/Structured/StructuredEvent.cpp
+      Notify/Structured/StructuredProxyPushConsumer.cpp
+      Notify/Structured/StructuredProxyPushSupplier.cpp
+      Notify/Structured/StructuredPushConsumer.cpp
+      Notify/Structured/StructuredPushSupplier.cpp
+    }
   }
 
   Template_Files {
@@ -256,7 +252,6 @@ project(CosNotification_Persist) : notification_serv, core, acexml {
   }
 
   Header_Files {
-    Notify/notify_persist_export.h
   }
 
   Inline_Files {