1 files changed, 10 insertions, 11 deletions

diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 888a8082c91..d139a67fafc 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -1,10 +1,9 @@
-project (CAIO_Client) : taolib_with_idl {
+project (CIAO_Client) : taolib_with_idl {
   depends += IFR_Client
   sharedname  = CIAO_Client
   libs       += TAO TAO_IFR_Client
   idlflags  += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,skel_export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   dllflags    = CIAO_CLIENT_BUILD_DLL
-  include_dir = CIAO
 
   IDL_Files {
     CCM_Base.idl
@@ -22,13 +21,13 @@ project (CAIO_Client) : taolib_with_idl {
   }
 }
 
-project (CAIO_Container) : taolib_with_idl {
+project (CIAO_Container) : taolib_with_idl {
   depends += CIAO_Client PortableServer Security
   sharedname  = CIAO_Container
   libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security CIAO_Client
   idlflags  += -I $(TAO_ROOT) -I$ $(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   dllflags    = CIAO_CONTAINER_BUILD_DLL
-  include_dir = CIAO orbsvcs/orbsvcs
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
     CCM_Transaction.idl
@@ -49,14 +48,14 @@ project (CAIO_Container) : taolib_with_idl {
   }
 }
 
-project (CAIO_Server) :taolib_with_idl {
+project (CIAO_Server) :taolib_with_idl {
   depends += CIAO_Container CosNaming
   sharedname  = CIAO_Server
   libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security TAO_CosNaming
   idlflags  += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
 
   dllflags    = CIAO_SERVER_BUILD_DLL
-  include_dir = CIAO orbsvcs/orbsvcs
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
     CCM_Deployment.idl
@@ -66,21 +65,21 @@ project (CAIO_Server) :taolib_with_idl {
   }
 
   Source_Files {
-    Assembly_Impl.cpp
     CCM_DeploymentC.cpp
     CCM_DeploymentS.cpp
     CIAO_ServersC.cpp
     CIAO_ServersS.cpp
+    DaemonC.cpp
+    DaemonS.cpp
+    HomeRegistrarC.cpp
+    HomeRegistrarS.cpp
+    Assembly_Impl.cpp
     ComponentInstallation_Impl.cpp
     ComponentServer_Impl.cpp
     Container_Base.cpp
     Container_Impl.cpp
     Daemon_Impl.cpp
-    DaemonC.cpp
-    DaemonS.cpp
     HomeRegistrar_i.cpp
-    HomeRegistrarC.cpp
-    HomeRegistrarS.cpp
     Server_init.cpp
     ServerActivator_Impl.cpp
   }