1 files changed, 12 insertions, 92 deletions
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 5ecee5826dd..88a06a5c1d1 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,107 +1,27 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, rtevent, tao_versioning_idl_defaults {
-  custom_only = 1
-  idlflags   += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h
-
-  IDL_Files {
-    RTEventLogAdmin.idl
-  }
-}
-
-project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent {
+project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv {
   sharedname   = TAO_RTEventLogAdmin
+  idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
   tagchecks   += RTEventLog
-  after       += RTEventLogAdmin_IDL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    RTEventLogAdminC.cpp
-  }
-
-  Header_Files {
-    RTEventLogAdminC.h
-    Log/rteventlog_export.h
-  }
-
-  Inline_Files {
-    RTEventLogAdminC.inl
-  }
-
-  Template_Files {
-  }
-
-  // explicit Resource_Files to avoid including _Skel & _Serv rc files.
-  Resource_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_RTEventLogAdmin.pc.in
-  }
-}
-
-project(RTEventLogAdmin_Skel) : orbsvcslib, core, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver {
-  sharedname   = TAO_RTEventLogAdmin_Skel
-  dynamicflags = TAO_RTEVENTLOG_SKEL_BUILD_DLL
-  tagchecks   += RTEventLog
 
   IDL_Files {
+    RTEventLogAdmin.idl
   }
 
-  Source_Files {
-    RTEventLogAdminS.cpp
-  }
-
-  Header_Files {
-    RTEventLogAdminS.h
-    RTEventLogAdminS_T.h
-    Log/rteventlog_skel_export.h
-  }
-
-  Inline_Files {
-    RTEventLogAdminS.inl
-    RTEventLogAdminS_T.inl
-  }
-
-  Template_Files {
-    RTEventLogAdminS_T.cpp
-  }
-
-  Pkgconfig_Files {
-    TAO_RTEventLogAdmin_Skel.pc.in
-  }
-}
-
-project(RTEventLogAdmin_Serv) : orbsvcslib, core, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched {
-  sharedname   = TAO_RTEventLogAdmin_Serv
-  dynamicflags = TAO_RTEVENTLOG_SERV_BUILD_DLL
-  tagchecks   += RTEventLog
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Log/RTEventLogConsumer.cpp
-    Log/RTEventLogFactory_i.cpp
-    Log/RTEventLogNotification.cpp
-    Log/RTEventLog_i.cpp
-  }
-
-  Header_Files {
-    Log/rteventlog_serv_export.h
-  }
-
-  Inline_Files {
+  Source_Files(ORBSVCS_COMPONENTS) {
+    RTEventLog {
+      RTEventLogAdminC.cpp
+      RTEventLogAdminS.cpp
+      Log/RTEventLogFactory_i.cpp
+      Log/RTEventLog_i.cpp
+      Log/RTEventLogConsumer.cpp
+      Log/RTEventLogNotification.cpp
+    }
   }
 
   Template_Files {
   }
-
-  Pkgconfig_Files {
-    TAO_RTEventLogAdmin_Serv.pc.in
-  }
 }