1 files changed, 58 insertions, 56 deletions

diff --git a/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index d068b1665f1..c5a30b682ff 100644
--- a/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,43 +1,45 @@
 //$Id$
 
 project (XSC_XML_Generation) : xscdefaults {
-   requires += xsc
-
-   xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
-   xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
-   xscflags += --cxx-export-symbol XSC_XML_Handlers_Export
-   xscflags += --cxx-namespace-regex  <%quote%>%.*Deployment.*%CIAO/Config_Handlers%<%quote%>
-   xscflags += --cxx-export-header XSC_XML_Handlers_Export.h
-   xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
-
-   custom_only = 1
-
-   XSC_Files {
-        gendir = .
-        $(CIAO_ROOT)/docs/schema/Basic_Deployment_Data.xsd
-        $(CIAO_ROOT)/docs/schema/Deployment.xsd
-        $(CIAO_ROOT)/docs/schema/ccd.xsd
-        $(CIAO_ROOT)/docs/schema/cdd.xsd
-        $(CIAO_ROOT)/docs/schema/cdp.xsd
-        $(CIAO_ROOT)/docs/schema/cid.xsd
-        $(CIAO_ROOT)/docs/schema/cpd.xsd
-        $(CIAO_ROOT)/docs/schema/iad.xsd
-        $(CIAO_ROOT)/docs/schema/pcd.xsd
-        $(CIAO_ROOT)/docs/schema/toplevel.xsd
-   }
-
-   Source_Files {
-   }
+  requires += xsc
+
+  xscflags += --cxx-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.cpp
+  xscflags += --cxx-header-banner-file $(CIAO_ROOT)/docs/schema/xsc-banner.h
+  xscflags += --cxx-export-symbol XSC_XML_Handlers_Export
+  xscflags += --cxx-namespace-regex  "%.*Deployment.*%CIAO/Config_Handlers%" //<%quote%>
+  xscflags += --cxx-export-header XSC_XML_Handlers_Export.h
+  xscflags += --search-path "$(CIAO_ROOT)/docs/schema"
+  
+  custom_only = 1
+
+  XSC_Files {
+    gendir = .
+    $(CIAO_ROOT)/docs/schema/Basic_Deployment_Data.xsd
+    $(CIAO_ROOT)/docs/schema/Deployment.xsd
+    $(CIAO_ROOT)/docs/schema/XMI.xsd
+    $(CIAO_ROOT)/docs/schema/ccd.xsd
+    $(CIAO_ROOT)/docs/schema/cdd.xsd
+    $(CIAO_ROOT)/docs/schema/cdp.xsd
+    $(CIAO_ROOT)/docs/schema/cid.xsd
+    $(CIAO_ROOT)/docs/schema/cpd.xsd
+    $(CIAO_ROOT)/docs/schema/iad.xsd
+    $(CIAO_ROOT)/docs/schema/pcd.xsd
+    $(CIAO_ROOT)/docs/schema/toplevel.xsd
+  }
+
+  Source_Files {
+  }
 }
 
-project (XSC_XML_Handlers) : acelib, ace_output, xerces {
+project (XSC_XML_Handlers) : acelib, xerces, ciao_lib, ciao_xml_utils {
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
   macros       += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  includes += $(CIAO_ROOT)/tools/Config_Handlers $(CIAO_ROOT)/tools
   after += XSC_XML_Generation
 
   Source_Files {
+    XMI.cpp
     Deployment.cpp
     ccd.cpp
     cdd.cpp
@@ -48,32 +50,33 @@ project (XSC_XML_Handlers) : acelib, ace_output, xerces {
     pcd.cpp
     toplevel.cpp
     Basic_Deployment_Data.cpp
+    XML_Typedefs.cpp
   }
 
   Header_Files {
     XSC_XML_Handlers_Export.h
+    XML_Typedefs.h
   }
 
   verbatim(gnuace, macros) {
-   override no_hidden_visibility = 1
+    override no_hidden_visibility = 1
   }
 
 }
 
-project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_config_handlers_base, ace_output {
-  after += CIAO_Events_Handlers \
-           RT_CCM_Config_Handlers \
-           XSC_DynAny_Handler \
+project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance {
+  after += XSC_DynAny_Handler \
            XSC_Config_Handlers_Common
+	   
   sharedname = XSC_Config_Handlers
   dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
   libs += CIAO_XML_Utils \
-          CIAO_Events_Handlers \
-          RT_CCM_Config_Handlers \
           XSC_XML_Handlers \
           XSC_DynAny_Handler \
           XSC_Config_Handlers_Common
-
+	  
+  includes += $(CIAO_ROOT)/ciao
+  
   Source_Files {
     DP_Handler.cpp
     CCD_Handler.cpp
@@ -90,12 +93,11 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_conf
     ID_Handler.cpp
     XML_File_Intf.cpp
     IDREF_Base.cpp
-    DnC_Dump.cpp
     Dump_Obj.cpp
     PCD_Handler.cpp
     IRDD_Handler.cpp
     DD_Handler.cpp
-
+    DnC_Dump.cpp
   }
 
   Header_Files {
@@ -104,14 +106,14 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, ciao_events_dnc, ciao_conf
 
 }
 
-project (XSC_Config_Handlers_Common) : ciao_deployment_stub, ciao_config_handlers_base, ace_output {
-   after += XSC_DynAny_Handler
-   sharedname = XSC_Config_Handlers_Common
-   dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL
+project (XSC_Config_Handlers_Common) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance {
+  after += XSC_DynAny_Handler
+  sharedname = XSC_Config_Handlers_Common
+  dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL
 
-   libs += XSC_DynAny_Handler
+  libs += XSC_DynAny_Handler
 
-   Source_Files {
+  Source_Files {
     ERE_Handler.cpp
     Req_Handler.cpp
     DataType_Handler.cpp
@@ -120,18 +122,18 @@ project (XSC_Config_Handlers_Common) : ciao_deployment_stub, ciao_config_handler
     CPD_Handler.cpp
     CEPE_Handler.cpp
     Any_Handler.cpp
-   }
-}
-project (XSC_Config_Handlers_Tests) : ciao_component_dnc, ciao_config_handlers, ifr_client {
-//  requires += dummy_label
-includes += $(CIAO_ROOT)/tools/Config_Handlers
-exename = test
-dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
-macros   += XML_USE_PTHREADS
-
-Source_Files {
-test.cpp
+  }
 }
+project (XSC_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
+  requires += dummy_label
+  includes += $(CIAO_ROOT)/tools/Config_Handlers
+  exename = test
+  dynamicflags   = CONFIG_HANDLERS_BUILD_DLL
+  macros   += XML_USE_PTHREADS
+
+  Source_Files {
+    test.cpp
+  }
 }