summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-11-12 18:14:02 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-11-12 18:14:02 +0000
commitb47215aeeffb8fcc2858eded0a8554cf088d7579 (patch)
tree515d67e31c0f76d34a5d88133f4953bfe0e4cbf5
parent6f35186f1881fd76312acec1006edfeed8dc6b37 (diff)
downloadATCD-b47215aeeffb8fcc2858eded0a8554cf088d7579.tar.gz
ChangeLogTag: Sat Nov 12 09:55:33 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.am3
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2ffebb4ec11..49ef7c21ca4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Sat Nov 12 09:55:33 2005 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/orbsvcs/Makefile.am:
+
+ Change "FaultTolerance/FT_IOGR_Property.i" to
+ "FaultTolerance/FT_IOGR_Property.inl".
+
+ Remove "ETCL/ETCL_Constraint.i".
+
Sat Nov 12 01:34:26 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* orbsvcs/orbsvcs/CosLoadBalancing.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 76fb499e243..fb5abdd6f0d 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -1938,7 +1938,6 @@ libTAO_ETCL_la_LIBADD = \
nobase_include_HEADERS += \
ETCL/ETCL_Constraint.h \
- ETCL/ETCL_Constraint.i \
ETCL/ETCL_Constraint.inl \
ETCL/ETCL_Constraint_Visitor.h \
ETCL/ETCL_Interpreter.h \
@@ -3453,7 +3452,7 @@ nobase_include_HEADERS += \
FT_CORBA_ORBS_T.inl \
FT_CORBA_ORBS_T.inl \
FaultTolerance/FT_IOGR_Property.h \
- FaultTolerance/FT_IOGR_Property.i \
+ FaultTolerance/FT_IOGR_Property.inl \
FaultTolerance/FT_ORB_Utils_export.h
pkgconfig_DATA += \