diff options
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/MPC/config/dynamic_tp.mpb | 2 | ||||
| -rw-r--r-- | TAO/MPC/config/ft_naming_serv.mpb | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc | 2 | ||||
| -rw-r--r-- | TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7b7e7f737dd..7c8139f2a07 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Thu Mar 7 17:03:16 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * MPC/config/dynamic_tp.mpb: + * MPC/config/ft_naming_serv.mpb: + + * orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc: + + * tests/Dynamic_TP/POA_Loader/POA_Loader.mpc: + + Fix library dependency issues manifested by out of order + declarations on the link command line. + Thu Mar 7 16:55:43 UTC 2013 Byron Harris <harrisb@ociweb.com> * NEWS: diff --git a/TAO/MPC/config/dynamic_tp.mpb b/TAO/MPC/config/dynamic_tp.mpb index 260d855c942..44a9464794c 100644 --- a/TAO/MPC/config/dynamic_tp.mpb +++ b/TAO/MPC/config/dynamic_tp.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, pi, avoids_corba_e_micro { +project : csd_threadpool, taolib, pi, avoids_corba_e_micro { after += Dynamic_TP libs += TAO_Dynamic_TP } diff --git a/TAO/MPC/config/ft_naming_serv.mpb b/TAO/MPC/config/ft_naming_serv.mpb index e346bcf683f..a2a7f51ed52 100644 --- a/TAO/MPC/config/ft_naming_serv.mpb +++ b/TAO/MPC/config/ft_naming_serv.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, naming_skel, portablegroup, ftnaming_replication, naming_serv, iortable, messaging_optional, svc_utils { +project : orbsvcslib, naming_skel, portablegroup, ftnaming, ftnaming_replication, naming_serv, iortable, messaging_optional, svc_utils { after += FT_Naming_Serv libs += TAO_FT_Naming_Serv } diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc index b14a6253db0..a0d546fa73a 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, ftnaming, naming_serv, imr_client, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, imr_client, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { exename = tao_ft_naming Header_Files { FT_Naming_Service.h diff --git a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc index d8f306a4f7f..67608a907eb 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc +++ b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*test) : dynamic_tp,csd_threadpool, avoids_corba_e_compact, avoids_corba_e_micro { +project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro { exename = test } |