summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@users.noreply.github.com>2010-06-28 13:26:42 +0000
committermcorino <mcorino@users.noreply.github.com>2010-06-28 13:26:42 +0000
commit2db720bf7b61c95856bc142b8384e1e8f1148f5a (patch)
tree5550eb82141f1d966c19ce327ea15d66f779ee4e
parentab0e7d168e16b7bcc631b89490ccace63ebd4e97 (diff)
downloadATCD-2db720bf7b61c95856bc142b8384e1e8f1148f5a.tar.gz
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.
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/DAnCE/MPC/config/dance_installation_handlers.mpb2
-rw-r--r--CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc4
3 files changed, 8 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fb2aafee7dc..658535c59ff 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
Mon Jun 28 13:10:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* docs/OMG-CCM-Tutorial.pptx:
diff --git a/CIAO/DAnCE/MPC/config/dance_installation_handlers.mpb b/CIAO/DAnCE/MPC/config/dance_installation_handlers.mpb
index 30d4afa48db..ce855258c59 100644
--- a/CIAO/DAnCE/MPC/config/dance_installation_handlers.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_installation_handlers.mpb
@@ -1,6 +1,6 @@
// $Id$
-project : dance_artifact_installation {
+project : dance_artifact_installation, inet {
libs += DAnCE_File_Installation DAnCE_Http_Installation
after += DAnCE_File_Installation DAnCE_Http_Installation
}
diff --git a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
index e93a42b7c12..83fbd07de16 100644
--- a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
+++ b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation.mpc
@@ -71,11 +71,9 @@ project (DAnCE_Http_Installation) : dance_lib, dynamicinterface, dance_artifact_
}
project (DAnCE_Artifact_Installation_Exec) : dance_exe, dance_output, dance_artifact_installation, \
- dance_installation_repository_manager, \
+ dance_installation_handlers, dance_installation_repository_manager, \
avoids_ace_for_tao, dance_convert_plan, dance_logger {
exename = dance_artifact_installation
- libs += DAnCE_File_Installation DAnCE_Http_Installation
- after += DAnCE_File_Installation DAnCE_Http_Installation
Source_Files {
Artifact_Installation_exec.cpp