diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-05 19:00:43 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-05 19:00:43 +0000 |
| commit | 58ce871c4c4a6c18fb41bf9740be495ec8ac7127 (patch) | |
| tree | 0576d4997aa9c31d0bbe07f03c0eaf0b53b3b6ba | |
| parent | 2737bf234dca5428d6d05c656d4dd5f348a6e58b (diff) | |
| download | ATCD-58ce871c4c4a6c18fb41bf9740be495ec8ac7127.tar.gz | |
ChangeLogTag: Fri Nov 5 10:51:08 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.am | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a6b92fcdeaf..b5ef70dd638 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 5 10:51:08 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Makefile.am: + + Updated for new location of HTBP library. + Fri Nov 5 11:50:39 2004 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: @@ -75,9 +81,9 @@ Thu Nov 4 17:42:07 2004 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Log/PersistStore.cpp: Changed retrieve method to seek past records with non-matching - id's. This avoids memory leaks and is more efficient than the - code it replaced. Thanks to Gary Maxy <gary.maxey@hp.com> for - reporting the problem. + id's. This avoids memory leaks and is more efficient than the + code it replaced. Thanks to Gary Maxey <gary.maxey@hp.com> for + reporting the problem. Thu Nov 4 13:51:24 2004 J.T. Conklin <jtc@acorntoolworks.com> diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index 2226b7b1f91..f1338572248 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -4032,6 +4032,7 @@ lib_LTLIBRARIES += libTAO_HTIOP.la libTAO_HTIOP_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ + -I$(ACE_ROOT)/protocols \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ -I$(TAO_ROOT)/orbsvcs \ @@ -4045,7 +4046,7 @@ libTAO_HTIOP_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_HTIOP_la_LIBADD = \ - -lACE_HTBP \ + $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la @@ -4681,7 +4682,7 @@ libTAO_RTKokyuEvent_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_RTKokyuEvent_la_LIBADD = \ - -lKokyu \ + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ libTAO_RTSched.la \ libTAO_CosNaming.la \ libTAO_RTEvent.la \ |