summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-28 13:28:34 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2010-06-28 13:28:34 +0000
commit60a4d93517e584a0adc80a91aac4888e3bfa2b24 (patch)
treeb5b5938885fe0b2a851fccd7321553c02a6cae9c
parent2db720bf7b61c95856bc142b8384e1e8f1148f5a (diff)
downloadATCD-60a4d93517e584a0adc80a91aac4888e3bfa2b24.tar.gz
Mon Jun 28 13:28:09 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/LocalityManager/Daemon/Locality_Manager.mpc: * DAnCE/MPC/config/dance_locality_manager.mpb: * DAnCE/MPC/config/dance_stub.mpb: Fix for static link problems.
-rw-r--r--CIAO/ChangeLog10
-rw-r--r--CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc2
-rw-r--r--CIAO/DAnCE/MPC/config/dance_locality_manager.mpb2
-rw-r--r--CIAO/DAnCE/MPC/config/dance_stub.mpb2
4 files changed, 12 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 658535c59ff..ef566d9adfa 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,16 @@
+Mon Jun 28 13:28:09 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * DAnCE/LocalityManager/Daemon/Locality_Manager.mpc:
+ * DAnCE/MPC/config/dance_locality_manager.mpb:
+ * DAnCE/MPC/config/dance_stub.mpb:
+
+ Fix for static link problems.
+
Mon Jun 28 13:24:10 UTC 2010 Martin Corino <mcorino@remedy.nl>
* DAnCE/MPC/config/dance_installation_handlers.mpb:
* DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc:
- Fix for static link errors related to INet lib.
+ Fix for static link errors related to INet lib.
Mon Jun 28 13:10:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
index 8b1a402d3fc..30506e14932 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager.mpc
@@ -20,7 +20,7 @@ project (DAnCE_LocalityManager_Impl) : dance_lib, dance_output, naming, \
}
project (DAnCE_LocalityManager_Exec) : dance_exe, dance_exe, dance_output, \
- dance_locality_manager, dance_logger, ciao_logger, ciao_deployment_handlers {
+ dance_locality_manager, ciao_logger {
exename = dance_locality_manager
libs += CIAO_Deployment_Handlers
after += CIAO_Deployment_Handlers
diff --git a/CIAO/DAnCE/MPC/config/dance_locality_manager.mpb b/CIAO/DAnCE/MPC/config/dance_locality_manager.mpb
index abdf7c71307..a1898e36d6b 100644
--- a/CIAO/DAnCE/MPC/config/dance_locality_manager.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_locality_manager.mpb
@@ -1,5 +1,5 @@
// $Id$
-project : ciao_deployment_handlers, dance_skel, naming {
+project : dance_deployment_scheduler, dance_skel, naming {
after += DAnCE_LocalityManager_Impl
libs += DAnCE_LocalityManager_Impl
}
diff --git a/CIAO/DAnCE/MPC/config/dance_stub.mpb b/CIAO/DAnCE/MPC/config/dance_stub.mpb
index 2e06f253229..79d2c79807d 100644
--- a/CIAO/DAnCE/MPC/config/dance_stub.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_stub.mpb
@@ -1,5 +1,5 @@
// $Id$
-project : dance_deployment_stub, dance_applicationmanager_stub {
+project : dance_deployment_stub, dance_applicationmanager_stub, dance_logger {
after += DAnCE_stub
libs += DAnCE_stub
}