diff options
Diffstat (limited to 'TAO/CIAO/ciao/CCM_Core.mpc')
| -rw-r--r-- | TAO/CIAO/ciao/CCM_Core.mpc | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc index 8a3a2f5ef51..f338fba8256 100644 --- a/TAO/CIAO/ciao/CCM_Core.mpc +++ b/TAO/CIAO/ciao/CCM_Core.mpc @@ -10,7 +10,7 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { // This is necessary for MPC to pull in rules.ciao.GNU includes += $(CIAO_ROOT)/DAnCE - + dynamicflags = CIAO_CLIENT_BUILD_DLL IDL_Files { @@ -34,8 +34,10 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client { } } -project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc { +project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi { + after += CIAO_DnC_Client sharedname = CIAO_DnC_Container + libs += CIAO_DnC_Client idlflags += -Wb,export_include=CIAO_Container_Export.h idlflags += -Wb,export_macro=CIAO_CONTAINER_Export dynamicflags = CIAO_CONTAINER_BUILD_DLL @@ -50,6 +52,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, CCM_Container_Ex.idl SwapExec.idl UpgradeableContext.idl + // ServerResources.idl } Source_Files { @@ -69,11 +72,14 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, // Valuetype library must be linked for this project. // Please don't remove. -project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_base_dnc, ciao_client_dnc { +project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client { sharedname = CIAO_Deployment_stub + after += CIAO_DnC_Client + + libs += CIAO_DnC_Client // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) + includes += $(CIAO_ROOT)/DAnCE idlflags += -Wb,stub_export_macro=Deployment_stub_Export idlflags += -Wb,stub_export_include=Deployment_stub_export.h @@ -88,15 +94,8 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b Deployment_Base.idl Deployment_Data.idl Packaging_Data.idl - Target_Data.idl Deployment.idl - NodeManager.idl - NodeApplicationManager.idl - DomainApplicationManager.idl - ExecutionManager.idl - RepositoryManager.idl ServerResources.idl - Deployment_Events.idl } Source_Files { @@ -104,31 +103,26 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b Deployment_BaseC.cpp Deployment_DataC.cpp Packaging_DataC.cpp - Target_DataC.cpp DeploymentC.cpp - NodeManagerC.cpp - NodeApplicationManagerC.cpp - DomainApplicationManagerC.cpp - ExecutionManagerC.cpp - RepositoryManagerC.cpp NodeApplication_CallBackC.cpp ServerResourcesC.cpp - Deployment_EventsC.cpp } } // CIAO_DnC_Client library must be linked for this project. // Please don't remove. -project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc { +project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client { + after += Deployment_stub sharedname = CIAO_Deployment_svnt dynamicflags = DEPLOYMENT_SVNT_BUILD_DLL + libs += CIAO_Deployment_stub CIAO_DnC_Client idlflags += -Wb,stub_export_macro=Deployment_stub_Export idlflags += -Wb,stub_export_include=Deployment_stub_export.h idlflags += -Wb,skel_export_macro=Deployment_svnt_Export idlflags += -Wb,skel_export_include=Deployment_svnt_export.h // This is necessary for MPC to pull in rules.ciao.GNU - includes += $(CIAO_ROOT)/DAnCE $(CIAO_ROOT) + includes += $(CIAO_ROOT)/DAnCE IDL_Files { } @@ -138,25 +132,20 @@ project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_clien Deployment_BaseS.cpp Deployment_DataS.cpp Packaging_DataS.cpp - Target_DataS.cpp DeploymentS.cpp - RepositoryManagerS.cpp - NodeManagerS.cpp - NodeApplicationManagerS.cpp - DomainApplicationManagerS.cpp - ExecutionManagerS.cpp NodeApp_CB_Impl.cpp NodeApplication_CallBackS.cpp ServerResourcesS.cpp - Deployment_EventsS.cpp } } -project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt { - includes += $(CIAO_ROOT)/ciao +project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security { + after += CIAO_DnC_Container Deployment_svnt + includes += $(CIAO_ROOT)/DAnCE includes += $(CIAO_ROOT) sharedname = CIAO_DnC_Server + libs += CIAO_DnC_Client CIAO_DnC_Container CIAO_Deployment_svnt CIAO_Deployment_stub idlflags += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export dynamicflags = CIAO_SERVER_BUILD_DLL @@ -166,7 +155,9 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c Source_Files { Container_Base.cpp + Container_Impl.cpp Swapping_Container.cpp + NodeApplication_Impl.cpp Context_Impl_Base.cpp Home_Servant_Impl_Base.cpp Servant_Impl_Base.cpp @@ -191,7 +182,6 @@ project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_c Swapping_Servant_Home_Impl_T.cpp Dynamic_Component_Servant_T.cpp Servant_Impl_T.cpp - Servant_Impl_Utils_T.cpp Servant_Activator_T.cpp } } |