From 7344936b3a78d02196ebebac421c21849fa8d800 Mon Sep 17 00:00:00 2001
From: jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 14 Apr 2005 17:43:23 +0000
Subject: ChangeLogTag: Thu Apr 14 10:42:08 2005  J.T. Conklin 
 <jtc@acorntoolworks.com>

---
 TAO/ChangeLog       |  7 +++++++
 TAO/tao/Makefile.am | 20 ++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 004f156911a..010b603d2d6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 14 10:42:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* tao/Makefile.am:
+
+	  Regenerated.  Fixed alphabetization, plus picked up a few recent
+	  changes that hadn't been added by hand.
+
 Thu Apr 14 08:37:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/Objref_TypeCode_Base.cpp:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 586daabda8b..ca1a016aed4 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -187,9 +187,9 @@ libTAO_la_SOURCES = \
   NVList.cpp \
   ORB.cpp \
   ORBInitInfo.cpp \
-  ORBInitializer_Registry.cpp \
   ORBInitializerA.cpp \
   ORBInitializerC.cpp \
+  ORBInitializer_Registry.cpp \
   ORB_Core.cpp \
   ORB_Core_Auto_Ptr.cpp \
   ORB_Table.cpp \
@@ -244,9 +244,9 @@ libTAO_la_SOURCES = \
   Resource_Factory.cpp \
   Resume_Handle.cpp \
   Sequence.cpp \
-  Server_Strategy_Factory.cpp \
   ServerRequestInfoA.cpp \
   ServerRequestInfoC.cpp \
+  Server_Strategy_Factory.cpp \
   Service_Callbacks.cpp \
   Service_Context.cpp \
   ServicesC.cpp \
@@ -427,10 +427,10 @@ nobase_include_HEADERS = \
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   ClientRequestInfo.h \
+  ClientRequestInfo.inl \
+  ClientRequestInfo.pidl \
   ClientRequestInfoC.h \
   ClientRequestInfoS.h \
-  ClientRequestInfo.pidl \
-  ClientRequestInfo.inl \
   ClientRequestInfo_i.h \
   ClientRequestInfo_i.inl \
   ClientRequestInterceptor_Adapter.h \
@@ -628,10 +628,10 @@ nobase_include_HEADERS = \
   ORB.i \
   ORBInitInfo.h \
   ORBInitInfo.inl \
-  ORBInitializer_Registry.h \
   ORBInitializer.pidl \
   ORBInitializerC.h \
   ORBInitializerS.h \
+  ORBInitializer_Registry.h \
   ORB_Constants.h \
   ORB_Core.h \
   ORB_Core.i \
@@ -722,10 +722,10 @@ nobase_include_HEADERS = \
   Remote_Object_Proxy_Broker.h \
   Reply_Dispatcher.h \
   Reply_Dispatcher.i \
-  RequestInfo_Util.h \
   RequestInfo.pidl \
   RequestInfoC.h \
   RequestInfoS.h \
+  RequestInfo_Util.h \
   Request_Dispatcher.h \
   Resource_Factory.h \
   Resume_Handle.h \
@@ -744,10 +744,10 @@ nobase_include_HEADERS = \
   Sequence_TypeCode.cpp \
   Sequence_TypeCode.h \
   Sequence_TypeCode.inl \
-  Server_Strategy_Factory.h \
+  ServerRequestInfo.pidl \
   ServerRequestInfoC.h \
   ServerRequestInfoS.h \
-  ServerRequestInfo.pidl \
+  Server_Strategy_Factory.h \
   Service_Callbacks.h \
   Service_Context.h \
   Service_Context.inl \
@@ -2066,6 +2066,10 @@ nobase_include_HEADERS += \
   RTPortableServer/RTPortableServer.h \
   RTPortableServer/RTPortableServer.pidl \
   RTPortableServer/RTPortableServerC.h \
+  RTPortableServer/RTPortableServerS.h \
+  RTPortableServer/RTPortableServer_include.pidl \
+  RTPortableServer/RTPortableServer_includeC.h \
+  RTPortableServer/RTPortableServer_includeS.h \
   RTPortableServer/RT_Acceptor_Filters.h \
   RTPortableServer/RT_Collocation_Resolver.h \
   RTPortableServer/RT_Object_Adapter_Factory.h \
-- 
cgit v1.2.1