1 files changed, 24 insertions, 4 deletions
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 7e5ffea6540..0fdbba65698 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,17 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc {
+project (ExecutionManager_stub): ciao_server_dnc {
+
+  sharedname = ExecutionManager_stub
+
+  idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export 
+  idlflags += -Wb,stub_export_include=ExecutionManager_stub_export.h
+
+  dynamicflags = EXECUTIONMANAGER_STUB_BUILD_DLL
+
+  IDL_Files {
+   ExecutionManager.idl
+  }
+
+  Source_Files {
+   ExecutionManagerC.cpp
+  }
+}
+
+project(ExecutionManager): ciao_component_dnc, ciao_config_handlers {
+
   exename = Execution_Manager
 
-  after += ExecutionManager_stub
-  libs += ExecutionManager_stub
+  after += DomainApplicationManager ExecutionManager_stub
+
+  libs += DomainApplicationManager ExecutionManager_stub
 
   IDL_Files {
   }
 
   Source_Files {
-    ../Interfaces/ExecutionManagerDaemonS.cpp
+    ExecutionManagerS.cpp
     Execution_Manager.cpp
     Execution_Manager_Impl.cpp
     DAM_Map.cpp