ChangeLogTag: Sun Aug 1 23:41:50 2004 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 339 insertions, 330 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6eaafac2e4f..95bf9cc34e5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug  1 23:41:50 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* tao/Makefile.am:
+	  Update after last change.  Fixes "make install" failure due to
+	  bad dependencies.
+
 Mon Aug  2 06:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/PortableServer/AMH_Response_Handler.{h,cpp}:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index dfc595395d9..694a123dc22 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -308,6 +308,9 @@ libTAO_la_SOURCES = \
   $(Interpretive_Marshaling) \
   $(IDL_Compiler)
 
+libTAO_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
 libTAO_la_LIBADD = \
  $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -898,7 +901,7 @@ nobase_pkginclude_HEADERS = \
   orb.idl
 
 
-## Makefile.TAO_BiDirGIOP.am 
+## Makefile.BiDir_GIOP.am 
 
 lib_LTLIBRARIES += libTAO_BiDirGIOP.la
 
@@ -936,117 +939,172 @@ nobase_pkginclude_HEADERS += \
   BiDir_GIOP/BiDir_Policy_i.inl
 
 
-## Makefile.TAO_Domain.am 
+## Makefile.Valuetype.am 
 
-lib_LTLIBRARIES += libTAO_Domain.la
+lib_LTLIBRARIES += libTAO_Valuetype.la
 
-libTAO_Domain_la_CPPFLAGS = \
+libTAO_Valuetype_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_DOMAIN_BUILD_DLL
+  -DTAO_VALUETYPE_BUILD_DLL
 
-libTAO_Domain_la_SOURCES = \
-  Domain/DomainS.cpp
+libTAO_Valuetype_la_SOURCES = \
+  Valuetype/AbstractBase.cpp \
+  Valuetype/AbstractBase_Invocation_Adapter.cpp \
+  Valuetype/Seq_Tmplinst.cpp \
+  Valuetype/ValueFactory_Map.cpp \
+  Valuetype/ValueBase.cpp \
+  Valuetype/ValueFactory.cpp \
+  Valuetype/Valuetype_Adapter_Impl.cpp
 
-libTAO_Domain_la_LDFLAGS = \
+libTAO_Valuetype_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_Domain_la_LIBADD = \
- libTAO_PortableServer.la \
- libTAO_IORInterceptor.la \
- libTAO_ObjRefTemplate.la \
+libTAO_Valuetype_la_LIBADD = \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  Valuetype/AbstractBase.h \
+  Valuetype/Sequence_T.h \
+  Valuetype/AbstractBase_Invocation_Adapter.h \
+  Valuetype/AbstractBase_T.h \
+  Valuetype/ValueBase.h \
+  Valuetype/ValueFactory.h \
+  Valuetype/Value_CORBA_methods.h \
+  Valuetype/ValueFactory_Map.h \
+  Valuetype/Value_VarOut_T.h \
+  Valuetype/Valuetype_Adapter_Impl.h \
+  Valuetype/valuetype_export.h \
+  Valuetype/AbstractBase.inl \
+  Valuetype/Sequence_T.inl \
+  Valuetype/ValueBase.inl \
+  Valuetype/ValueFactory.inl \
+  Valuetype/ValueFactory_Map.inl \
+  Valuetype/Value_VarOut_T.inl \
+  Valuetype/AbstractBase_T.cpp \
+  Valuetype/Sequence_T.cpp \
+  Valuetype/Value_VarOut_T.cpp
+
+
+## Makefile.ObjRefTemplate.am 
+
+lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
+
+libTAO_ObjRefTemplate_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_ORT_BUILD_DLL
+
+libTAO_ObjRefTemplate_la_SOURCES = \
+  ObjRefTemplate/ObjectReferenceTemplateC.cpp
+
+libTAO_ObjRefTemplate_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
+
+libTAO_ObjRefTemplate_la_LIBADD = \
  libTAO_Valuetype.la \
- libTAO_IFR_Client.la \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  Domain/DomainS.h \
-  Domain/DomainS_T.h \
-  Domain/domain_export.h \
-  Domain/DomainS.i \
-  Domain/DomainS_T.i \
-  Domain/DomainS_T.cpp
+  ObjRefTemplate/ObjectReferenceTemplateC.h \
+  ObjRefTemplate/ort_export.h \
+  ObjRefTemplate/ObjectReferenceTemplateC.i
 
 
-## Makefile.TAO_DynamicAny.am 
+## Makefile.IORInterceptor.am 
 
-lib_LTLIBRARIES += libTAO_DynamicAny.la
+lib_LTLIBRARIES += libTAO_IORInterceptor.la
 
-libTAO_DynamicAny_la_CPPFLAGS = \
+libTAO_IORInterceptor_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICANY_BUILD_DLL
+  -DTAO_IORINTERCEPTOR_BUILD_DLL
 
-libTAO_DynamicAny_la_SOURCES = \
-  DynamicAny/DynAny_i.cpp \
-  DynamicAny/DynArray_i.cpp \
-  DynamicAny/DynCommon.cpp \
-  DynamicAny/DynEnum_i.cpp \
-  DynamicAny/DynSequence_i.cpp \
-  DynamicAny/DynStruct_i.cpp \
-  DynamicAny/DynUnion_i.cpp \
-  DynamicAny/DynamicAny.cpp \
-  DynamicAny/DynamicAnyC.cpp \
-  DynamicAny/DynAnyFactory.cpp
+libTAO_IORInterceptor_la_SOURCES = \
+  IORInterceptor/IORInterceptor_List.cpp \
+  IORInterceptor/IORInterceptorC.cpp \
+  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
+  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
 
-libTAO_DynamicAny_la_LDFLAGS = \
+libTAO_IORInterceptor_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_DynamicAny_la_LIBADD = \
+libTAO_IORInterceptor_la_LIBADD = \
+ libTAO_ObjRefTemplate.la \
  libTAO_Valuetype.la \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  DynamicAny/DynAny_i.h \
-  DynamicAny/DynArray_i.h \
-  DynamicAny/DynCommon.h \
-  DynamicAny/DynEnum_i.h \
-  DynamicAny/DynSequence_i.h \
-  DynamicAny/DynStruct_i.h \
-  DynamicAny/DynUnion_i.h \
-  DynamicAny/DynamicAny.h \
-  DynamicAny/DynamicAnyC.h \
-  DynamicAny/dynamicany_export.h \
-  DynamicAny/DynAnyFactory.h \
-  DynamicAny/DynamicAnyC.i
+  IORInterceptor/IORInterceptorC.h \
+  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
+  IORInterceptor/IORInterceptor_Adapter_Impl.h \
+  IORInterceptor/IORInterceptor_List.h \
+  IORInterceptor/iorinterceptor_export.h \
+  IORInterceptor/IORInterceptorC.i \
+  IORInterceptor/IORInterceptor_List.inl
 
 
-## Makefile.TAO_DynamicInterface.am 
+## Makefile.PortableServer.am 
 
-lib_LTLIBRARIES += libTAO_DynamicInterface.la
+lib_LTLIBRARIES += libTAO_PortableServer.la
 
-libTAO_DynamicInterface_la_CPPFLAGS = \
+libTAO_PortableServer_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_DYNAMICINTERFACE_BUILD_DLL
+  -DTAO_PORTABLESERVER_BUILD_DLL
 
-libTAO_DynamicInterface_la_SOURCES = \
-  DynamicInterface/DII_Arguments.cpp \
-  DynamicInterface/Context.cpp \
-  DynamicInterface/DII_Invocation_Adapter.cpp \
-  DynamicInterface/DII_Invocation.cpp \
-  DynamicInterface/Dynamic_Implementation.cpp \
-  DynamicInterface/DII_Reply_Dispatcher.cpp \
-  DynamicInterface/Request.cpp \
-  DynamicInterface/ExceptionList.cpp \
-  DynamicInterface/Dynamic_Adapter_Impl.cpp \
-  DynamicInterface/Unknown_User_Exception.cpp \
-  DynamicInterface/Server_Request.cpp
+libTAO_PortableServer_la_SOURCES = \
+  PortableServer/Default_Acceptor_Filter.cpp \
+  PortableServer/AMH_Response_Handler.cpp \
+  PortableServer/Active_Object_Map.cpp \
+  PortableServer/Object_Adapter.cpp \
+  PortableServer/Collocated_Object_Proxy_Broker.cpp \
+  PortableServer/Default_ORTC.cpp \
+  PortableServer/IORInfo.cpp \
+  PortableServer/Default_Servant_Dispatcher.cpp \
+  PortableServer/Default_Policy_Validator.cpp \
+  PortableServer/ImR_LocatorC.cpp \
+  PortableServer/ImR_LocatorS.cpp \
+  PortableServer/ImplRepoC.cpp \
+  PortableServer/ImplRepoS.cpp \
+  PortableServer/ImplRepo_i.cpp \
+  PortableServer/Key_Adapters.cpp \
+  PortableServer/ORB_Manager.cpp \
+  PortableServer/POA.cpp \
+  PortableServer/ObjectReferenceTemplate.cpp \
+  PortableServer/Operation_Table.cpp \
+  PortableServer/PICurrent_Guard.cpp \
+  PortableServer/POA_Cached_Policies.cpp \
+  PortableServer/POAManager.cpp \
+  PortableServer/PortableServer.cpp \
+  PortableServer/POA_Policies.cpp \
+  PortableServer/POA_Policy_Set.cpp \
+  PortableServer/PortableGroup_Hooks.cpp \
+  PortableServer/PortableServerA.cpp \
+  PortableServer/PortableServerC.cpp \
+  PortableServer/PortableServer_ORBInitializer.cpp \
+  PortableServer/PortableServer_PolicyFactory.cpp \
+  PortableServer/Servant_Base.cpp \
+  PortableServer/Servant_Dispatcher.cpp \
+  PortableServer/ServerInterceptorAdapter.cpp \
+  PortableServer/ServerRequestInfo.cpp \
+  PortableServer/PolicyS.cpp
 
-libTAO_DynamicInterface_la_LDFLAGS = \
+libTAO_PortableServer_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_DynamicInterface_la_LIBADD = \
- libTAO_Messaging.la \
- libTAO_PortableServer.la \
+libTAO_PortableServer_la_LIBADD = \
  libTAO_IORInterceptor.la \
  libTAO_ObjRefTemplate.la \
  libTAO_Valuetype.la \
@@ -1054,28 +1112,70 @@ libTAO_DynamicInterface_la_LIBADD = \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  DynamicInterface/Context.h \
-  DynamicInterface/DII_Arguments.h \
-  DynamicInterface/DII_CORBA_methods.h \
-  DynamicInterface/DII_Invocation.h \
-  DynamicInterface/DII_Invocation_Adapter.h \
-  DynamicInterface/DII_Reply_Dispatcher.h \
-  DynamicInterface/Dynamic_Adapter_Impl.h \
-  DynamicInterface/Dynamic_Implementation.h \
-  DynamicInterface/ExceptionList.h \
-  DynamicInterface/Request.h \
-  DynamicInterface/Server_Request.h \
-  DynamicInterface/Unknown_User_Exception.h \
-  DynamicInterface/dynamicinterface_export.h \
-  DynamicInterface/Context.inl \
-  DynamicInterface/DII_Arguments.inl \
-  DynamicInterface/DII_Invocation.inl \
-  DynamicInterface/ExceptionList.inl \
-  DynamicInterface/Request.inl \
-  DynamicInterface/Server_Request.inl
+  PortableServer/AMH_Response_Handler.h \
+  PortableServer/Collocated_Object_Proxy_Broker.h \
+  PortableServer/Default_Acceptor_Filter.h \
+  PortableServer/Default_ORTC.h \
+  PortableServer/POA.h \
+  PortableServer/Default_Policy_Validator.h \
+  PortableServer/IORInfo.h \
+  PortableServer/Default_Servant_Dispatcher.h \
+  PortableServer/ImR_LocatorC.h \
+  PortableServer/ImR_LocatorS.h \
+  PortableServer/ImplRepoC.h \
+  PortableServer/ImplRepoS.h \
+  PortableServer/ImplRepo_i.h \
+  PortableServer/Key_Adapters.h \
+  PortableServer/ORB_Manager.h \
+  PortableServer/ObjectReferenceTemplate.h \
+  PortableServer/Object_Adapter.h \
+  PortableServer/Operation_Table.h \
+  PortableServer/PolicyS_T.h \
+  PortableServer/PolicyS.h \
+  PortableServer/PICurrent_Guard.h \
+  PortableServer/POAManager.h \
+  PortableServer/POA_Cached_Policies.h \
+  PortableServer/POA_Policies.h \
+  PortableServer/POA_Policy_Set.h \
+  PortableServer/PortableServer_ORBInitializer.h \
+  PortableServer/PortableGroup_Hooks.h \
+  PortableServer/PortableServer.h \
+  PortableServer/PortableServerC.h \
+  PortableServer/PortableServerS.h \
+  PortableServer/poa_macros.h \
+  PortableServer/PortableServer_PolicyFactory.h \
+  PortableServer/Servant_Base.h \
+  PortableServer/Servant_Dispatcher.h \
+  PortableServer/ServerInterceptorAdapter.h \
+  PortableServer/ServerRequestInfo.h \
+  PortableServer/Upcall_Wrapper.h \
+  PortableServer/portableserver_export.h \
+  PortableServer/Active_Object_Map.h \
+  PortableServer/Active_Object_Map.i \
+  PortableServer/Default_ORTC.i \
+  PortableServer/IORInfo.inl \
+  PortableServer/ImR_LocatorC.i \
+  PortableServer/ImR_LocatorS.i \
+  PortableServer/ImplRepoC.i \
+  PortableServer/ImplRepoS.i \
+  PortableServer/Key_Adapters.i \
+  PortableServer/ObjectReferenceTemplate.inl \
+  PortableServer/Object_Adapter.i \
+  PortableServer/POA.i \
+  PortableServer/POAManager.i \
+  PortableServer/POA_Cached_Policies.i \
+  PortableServer/POA_Policies.i \
+  PortableServer/POA_Policy_Set.i \
+  PortableServer/PolicyS.i \
+  PortableServer/PolicyS_T.i \
+  PortableServer/PortableServerC.i \
+  PortableServer/Servant_Base.i \
+  PortableServer/ServerInterceptorAdapter.inl \
+  PortableServer/ServerRequestInfo.inl \
+  PortableServer/PolicyS_T.cpp
 
 
-## Makefile.TAO_IFR_Client.am 
+## Makefile.IFR_Client.am 
 
 lib_LTLIBRARIES += libTAO_IFR_Client.la
 
@@ -1118,108 +1218,88 @@ nobase_pkginclude_HEADERS += \
   IFR_Client/IFR_ExtendedC.i
 
 
-## Makefile.TAO_IORInterceptor.am 
+## Makefile.Domain.am 
 
-lib_LTLIBRARIES += libTAO_IORInterceptor.la
+lib_LTLIBRARIES += libTAO_Domain.la
 
-libTAO_IORInterceptor_la_CPPFLAGS = \
+libTAO_Domain_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_IORINTERCEPTOR_BUILD_DLL
+  -DTAO_DOMAIN_BUILD_DLL
 
-libTAO_IORInterceptor_la_SOURCES = \
-  IORInterceptor/IORInterceptor_List.cpp \
-  IORInterceptor/IORInterceptorC.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+libTAO_Domain_la_SOURCES = \
+  Domain/DomainS.cpp
 
-libTAO_IORInterceptor_la_LDFLAGS = \
+libTAO_Domain_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_IORInterceptor_la_LIBADD = \
+libTAO_Domain_la_LIBADD = \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
  libTAO_ObjRefTemplate.la \
  libTAO_Valuetype.la \
+ libTAO_IFR_Client.la \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  IORInterceptor/IORInterceptorC.h \
-  IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
-  IORInterceptor/IORInterceptor_Adapter_Impl.h \
-  IORInterceptor/IORInterceptor_List.h \
-  IORInterceptor/iorinterceptor_export.h \
-  IORInterceptor/IORInterceptorC.i \
-  IORInterceptor/IORInterceptor_List.inl
-
-
-## Makefile.TAO_IORManip.am 
-
-lib_LTLIBRARIES += libTAO_IORManip.la
-
-libTAO_IORManip_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_IORMANIP_BUILD_DLL
-
-libTAO_IORManip_la_SOURCES = \
-  IORManipulation/IORA.cpp \
-  IORManipulation/IORC.cpp \
-  IORManipulation/IORManip_Loader.cpp \
-  IORManipulation/IORManipulation.cpp
-
-libTAO_IORManip_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_IORManip_la_LIBADD = \
- libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_pkginclude_HEADERS += \
-  IORManipulation/IORC.h \
-  IORManipulation/IORManip_Loader.h \
-  IORManipulation/IORManipulation.h \
-  IORManipulation/ior_manip_export.h \
-  IORManipulation/IORC.i
+  Domain/DomainS.h \
+  Domain/DomainS_T.h \
+  Domain/domain_export.h \
+  Domain/DomainS.i \
+  Domain/DomainS_T.i \
+  Domain/DomainS_T.cpp
 
 
-## Makefile.TAO_IORTable.am 
+## Makefile.DynamicAny.am 
 
-lib_LTLIBRARIES += libTAO_IORTable.la
+lib_LTLIBRARIES += libTAO_DynamicAny.la
 
-libTAO_IORTable_la_CPPFLAGS = \
+libTAO_DynamicAny_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_IORTABLE_BUILD_DLL
+  -DTAO_DYNAMICANY_BUILD_DLL
 
-libTAO_IORTable_la_SOURCES = \
-  IORTable/IOR_Table_Impl.cpp \
-  IORTable/IORTableC.cpp \
-  IORTable/Table_Adapter.cpp \
-  IORTable/IORTable.cpp
+libTAO_DynamicAny_la_SOURCES = \
+  DynamicAny/DynAny_i.cpp \
+  DynamicAny/DynArray_i.cpp \
+  DynamicAny/DynCommon.cpp \
+  DynamicAny/DynEnum_i.cpp \
+  DynamicAny/DynSequence_i.cpp \
+  DynamicAny/DynStruct_i.cpp \
+  DynamicAny/DynUnion_i.cpp \
+  DynamicAny/DynamicAny.cpp \
+  DynamicAny/DynamicAnyC.cpp \
+  DynamicAny/DynAnyFactory.cpp
 
-libTAO_IORTable_la_LDFLAGS = \
+libTAO_DynamicAny_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_IORTable_la_LIBADD = \
+libTAO_DynamicAny_la_LIBADD = \
+ libTAO_Valuetype.la \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  IORTable/IORTable.h \
-  IORTable/IORTableC.h \
-  IORTable/IOR_Table_Impl.h \
-  IORTable/iortable_export.h \
-  IORTable/Table_Adapter.h \
-  IORTable/IORTableC.i
+  DynamicAny/DynAny_i.h \
+  DynamicAny/DynArray_i.h \
+  DynamicAny/DynCommon.h \
+  DynamicAny/DynEnum_i.h \
+  DynamicAny/DynSequence_i.h \
+  DynamicAny/DynStruct_i.h \
+  DynamicAny/DynUnion_i.h \
+  DynamicAny/DynamicAny.h \
+  DynamicAny/DynamicAnyC.h \
+  DynamicAny/dynamicany_export.h \
+  DynamicAny/DynAnyFactory.h \
+  DynamicAny/DynamicAnyC.i
 
 
-## Makefile.TAO_Messaging.am 
+## Makefile.Messaging.am 
 
 lib_LTLIBRARIES += libTAO_Messaging.la
 
@@ -1289,157 +1369,130 @@ nobase_pkginclude_HEADERS += \
   Messaging/MessagingS_T.cpp
 
 
-## Makefile.TAO_ObjRefTemplate.am 
+## Makefile.DynamicInterface.am 
 
-lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
+lib_LTLIBRARIES += libTAO_DynamicInterface.la
 
-libTAO_ObjRefTemplate_la_CPPFLAGS = \
+libTAO_DynamicInterface_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_ORT_BUILD_DLL
+  -DTAO_DYNAMICINTERFACE_BUILD_DLL
 
-libTAO_ObjRefTemplate_la_SOURCES = \
-  ObjRefTemplate/ObjectReferenceTemplateC.cpp
+libTAO_DynamicInterface_la_SOURCES = \
+  DynamicInterface/DII_Arguments.cpp \
+  DynamicInterface/Context.cpp \
+  DynamicInterface/DII_Invocation_Adapter.cpp \
+  DynamicInterface/DII_Invocation.cpp \
+  DynamicInterface/Dynamic_Implementation.cpp \
+  DynamicInterface/DII_Reply_Dispatcher.cpp \
+  DynamicInterface/Request.cpp \
+  DynamicInterface/ExceptionList.cpp \
+  DynamicInterface/Dynamic_Adapter_Impl.cpp \
+  DynamicInterface/Unknown_User_Exception.cpp \
+  DynamicInterface/Server_Request.cpp
 
-libTAO_ObjRefTemplate_la_LDFLAGS = \
+libTAO_DynamicInterface_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_ObjRefTemplate_la_LIBADD = \
+libTAO_DynamicInterface_la_LIBADD = \
+ libTAO_Messaging.la \
+ libTAO_PortableServer.la \
+ libTAO_IORInterceptor.la \
+ libTAO_ObjRefTemplate.la \
  libTAO_Valuetype.la \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  ObjRefTemplate/ObjectReferenceTemplateC.h \
-  ObjRefTemplate/ort_export.h \
-  ObjRefTemplate/ObjectReferenceTemplateC.i
+  DynamicInterface/Context.h \
+  DynamicInterface/DII_Arguments.h \
+  DynamicInterface/DII_CORBA_methods.h \
+  DynamicInterface/DII_Invocation.h \
+  DynamicInterface/DII_Invocation_Adapter.h \
+  DynamicInterface/DII_Reply_Dispatcher.h \
+  DynamicInterface/Dynamic_Adapter_Impl.h \
+  DynamicInterface/Dynamic_Implementation.h \
+  DynamicInterface/ExceptionList.h \
+  DynamicInterface/Request.h \
+  DynamicInterface/Server_Request.h \
+  DynamicInterface/Unknown_User_Exception.h \
+  DynamicInterface/dynamicinterface_export.h \
+  DynamicInterface/Context.inl \
+  DynamicInterface/DII_Arguments.inl \
+  DynamicInterface/DII_Invocation.inl \
+  DynamicInterface/ExceptionList.inl \
+  DynamicInterface/Request.inl \
+  DynamicInterface/Server_Request.inl
 
 
-## Makefile.TAO_PortableServer.am 
+## Makefile.IORManipulation.am 
 
-lib_LTLIBRARIES += libTAO_PortableServer.la
+lib_LTLIBRARIES += libTAO_IORManip.la
 
-libTAO_PortableServer_la_CPPFLAGS = \
+libTAO_IORManip_la_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -DTAO_PORTABLESERVER_BUILD_DLL
+  -DTAO_IORMANIP_BUILD_DLL
 
-libTAO_PortableServer_la_SOURCES = \
-  PortableServer/Default_Acceptor_Filter.cpp \
-  PortableServer/AMH_Response_Handler.cpp \
-  PortableServer/Active_Object_Map.cpp \
-  PortableServer/Object_Adapter.cpp \
-  PortableServer/Collocated_Object_Proxy_Broker.cpp \
-  PortableServer/Default_ORTC.cpp \
-  PortableServer/IORInfo.cpp \
-  PortableServer/Default_Servant_Dispatcher.cpp \
-  PortableServer/Default_Policy_Validator.cpp \
-  PortableServer/ImR_LocatorC.cpp \
-  PortableServer/ImR_LocatorS.cpp \
-  PortableServer/ImplRepoC.cpp \
-  PortableServer/ImplRepoS.cpp \
-  PortableServer/ImplRepo_i.cpp \
-  PortableServer/Key_Adapters.cpp \
-  PortableServer/ORB_Manager.cpp \
-  PortableServer/POA.cpp \
-  PortableServer/ObjectReferenceTemplate.cpp \
-  PortableServer/Operation_Table.cpp \
-  PortableServer/PICurrent_Guard.cpp \
-  PortableServer/POA_Cached_Policies.cpp \
-  PortableServer/POAManager.cpp \
-  PortableServer/PortableServer.cpp \
-  PortableServer/POA_Policies.cpp \
-  PortableServer/POA_Policy_Set.cpp \
-  PortableServer/PortableGroup_Hooks.cpp \
-  PortableServer/PortableServerA.cpp \
-  PortableServer/PortableServerC.cpp \
-  PortableServer/PortableServer_ORBInitializer.cpp \
-  PortableServer/PortableServer_PolicyFactory.cpp \
-  PortableServer/Servant_Base.cpp \
-  PortableServer/Servant_Dispatcher.cpp \
-  PortableServer/ServerInterceptorAdapter.cpp \
-  PortableServer/ServerRequestInfo.cpp \
-  PortableServer/PolicyS.cpp
+libTAO_IORManip_la_SOURCES = \
+  IORManipulation/IORA.cpp \
+  IORManipulation/IORC.cpp \
+  IORManipulation/IORManip_Loader.cpp \
+  IORManipulation/IORManipulation.cpp
 
-libTAO_PortableServer_la_LDFLAGS = \
+libTAO_IORManip_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_PortableServer_la_LIBADD = \
- libTAO_IORInterceptor.la \
- libTAO_ObjRefTemplate.la \
- libTAO_Valuetype.la \
+libTAO_IORManip_la_LIBADD = \
  libTAO.la \
  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_pkginclude_HEADERS += \
-  PortableServer/AMH_Response_Handler.h \
-  PortableServer/Collocated_Object_Proxy_Broker.h \
-  PortableServer/Default_Acceptor_Filter.h \
-  PortableServer/Default_ORTC.h \
-  PortableServer/POA.h \
-  PortableServer/Default_Policy_Validator.h \
-  PortableServer/IORInfo.h \
-  PortableServer/Default_Servant_Dispatcher.h \
-  PortableServer/ImR_LocatorC.h \
-  PortableServer/ImR_LocatorS.h \
-  PortableServer/ImplRepoC.h \
-  PortableServer/ImplRepoS.h \
-  PortableServer/ImplRepo_i.h \
-  PortableServer/Key_Adapters.h \
-  PortableServer/ORB_Manager.h \
-  PortableServer/ObjectReferenceTemplate.h \
-  PortableServer/Object_Adapter.h \
-  PortableServer/Operation_Table.h \
-  PortableServer/PolicyS_T.h \
-  PortableServer/PolicyS.h \
-  PortableServer/PICurrent_Guard.h \
-  PortableServer/POAManager.h \
-  PortableServer/POA_Cached_Policies.h \
-  PortableServer/POA_Policies.h \
-  PortableServer/POA_Policy_Set.h \
-  PortableServer/PortableServer_ORBInitializer.h \
-  PortableServer/PortableGroup_Hooks.h \
-  PortableServer/PortableServer.h \
-  PortableServer/PortableServerC.h \
-  PortableServer/PortableServerS.h \
-  PortableServer/poa_macros.h \
-  PortableServer/PortableServer_PolicyFactory.h \
-  PortableServer/Servant_Base.h \
-  PortableServer/Servant_Dispatcher.h \
-  PortableServer/ServerInterceptorAdapter.h \
-  PortableServer/ServerRequestInfo.h \
-  PortableServer/Upcall_Wrapper.h \
-  PortableServer/portableserver_export.h \
-  PortableServer/Active_Object_Map.h \
-  PortableServer/Active_Object_Map.i \
-  PortableServer/Default_ORTC.i \
-  PortableServer/IORInfo.inl \
-  PortableServer/ImR_LocatorC.i \
-  PortableServer/ImR_LocatorS.i \
-  PortableServer/ImplRepoC.i \
-  PortableServer/ImplRepoS.i \
-  PortableServer/Key_Adapters.i \
-  PortableServer/ObjectReferenceTemplate.inl \
-  PortableServer/Object_Adapter.i \
-  PortableServer/POA.i \
-  PortableServer/POAManager.i \
-  PortableServer/POA_Cached_Policies.i \
-  PortableServer/POA_Policies.i \
-  PortableServer/POA_Policy_Set.i \
-  PortableServer/PolicyS.i \
-  PortableServer/PolicyS_T.i \
-  PortableServer/PortableServerC.i \
-  PortableServer/Servant_Base.i \
-  PortableServer/ServerInterceptorAdapter.inl \
-  PortableServer/ServerRequestInfo.inl \
-  PortableServer/PolicyS_T.cpp
+  IORManipulation/IORC.h \
+  IORManipulation/IORManip_Loader.h \
+  IORManipulation/IORManipulation.h \
+  IORManipulation/ior_manip_export.h \
+  IORManipulation/IORC.i
+
+
+## Makefile.IORTable.am 
+
+lib_LTLIBRARIES += libTAO_IORTable.la
+
+libTAO_IORTable_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DTAO_IORTABLE_BUILD_DLL
+
+libTAO_IORTable_la_SOURCES = \
+  IORTable/IOR_Table_Impl.cpp \
+  IORTable/IORTableC.cpp \
+  IORTable/Table_Adapter.cpp \
+  IORTable/IORTable.cpp
 
+libTAO_IORTable_la_LDFLAGS = \
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-## Makefile.TAO_RTCORBA.am 
+libTAO_IORTable_la_LIBADD = \
+ libTAO.la \
+ $(ACE_BUILDDIR)/ace/libACE.la
+
+nobase_pkginclude_HEADERS += \
+  IORTable/IORTable.h \
+  IORTable/IORTableC.h \
+  IORTable/IOR_Table_Impl.h \
+  IORTable/iortable_export.h \
+  IORTable/Table_Adapter.h \
+  IORTable/IORTableC.i
+
+
+## Makefile.RTCORBA.am 
 
 lib_LTLIBRARIES += libTAO_RTCORBA.la
 
@@ -1542,7 +1595,7 @@ nobase_pkginclude_HEADERS += \
   RTCORBA/Thread_Pool.i
 
 
-## Makefile.TAO_RTPortableServer.am 
+## Makefile.RTPortableServer.am 
 
 lib_LTLIBRARIES += libTAO_RTPortableServer.la
 
@@ -1592,7 +1645,7 @@ nobase_pkginclude_HEADERS += \
   RTPortableServer/RT_POA.i
 
 
-## Makefile.TAO_RTScheduler.am 
+## Makefile.RTScheduler.am 
 
 lib_LTLIBRARIES += libTAO_RTScheduler.la
 
@@ -1641,7 +1694,7 @@ nobase_pkginclude_HEADERS += \
   RTScheduling/RTScheduler_Manager.i
 
 
-## Makefile.TAO_SmartProxies.am 
+## Makefile.SmartProxies.am 
 
 lib_LTLIBRARIES += libTAO_SmartProxies.la
 
@@ -1668,7 +1721,7 @@ nobase_pkginclude_HEADERS += \
   SmartProxies/Smart_Proxies.inl
 
 
-## Makefile.TAO_Strategies.am 
+## Makefile.Strategies.am 
 
 lib_LTLIBRARIES += libTAO_Strategies.la
 
@@ -1789,7 +1842,7 @@ nobase_pkginclude_HEADERS += \
   Strategies/uiop_endpoints.i
 
 
-## Makefile.TAO_TypeCodeFactory.am 
+## Makefile.TypeCodeFactory.am 
 
 lib_LTLIBRARIES += libTAO_TypeCodeFactory.la
 
@@ -1823,7 +1876,7 @@ nobase_pkginclude_HEADERS += \
   TypeCodeFactory/TypeCodeFactoryC.inl
 
 
-## Makefile.TAO_Utils.am 
+## Makefile.Utils.am 
 
 lib_LTLIBRARIES += libTAO_Utils.la
 
@@ -1866,56 +1919,6 @@ nobase_pkginclude_HEADERS += \
   Utils/Servant_Var.inl
 
 
-## Makefile.TAO_Valuetype.am 
-
-lib_LTLIBRARIES += libTAO_Valuetype.la
-
-libTAO_Valuetype_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_VALUETYPE_BUILD_DLL
-
-libTAO_Valuetype_la_SOURCES = \
-  Valuetype/AbstractBase.cpp \
-  Valuetype/AbstractBase_Invocation_Adapter.cpp \
-  Valuetype/Seq_Tmplinst.cpp \
-  Valuetype/ValueFactory_Map.cpp \
-  Valuetype/ValueBase.cpp \
-  Valuetype/ValueFactory.cpp \
-  Valuetype/Valuetype_Adapter_Impl.cpp
-
-libTAO_Valuetype_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_Valuetype_la_LIBADD = \
- libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_pkginclude_HEADERS += \
-  Valuetype/AbstractBase.h \
-  Valuetype/Sequence_T.h \
-  Valuetype/AbstractBase_Invocation_Adapter.h \
-  Valuetype/AbstractBase_T.h \
-  Valuetype/ValueBase.h \
-  Valuetype/ValueFactory.h \
-  Valuetype/Value_CORBA_methods.h \
-  Valuetype/ValueFactory_Map.h \
-  Valuetype/Value_VarOut_T.h \
-  Valuetype/Valuetype_Adapter_Impl.h \
-  Valuetype/valuetype_export.h \
-  Valuetype/AbstractBase.inl \
-  Valuetype/Sequence_T.inl \
-  Valuetype/ValueBase.inl \
-  Valuetype/ValueFactory.inl \
-  Valuetype/ValueFactory_Map.inl \
-  Valuetype/Value_VarOut_T.inl \
-  Valuetype/AbstractBase_T.cpp \
-  Valuetype/Sequence_T.cpp \
-  Valuetype/Value_VarOut_T.cpp
-
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core