1 files changed, 18 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
index 30b0038758d..dad3c6900fd 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events.mpb
@@ -1,28 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-feature(ec_typed_events) {
-  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
 
-  idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
+feature(ec_typed_events): taoidldefaults {
+  macros   += TAO_HAS_TYPED_EVENT_CHANNEL
+  libs     += TAO_IFR_Client TAO_DynamicInterface
+  after    += IFR_Client DynamicInterface
+  idlflags += -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
 
   IDL_Files {
     CosTypedEventComm.idl
     CosTypedEventChannelAdmin.idl
   }
 
-  Source_Files {
-    CosTypedEventCommC.cpp
-    CosTypedEventChannelAdminC.cpp
-  }
-
-  Header_Files {
-    CosTypedEventCommC.h
-    CosTypedEventChannelAdminC.h
-  }
-
-  Inline_Files {
-    CosTypedEventCommC.inl
-    CosTypedEventChannelAdminC.inl
+  Source_Files(ORBSVCS_COMPONENTS) {
+    CosEvent {
+      CosTypedEventCommC.cpp
+      CosTypedEventChannelAdminC.cpp
+      CosTypedEventCommS.cpp
+      CosTypedEventChannelAdminS.cpp
+      CosEvent/CEC_TypedEvent.cpp
+      CosEvent/CEC_TypedEventChannel.cpp
+      CosEvent/CEC_TypedProxyPushConsumer.cpp
+      CosEvent/CEC_TypedConsumerAdmin.cpp
+      CosEvent/CEC_TypedSupplierAdmin.cpp
+      CosEvent/CEC_DynamicImplementation.cpp
+    }
   }
 }