diff options
author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-04-12 14:48:18 +0000 |
---|---|---|
committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-04-12 14:48:18 +0000 |
commit | b7301b097104f01e41141cbc12e553db2ce68195 (patch) | |
tree | b0801b04f9d98c43f12a28b588880df847e0a4d8 | |
parent | 3b45789d0f173f652807d44f0bc8d57c825c9d8c (diff) | |
download | ATCD-b7301b097104f01e41141cbc12e553db2ce68195.tar.gz |
Wed Apr 12 14:47:14 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
-rw-r--r-- | TAO/CIAO/ChangeLog | 11 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/Monitor.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc | 2 | ||||
-rw-r--r-- | TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc | 2 |
7 files changed, 17 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index d32d28a7d15..aa1f07a10f8 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Apr 12 14:47:14 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/NodeApplication/NodeApplication.mpc + * DAnCE/NodeManager/Monitor.mpc + * DAnCE/NodeManager/NodeManager.mpc + * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc + * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc + * ciaosvcs/Events/CIAO_Events.mpc + + Fixes for linking errors/warnings on OS X builds. + Tue Apr 11 12:39:14 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Config_Handlers/Utils/Utils.mpc: diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc index 5837ca5692d..b87578e5a4e 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(NodeApplication): ciao_server_dnc { +project(NodeApplication): ciao_server_dnc, ciao_events_dnc { after += NoOp_Configurator libs += CIAO_NoOp_Configurator exename = NodeApplication diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc index 911b8bc9ce8..65166bb2521 100644 --- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc +++ b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc @@ -3,7 +3,7 @@ // MPC file for the Monitor -project(*monitorlib): ciao_client_dnc{ +project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc { after += CIAO_TargetManager_stub includes += $(CIAO_ROOT)/DAnCE/TargetManager sharedname = ciaomonlib diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc index d5338b6c140..01b11fa563a 100644 --- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc +++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc @@ -2,7 +2,7 @@ // $Id$ //For static D&C, the NodeManager should be available as a linkable library -project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub { +project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc { sharedname = NodeManager after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc index 0a8a72fdb43..6ff77c3e1fa 100644 --- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc +++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions { +project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc { exename = StaticDAnCEParser includes += .. libs += NodeApplicationManager diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc index 81004d6b00d..2cc04a9a18a 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc @@ -62,7 +62,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc { } } -project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc { +project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc, ciao_events_dnc, ciao_server_dnc { after += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt sharedname = NodeAppTest_RoundTrip_exec diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc index c4ba7145521..2a236200152 100644 --- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc +++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc, ciao_events_base_dnc { +project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc { sharedname = CIAO_DnC_Events idlflags += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export |