ChangeLogTag: Thu Mar 9 14:51:32 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

15 files changed, 73 insertions, 59 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b219b4e3c93..4929225c882 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,27 @@
+Thu Mar  9 14:51:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosNaming.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+
+          Support for the TAO_ORBSVCS GNU Make macro was broken for some
+          time.  I added the missing 'tagchecks' settings to these projects.
+
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+
+          Corrected the usage of 'tagchecks' so that the values were added
+          instead of being set absolutely.
+
 Thu Mar  9 12:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Stub.{cpp,i}:
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 41ed3243c0d..99fab62e680 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults {
-
   custom_only = 1
-
-  idlflags    += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
 
   IDL_Files {
     CosConcurrencyControl.idl
@@ -15,8 +13,8 @@ project(CosConcurrency_IDL): orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosConcurrency) : orbsvcslib, core {
   sharedname   = TAO_CosConcurrency
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
-
-  after += CosConcurrency_IDL
+  tagchecks   += Concurrency
+  after       += CosConcurrency_IDL
 
   IDL_Files {
   }
@@ -49,8 +47,8 @@ project(CosConcurrency) : orbsvcslib, core {
 project(CosConcurrency_Skel): orbsvcslib, core, concurrency, portableserver {
   sharedname   = TAO_CosConcurrency_Skel
   dynamicflags = TAO_CONCURRENCY_SKEL_BUILD_DLL
-
-  after += CosConcurrency_IDL
+  tagchecks   += Concurrency
+  after       += CosConcurrency_IDL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 46a6b86c751..c3666a5ddfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,22 +1,20 @@
 // $Id$
 
 project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
-
-  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
+  custom_only = 1
+  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
 
   IDL_Files {
     CosEventComm.idl
     CosEventChannelAdmin.idl
   }
-
-  custom_only = 1
 }
 
 project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
   sharedname   = TAO_CosEvent
   dynamicflags = TAO_EVENT_BUILD_DLL
-
-  after += CosEvent_IDL
+  tagchecks   += CosEvent
+  after       += CosEvent_IDL
 
   IDL_Files {
   }
@@ -54,6 +52,7 @@ project (CosEvent) : orbsvcslib, core, minimum_corba, ec_typed_events {
 project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver, ec_typed_events_skel {
   sharedname   = TAO_CosEvent_Skel
   dynamicflags = TAO_EVENT_SKEL_BUILD_DLL
+  tagchecks   += CosEvent
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index e7a21747d2e..991012a2a9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
-
   custom_only =	1
-
-  idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
 
   IDL_Files {
     CosNaming.idl
@@ -15,8 +13,8 @@ project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
-
-  after	+= CosNaming_IDL
+  tagchecks   += Naming
+  after	      += CosNaming_IDL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index 3055bf526ee..c5859a1c573 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -4,6 +4,7 @@
 project(CosNaming_Skel) : orbsvcslib, core, naming, portableserver {
   sharedname   = TAO_CosNaming_Skel
   dynamicflags = TAO_NAMING_SKEL_BUILD_DLL
+  tagchecks   += Naming
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index c72c7db6938..87fab05f21c 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
-
   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
@@ -20,8 +18,8 @@ project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defau
 project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
-
-  after += CosNotification_IDL
+  tagchecks   += Notify
+  after       += CosNotification_IDL
 
   IDL_Files {
   }
@@ -72,6 +70,7 @@ 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 {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 2385e1f68af..cc73a0a5fc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
-
   custom_only = 1
-
-  idlflags    += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
 
   IDL_Files {
     CosProperty.idl
@@ -18,8 +16,8 @@ project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosProperty) : orbsvcslib, core {
   sharedname   = TAO_CosProperty
   dynamicflags = TAO_PROPERTY_BUILD_DLL
-
-  after += CosProperty_IDL
+  tagchecks   += Property
+  after       += CosProperty_IDL
 
   IDL_Files {
   }
@@ -55,6 +53,7 @@ project(CosProperty) : orbsvcslib, core {
 project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
   sharedname   = TAO_CosProperty_Skel
   dynamicflags = TAO_PROPERTY_SKEL_BUILD_DLL
+  tagchecks   += Property
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 632fb25898b..ef436ac2479 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
-
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
   IDL_Files {
     CosTrading.idl
@@ -18,8 +16,8 @@ project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
-
-  after += CosTrading_IDL
+  tagchecks   += Trader
+  after       += CosTrading_IDL
 
   IDL_Files {
   }
@@ -60,6 +58,7 @@ project(CosTrading) : orbsvcslib, core {
 project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
   sharedname   = TAO_CosTrading_Skel
   dynamicflags = TAO_TRADING_SKEL_BUILD_DLL
+  tagchecks   += Trader
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index cba1aa837a6..4322406dedc 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults {
-
-custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
+  custom_only = 1
+  idlflags   += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
 
   IDL_Files {
     DsEventLogAdmin.idl
@@ -15,8 +13,8 @@ custom_only = 1
 project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
-
-  after += DsEventLogAdmin_IDL
+  tagchecks   += EventLog
+  after       += DsEventLogAdmin_IDL
 
   IDL_Files {
   }
@@ -50,6 +48,7 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
 project(DsEventLogAdmin_Skel) : orbsvcslib, core, dseventlogadmin, dslogadmin_skel, event_skel, portableserver {
   sharedname   = TAO_DsEventLogAdmin_Skel
   dynamicflags = TAO_EVENTLOG_SKEL_BUILD_DLL
+  tagchecks   += EventLog
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 1b0015c484b..d0d9a4dea5e 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
-
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
 
   IDL_Files {
     DsLogAdmin.idl
@@ -16,8 +14,8 @@ project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(DsLogAdmin) : orbsvcslib, core {
   sharedname   = TAO_DsLogAdmin
   dynamicflags = TAO_LOG_BUILD_DLL
-
-  after += DsLogAdmin_IDL
+  tagchecks   += Log
+  after       += DsLogAdmin_IDL
 
   IDL_Files {
   }
@@ -55,6 +53,7 @@ project(DsLogAdmin) : orbsvcslib, core {
 project(DsLogAdmin_Skel) : orbsvcslib, core, dslogadmin, portableserver {
   sharedname   = TAO_DsLogAdmin_Skel
   dynamicflags = TAO_LOG_SKEL_BUILD_DLL
+  tagchecks   += Log
 
   IDL_Files {
   } 
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index e55a9bd68cb..bf66701ee09 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -2,10 +2,8 @@
 // $Id$
 
 project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
-
   custom_only = 1
-
-  idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
+  idlflags   += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
 
   IDL_Files {
     DsNotifyLogAdmin.idl
@@ -15,8 +13,8 @@ project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, e
 project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
   sharedname   = TAO_DsNotifyLogAdmin
   dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
-
-  after += DsNotifyLogAdmin_IDL
+  tagchecks   += Log
+  after       += DsNotifyLogAdmin_IDL
 
   IDL_Files {
   }
@@ -51,6 +49,7 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event
 project(DsNotifyLogAdmin_Skel) : orbsvcslib, core, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver {
   sharedname   = TAO_DsNotifyLogAdmin_Skel
   dynamicflags = TAO_NOTIFYLOG_SKEL_BUILD_DLL
+  tagchecks   += Log
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index f8a76262813..b510974a944 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -3,10 +3,9 @@
 
 project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults {
   sharedname   = TAO_FtRtEvent
-
-  idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
+  idlflags    += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
   dynamicflags = TAO_FTRTEVENT_BUILD_DLL
-  tagchecks    = FtRtEvent
+  tagchecks   += FtRtEvent
 
   IDL_Files {
     idlflags += -GC
@@ -40,7 +39,7 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimu
 project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, core {
   sharedname   = TAO_FTRT_ClientORB
   dynamicflags = TAO_FTRT_BUILD_DLL
-  tagchecks    = FTRT_ClientORB
+  tagchecks   += FTRT_ClientORB
 
   IDL_Files {
   }
@@ -61,7 +60,7 @@ project (FTRT_ClientORB) :  messaging, orbsvcslib, pi, core {
 project (FTRT_EventChannel) :  orbsvcslib, core, ftrtevent, rtevent_serv, utils, pi_server, corba_messaging {
   sharedname   = TAO_FTRT_EventChannel
   dynamicflags = TAO_FTRTEC_BUILD_DLL
-  tagchecks    = FTRT_EventChannel
+  tagchecks   += FTRT_EventChannel
   after       += FTORB_Utils
 
   IDL_Files {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index b69114fe016..2c63bc2bff5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -6,6 +6,7 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export \
                  -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
+  tagchecks   += PortableGroup
 
   IDL_Files {
     miop.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 4e94402fcce..5ecee5826dd 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -2,10 +2,8 @@
 // $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
+  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
@@ -15,8 +13,8 @@ project(RTEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, rtevent, tao_versio
 project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent {
   sharedname   = TAO_RTEventLogAdmin
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
-
-  after += RTEventLogAdmin_IDL
+  tagchecks   += RTEventLog
+  after       += RTEventLogAdmin_IDL
 
   IDL_Files {
   }
@@ -49,6 +47,7 @@ project(RTEventLogAdmin) : orbsvcslib, core, dslogadmin, rtevent {
 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 {
   }
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index f622d34d7d0..6a8bb6d38b6 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -4,6 +4,7 @@
 project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   sharedname   = TAO_RTEvent_Skel
   dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL
+  tagchecks   += RTEvent
 
   IDL_Files {
   }