diff options
4 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a1106d72343..6a414614e94 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue Feb 19 18:28:46 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc: + + * MPC/config/ft_naming_serv.mpb: + + * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc: + + Fix dependencies for static builds. + Tue Feb 19 13:57:57 UTC 2013 Byron Harris <harrisb@ociweb.com> * orbsvcs/tests/ImplRepo/scale/run_test.pl: diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc index 343548177db..c1d7a99cf26 100644 --- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc +++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro { custom_only = 1 } -project(*Server): taoserver, csd_framework, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro { +project(*Server): taoserver, csd_threadpool, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro { exename = MessengerServer after += *idl Source_Files { diff --git a/TAO/MPC/config/ft_naming_serv.mpb b/TAO/MPC/config/ft_naming_serv.mpb index d111920bc4f..e346bcf683f 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, naming_serv, iortable, messaging_optional, svc_utils { +project : orbsvcslib, naming_skel, portablegroup, ftnaming_replication, naming_serv, iortable, messaging_optional, svc_utils { after += FT_Naming_Serv libs += TAO_FT_Naming_Serv } diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc index 8e62221f567..f5443b2ff36 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc @@ -8,7 +8,7 @@ project(Dynamic_TP_POA_Test_Static_idl): taoidldefaults, avoids_corba_e_compact, custom_only = 1 } -project(Dynamic_TP_POA_Test_Static_Server): taoserver, csd_framework, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro { +project(Dynamic_TP_POA_Test_Static_Server): taoserver, csd_threadpool, dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro { after += Dynamic_TP_POA_Test_Static_idl Source_Files { Hello.cpp |