1 files changed, 27 insertions, 15 deletions
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index a801e308c5c..69c31b3e790 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,19 +1,41 @@
 // -*- MPC -*-
 // $Id$
 
-project(NoOp_Configurator): ciao_deployment_stub {
+project(NodeApp_Configurator): ciao_deployment_stub {
+  sharedname   = CIAO_NodeApp_Configurator
+  dynamicflags = NODEAPP_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    NodeApp_Configurator.cpp
+  }
+}
+
+project(NoOp_Configurator): ciao_deployment_stub, ciao_nodeapp_configurator {
   sharedname   = CIAO_NoOp_Configurator
   dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
-
   Source_Files {
     NoOp_Configurator.cpp
   }
 }
 
-project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configurator {
+project(RTNA_Configurator): ciao_deployment_stub, rt_server, ciao_nodeapp_configurator {
+  sharedname   = CIAO_RTNA_Configurator
+  dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    RTConfig_Manager.cpp
+  }
+}
+
+project(NA_Configurator): ciao_deployment_stub, diffservpolicy, ciao_nodeapp_configurator {
+  sharedname   = CIAO_NA_Configurator
+  dynamicflags = CIAO_NA_CONFIGURATOR_BUILD_DLL
+  Source_Files {
+    NAConfig_Manager.cpp
+  }
+}
+
+project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_nodeapp_configurator {
   sharedname   = CIAO_NodeApplication
   dynamicflags = NODEAPPLICATION_BUILD_DLL
-
   Source_Files {
     Configurator_Factory.cpp
     Container_Impl.cpp
@@ -22,20 +44,10 @@ project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configu
   }
 }
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciao_noop_configurator {
+project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciaoexe {
   exename   = NodeApplication
-
   Source_Files {
     NodeApplication.cpp
   }
 }
 
-project(RTNA_Configurator): ciao_deployment_stub, rt_server {
-  sharedname   = CIAO_RTNA_Configurator
-  dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
-
-  Source_Files {
-    RTNodeApp_Configurator.cpp
-    RTConfig_Manager.cpp
-  }
-}