diff options
| author | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-25 14:14:47 +0000 |
|---|---|---|
| committer | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-25 14:14:47 +0000 |
| commit | c14c29bd3d313767bf9aed1164af0a4cd0c6a5ba (patch) | |
| tree | 7c54a9677b97da12b22e17ba427bd462aac135e6 | |
| parent | 4723e91693e649d9795d0497207dd317e57911f2 (diff) | |
| download | ATCD-c14c29bd3d313767bf9aed1164af0a4cd0c6a5ba.tar.gz | |
ChangeLogTag: Tue Mar 25 14:13:15 UTC 2008 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/MPC/config/notify_serv.mpb | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2bac859a534..8e121b177f5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Mar 25 14:13:15 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * MPC/config/notify_serv.mpb: + + Changed the order of Notification_Serv and Notification_Skel so they + are in the correct dependency order. + + * orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc: + + Removed a redundant base project. + Mon Mar 24 21:17:12 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * utils/nslist/Makefile.am: diff --git a/TAO/MPC/config/notify_serv.mpb b/TAO/MPC/config/notify_serv.mpb index e8360b407c5..9ab5ba2020b 100644 --- a/TAO/MPC/config/notify_serv.mpb +++ b/TAO/MPC/config/notify_serv.mpb @@ -5,6 +5,5 @@ project : orbsvcslib, notification, event_serv, etcl, dynamicany { after += CosNotification_Serv - libs += TAO_CosNotification_Serv - libs += TAO_CosNotification_Skel + libs += TAO_CosNotification_Serv TAO_CosNotification_Skel } diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc b/TAO/orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc index bf96a0e463a..f546e2df51a 100644 --- a/TAO/orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2926_Regression/Bug_2926_Regression.mpc @@ -9,7 +9,7 @@ project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_co } } -project (*Server): taoserver, notify, notify_serv, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba { +project (*Server): taoserver, notify_serv, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba { libs += bug2926 after += *lib Source_Files { |