ChangeLogTag:Sat Aug 24 22:47:22 2002 Christopher Kohlhoff <chris@kohlhoff.com>

23 files changed, 179 insertions, 156 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 87468ac4ae0..2589d9ced0f 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,10 +1,11 @@
-project(AV) : orbsvcslib {
-  depends   += CosProperty CosNaming Svc_Utils PortableServer
-  sharedname = TAO_AV
-  libs      += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h
-  dllflags   = TAO_AV_BUILD_DLL
-  tagchecks  = AV
+project(AV) : orbsvcslib, core {
+  depends    += CosProperty CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_AV
+  libs       += TAO_CosProperty TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_AV_Export -Wb,export_include=AV/AV_export.h
+  dllflags    = TAO_AV_BUILD_DLL
+  tagchecks   = AV
+  include_dir = orbsvcs
 
   IDL_Files {
     AVStreams.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 3c1d82fd977..de1c3d49fdf 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,10 +1,11 @@
-project(CosConcurrency) : orbsvcslib {
-  depends   += PortableServer
-  sharedname = TAO_CosConcurrency
-  libs      += TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h
-  dllflags   = TAO_CONCURRENCY_BUILD_DLL
-  tagchecks  = Concurrency
+project(CosConcurrency) : orbsvcslib, core {
+  depends    += PortableServer
+  sharedname  = TAO_CosConcurrency
+  libs       += TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=Concurrency/concurrency_export.h
+  dllflags    = TAO_CONCURRENCY_BUILD_DLL
+  tagchecks   = Concurrency
+  include_dir = orbsvcs
 
   IDL_Files {
     CosConcurrencyControl.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 6baf99f3d09..0631d10f610 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,10 +1,11 @@
-project(CosEvent) : orbsvcslib {
-  depends   += CosNaming Svc_Utils PortableServer
-  sharedname = TAO_CosEvent
-  libs      += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
-  dllflags   = TAO_EVENT_BUILD_DLL
-  tagchecks  = CosEvent
+project(CosEvent) : orbsvcslib, core {
+  depends    += CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_CosEvent
+  libs       += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Event_Export -Wb,export_include=CosEvent/event_export.h
+  dllflags    = TAO_EVENT_BUILD_DLL
+  tagchecks   = CosEvent
+  include_dir = orbsvcs
 
   IDL_Files {
     CosEventComm.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 4ef4392e10d..3f2eb39b502 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,10 +1,11 @@
-project(CosLifeCycle) : orbsvcslib {
-  depends   += CosNaming Svc_Utils PortableServer
-  sharedname = TAO_CosLifeCycle
-  libs      += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h
-  dllflags   = TAO_LIFECYCLE_BUILD_DLL
-  tagchecks  = LifeCycle
+project(CosLifeCycle) : orbsvcslib, core {
+  depends    += CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_CosLifeCycle
+  libs       += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=LifeCycle/lifecycle_export.h
+  dllflags    = TAO_LIFECYCLE_BUILD_DLL
+  tagchecks   = LifeCycle
+  include_dir = orbsvcs
 
   IDL_Files {
     CosLifeCycle.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index ba3b9832eb1..967de0866c1 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,10 +1,11 @@
-project(CosNaming) : orbsvcslib {
-  depends   += Svc_Utils IORTable PortableServer
-  sharedname = TAO_CosNaming
-  libs      += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h
-  dllflags   = TAO_NAMING_BUILD_DLL
-  tagchecks  = Naming
+project(CosNaming) : orbsvcslib, core {
+  depends    += Svc_Utils IORTable PortableServer
+  sharedname  = TAO_CosNaming
+  libs       += TAO_Svc_Utils TAO_IORTable TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h
+  dllflags    = TAO_NAMING_BUILD_DLL
+  tagchecks   = Naming
+  include_dir = orbsvcs
 
   IDL_Files {
     CosNaming.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index bf21f0a838a..8e6b5577fef 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,10 +1,11 @@
-project(CosNotification) : orbsvcslib {
-  depends   += Svc_Utils ETCL DynamicAny PortableServer
-  sharedname = TAO_CosNotification
-  libs      += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h
-  dllflags   = TAO_NOTIFY_BUILD_DLL
-  tagchecks  = Notify
+project(CosNotification) : orbsvcslib, core {
+  depends    += Svc_Utils ETCL DynamicAny PortableServer
+  sharedname  = TAO_CosNotification
+  libs       += TAO_Svc_Utils TAO_ETCL TAO_DynamicAny TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Notify_Export -Wb,export_include=Notify/notify_export.h
+  dllflags    = TAO_NOTIFY_BUILD_DLL
+  tagchecks   = Notify
+  include_dir = orbsvcs
 
   IDL_Files {
     CosEventComm.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 9d6d3f9aafa..5cc94b7cc35 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,10 +1,11 @@
-project(CosProperty) : orbsvcslib {
-  depends   += PortableServer
-  sharedname = TAO_CosProperty
-  libs      += TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h
-  dllflags   = TAO_PROPERTY_BUILD_DLL
-  tagchecks  = Property
+project(CosProperty) : orbsvcslib, core {
+  depends    += PortableServer
+  sharedname  = TAO_CosProperty
+  libs       += TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Property_Export -Wb,export_include=Property/property_export.h
+  dllflags    = TAO_PROPERTY_BUILD_DLL
+  tagchecks   = Property
+  include_dir = orbsvcs
 
   IDL_Files {
     CosPropertyService.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 55716d3e0b4..d04b09d4245 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,10 +1,11 @@
-project(CosTime) : orbsvcslib {
-  depends   += PortableServer
-  sharedname = TAO_CosTime
-  libs      += TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h
-  dllflags   = TAO_TIME_BUILD_DLL
-  tagchecks  = Time
+project(CosTime) : orbsvcslib, core {
+  depends    += PortableServer
+  sharedname  = TAO_CosTime
+  libs       += TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h
+  dllflags    = TAO_TIME_BUILD_DLL
+  tagchecks   = Time
+  include_dir = orbsvcs
 
   IDL_Files {
     TimeService.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 962a47da1e7..3de89113354 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,10 +1,11 @@
-project(CosTrading) : orbsvcslib {
-  depends   += CosNaming Svc_Utils DynamicAny PortableServer
-  sharedname = TAO_CosTrading
-  libs      += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h
-  dllflags   = TAO_TRADING_BUILD_DLL
-  tagchecks  = Trader
+project(CosTrading) : orbsvcslib, core {
+  depends    += CosNaming Svc_Utils DynamicAny PortableServer
+  sharedname  = TAO_CosTrading
+  libs       += TAO_CosNaming TAO_Svc_Utils TAO_DynamicAny TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Trading_Export -Wb,export_include=Trader/trading_export.h
+  dllflags    = TAO_TRADING_BUILD_DLL
+  tagchecks   = Trader
+  include_dir = orbsvcs
 
   IDL_Files {
     CosTrading.idl
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index c687b4c5ee3..cb5a5001f3c 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,10 +1,11 @@
-project(DsLogAdmin) : orbsvcslib {
-  depends   += CosTrading Svc_Utils PortableServer
-  sharedname = TAO_DsLogAdmin
-  libs      += TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h
-  dllflags   = TAO_LOG_BUILD_DLL
-  tagchecks  = Log
+project(DsLogAdmin) : orbsvcslib, core {
+  depends    += CosTrading Svc_Utils PortableServer
+  sharedname  = TAO_DsLogAdmin
+  libs       += TAO_CosTrading TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log/log_export.h
+  dllflags    = TAO_LOG_BUILD_DLL
+  tagchecks   = Log
+  include_dir = orbsvcs
 
   IDL_Files {
     DsLogAdmin.idl
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.mpc b/TAO/orbsvcs/orbsvcs/ETCL.mpc
index ad850cbf3dc..d1e7f9b8887 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL.mpc
+++ b/TAO/orbsvcs/orbsvcs/ETCL.mpc
@@ -1,8 +1,9 @@
-project(ETCL) : orbsvcslib {
-  sharedname = TAO_ETCL
-  libs      += TAO
-  dllflags   = TAO_ETCL_BUILD_DLL
-  tagchecks  = Notify
+project(ETCL) : orbsvcslib, core {
+  sharedname  = TAO_ETCL
+  libs       += TAO
+  dllflags    = TAO_ETCL_BUILD_DLL
+  tagchecks   = Notify
+  include_dir = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index 36004fc8379..69de559de00 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,10 +1,11 @@
-project(FTORB) : orbsvcslib {
-  depends   += IORManipulation PortableServer
-  sharedname = TAO_FTORB
-  libs      += TAO_IORManip TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
-  dllflags   = TAO_FT_BUILD_DLL
-  tagchecks  = FTORB
+project(FTORB) : orbsvcslib, core {
+  depends    += IORManipulation PortableServer
+  sharedname  = TAO_FTORB
+  libs       += TAO_IORManip TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
+  dllflags    = TAO_FT_BUILD_DLL
+  tagchecks   = FTORB
+  include_dir = orbsvcs
 
   IDL_Files {
     FT_CORBA_ORB.idl
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 443fa59246f..9a9431e623c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,10 +1,11 @@
-project(FaultTolerance) : orbsvcslib {
-  depends   += FTORB CosNaming CosNotification Svc_Utils IORManipulation PortableServer
-  sharedname = TAO_FaultTolerance
-  libs      += TAO_FTORB TAO_CosNaming TAO_CosNotification TAO_Svc_Utils TAO_IORManip TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
-  dllflags   = TAO_FT_BUILD_DLL
-  tagchecks  = FaultTolerance
+project(FaultTolerance) : orbsvcslib, core {
+  depends    += FTORB CosNaming CosNotification Svc_Utils IORManipulation PortableServer
+  sharedname  = TAO_FaultTolerance
+  libs       += TAO_FTORB TAO_CosNaming TAO_CosNotification TAO_Svc_Utils TAO_IORManip TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
+  dllflags    = TAO_FT_BUILD_DLL
+  tagchecks   = FaultTolerance
+  include_dir = orbsvcs
 
   IDL_Files {
     FT_CORBA.idl
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 16609d00e56..64380a89e69 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,9 +1,10 @@
-project(IFRService) : orbsvcslib {
-  depends   += TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer
-  sharedname = TAO_IFRService
-  libs      += TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO
-  dllflags   = TAO_IFRSERVICE_BUILD_DLL
-  tagchecks  = IFRService
+project(IFRService) : orbsvcslib, core {
+  depends    += TypeCodeFactory Svc_Utils IFR_Client IORTable PortableServer
+  sharedname  = TAO_IFRService
+  libs       += TAO_TypeCodeFactory TAO_Svc_Utils TAO_IFR_Client TAO_IORTable TAO_PortableServer TAO
+  dllflags    = TAO_IFRSERVICE_BUILD_DLL
+  tagchecks   = IFRService
+  include_dir = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index e57d2d3a1c7..bc11732f630 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,10 +1,11 @@
-project(PortableGroup) : orbsvcslib {
-  depends   += CosNaming Svc_Utils PortableServer
-  sharedname = TAO_PortableGroup
-  libs      += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
-  dllflags   = TAO_PORTABLEGROUP_BUILD_DLL
-  tagchecks  = PortableGroup
+project(PortableGroup) : orbsvcslib, core {
+  depends    += CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_PortableGroup
+  libs       += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
+  dllflags    = TAO_PORTABLEGROUP_BUILD_DLL
+  tagchecks   = PortableGroup
+  include_dir = orbsvcs
 
   IDL_Files {
     miop.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index 33394200b25..e2298f794f8 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -1,10 +1,11 @@
-project(RTCORBAEvent) : orbsvcslib {
-  depends   += RTEvent CosNaming Svc_Utils IORTable RTPortableServer PortableServer RTCORBA
-  sharedname = TAO_RTCORBAEvent
-  libs      += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_RTPortableServer TAO_PortableServer TAO_RTCORBA TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h
-  dllflags   = TAO_RTCORBAEVENT_BUILD_DLL
-  tagchecks  = RTCORBAEvent
+project(RTCORBAEvent) : orbsvcslib, core {
+  depends    += RTEvent CosNaming Svc_Utils IORTable RTPortableServer PortableServer RTCORBA
+  sharedname  = TAO_RTCORBAEvent
+  libs       += TAO_RTEvent TAO_CosNaming TAO_Svc_Utils TAO_IORTable TAO_RTPortableServer TAO_PortableServer TAO_RTCORBA TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h
+  dllflags    = TAO_RTCORBAEVENT_BUILD_DLL
+  tagchecks   = RTCORBAEvent
+  include_dir = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 299479c2a71..8e34f71bbef 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,10 +1,11 @@
-project(RTEvent) : orbsvcslib {
-  depends   += Svc_Utils Messaging PortableServer
-  sharedname = TAO_RTEvent
-  libs      += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h
-  dllflags   = TAO_RTEVENT_BUILD_DLL
-  tagchecks  = RTEvent
+project(RTEvent) : orbsvcslib, core {
+  depends    += Svc_Utils Messaging PortableServer
+  sharedname  = TAO_RTEvent
+  libs       += TAO_Svc_Utils TAO_Messaging TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTEvent_Export -Wb,export_include=Event/event_export.h
+  dllflags    = TAO_RTEVENT_BUILD_DLL
+  tagchecks   = RTEvent
+  include_dir = orbsvcs
 
   IDL_Files {
     RtecDefaultEventData.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
index b834592a43e..499ab087191 100644
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
@@ -1,9 +1,10 @@
-project(RTOLDEvent) : orbsvcslib {
-  depends   += RTEvent RTSched CosNaming Svc_Utils PortableServer
-  sharedname = TAO_RTOLDEvent
-  libs      += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  dllflags   = TAO_RTOLDEVENT_BUILD_DLL
-  tagchecks  = RTOLDEvent
+project(RTOLDEvent) : orbsvcslib, core {
+  depends    += RTEvent RTSched CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_RTOLDEvent
+  libs       += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  dllflags    = TAO_RTOLDEVENT_BUILD_DLL
+  tagchecks   = RTOLDEvent
+  include_dir = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index 1e8aa0a2244..bbb248c8e8a 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,10 +1,11 @@
-project(RTSched) : orbsvcslib {
-  depends   += CosNaming TAO_Svc_Utils PortableServer
-  sharedname = TAO_RTSched
-  libs      += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h
-  dllflags   = TAO_RTSCHED_BUILD_DLL
-  tagchecks  = Sched
+project(RTSched) : orbsvcslib, core {
+  depends    += CosNaming TAO_Svc_Utils PortableServer
+  sharedname  = TAO_RTSched
+  libs       += TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h
+  dllflags    = TAO_RTSCHED_BUILD_DLL
+  tagchecks   = Sched
+  include_dir = orbsvcs
 
   IDL_Files {
     RtecScheduler.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index bef5adaf422..791302737f3 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -1,9 +1,10 @@
-project(RTSchedEvent) : orbsvcslib {
-  depends   += RTEvent RTSched CosNaming Svc_Utils PortableServer
-  sharedname = TAO_RTSchedEvent
-  libs      += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
-  dllflags   = TAO_RTSCHEDEVENT_BUILD_DLL
-  tagchecks  = RTSchedEvent
+project(RTSchedEvent) : orbsvcslib, core {
+  depends    += RTEvent RTSched CosNaming Svc_Utils PortableServer
+  sharedname  = TAO_RTSchedEvent
+  libs       += TAO_RTEvent TAO_RTSched TAO_CosNaming TAO_Svc_Utils TAO_PortableServer TAO
+  dllflags    = TAO_RTSCHEDEVENT_BUILD_DLL
+  tagchecks   = RTSchedEvent
+  include_dir = orbsvcs
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index fcd975735d1..4d310ef1037 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -1,11 +1,12 @@
-project(SSLIOP) : orbsvcslib {
-  ssl        = 1
-  depends   += Security PortableServer SSL
-  sharedname = TAO_SSLIOP
-  libs      += TAO_Security TAO_PortableServer TAO ACE_SSL
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h
-  dllflags   = TAO_SSLIOP_BUILD_DLL
-  tagchecks  = SSLIOP
+project(SSLIOP) : orbsvcslib, core {
+  ssl         = 1
+  depends    += Security PortableServer SSL
+  sharedname  = TAO_SSLIOP
+  libs       += TAO_Security TAO_PortableServer TAO ACE_SSL
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=SSLIOP/SSLIOP_Export.h
+  dllflags    = TAO_SSLIOP_BUILD_DLL
+  tagchecks   = SSLIOP
+  include_dir = orbsvcs
 
   IDL_Files {
     SSLIOP.idl
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 2480bb0b6a6..958a29334de 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,10 +1,11 @@
-project(Security) : orbsvcslib {
-  depends   += PortableServer
-  sharedname = TAO_Security
-  libs      += TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h
-  dllflags   = TAO_SECURITY_BUILD_DLL
-  tagchecks  = Security
+project(Security) : orbsvcslib, core {
+  depends    += PortableServer
+  sharedname  = TAO_Security
+  libs       += TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Security_Export -Wb,export_include=Security/security_export.h
+  dllflags    = TAO_SECURITY_BUILD_DLL
+  tagchecks   = Security
+  include_dir = orbsvcs
 
   IDL_Files {
     Security.idl
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 4c29ef0f10f..137103f68fa 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,9 +1,10 @@
-project(Svc_Utils) : orbsvcslib {
-  depends   += PortableServer
-  sharedname = TAO_Svc_Utils
-  libs      += TAO_PortableServer TAO
-  idlflags  += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h
-  dllflags   = TAO_SVC_UTILS_BUILD_DLL
+project(Svc_Utils) : orbsvcslib, core {
+  depends    += PortableServer
+  sharedname  = TAO_Svc_Utils
+  libs       += TAO_PortableServer TAO
+  idlflags   += -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h
+  dllflags    = TAO_SVC_UTILS_BUILD_DLL
+  include_dir = orbsvcs
 
   IDL_Files {
     TimeBase.idl