diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-05-10 20:16:44 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-05-10 20:16:44 +0000 |
| commit | dfabcf34d6e5f324900d2940776ea5565a7a4c1f (patch) | |
| tree | 26a098f6fd6b516ad6af87d805b4191e635e3a76 | |
| parent | 4dbbb8e26735f6a747b8e982b9e121b238f292bb (diff) | |
| download | ATCD-dfabcf34d6e5f324900d2940776ea5565a7a4c1f.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/BiDir_GIOP/Makefile | 54 | ||||
| -rw-r--r-- | TAO/tao/Domain/Makefile | 7 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/Makefile | 122 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Makefile | 126 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/Makefile | 43 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/Makefile | 21 | ||||
| -rw-r--r-- | TAO/tao/IORTable/Makefile | 32 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Makefile | 293 | ||||
| -rw-r--r-- | TAO/tao/SmartProxies/Makefile | 5 | ||||
| -rw-r--r-- | TAO/tao/Strategies/Makefile | 249 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/Makefile | 47 |
11 files changed, 542 insertions, 457 deletions
diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile index 39408caf92d..22db1308608 100644 --- a/TAO/tao/BiDir_GIOP/Makefile +++ b/TAO/tao/BiDir_GIOP/Makefile @@ -58,8 +58,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/BiDirGIOP.o .obj/BiDirGIOP.so .shobj/BiDirGIOP.o .shobj/BiDirGIOP.so: BiDirGIOP.cpp BiDirGIOP.h \ - $(ACE_ROOT)/ace/pre.h \ - bidirgiop_export.h \ + $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -182,8 +183,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - BiDirPolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.h \ + BiDirPolicyC.h $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -205,8 +205,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - BiDirPolicyC.i BiDir_ORBInitializer.h \ + $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i \ + BiDir_ORBInitializer.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -312,8 +312,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/BiDirPolicyC.o .obj/BiDirPolicyC.so .shobj/BiDirPolicyC.o .shobj/BiDirPolicyC.so: BiDirPolicyC.cpp BiDirGIOP.h \ - $(ACE_ROOT)/ace/pre.h \ - bidirgiop_export.h \ + $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -436,8 +437,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - BiDirPolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.h \ + BiDirPolicyC.h $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -459,15 +459,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - BiDirPolicyC.i \ + $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i .obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.so .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.so: BiDir_ORBInitializer.cpp \ - BiDir_ORBInitializer.h \ - $(ACE_ROOT)/ace/pre.h \ - bidirgiop_export.h \ + BiDir_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -652,8 +651,9 @@ CPPFLAGS += -I$(TAO_ROOT) BiDirPolicyC.h BiDirPolicyC.i .obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.so .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.so: BiDir_PolicyFactory.cpp BiDir_PolicyFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - bidirgiop_export.h \ + $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -810,8 +810,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - BiDirGIOP.h \ + $(TAO_ROOT)/tao/LocalObject.i BiDirGIOP.h \ $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -838,8 +837,9 @@ CPPFLAGS += -I$(TAO_ROOT) BiDirPolicyC.h BiDirPolicyC.i BiDir_Policy_i.h BiDir_Policy_i.inl .obj/BiDir_Policy_i.o .obj/BiDir_Policy_i.so .shobj/BiDir_Policy_i.o .shobj/BiDir_Policy_i.so: BiDir_Policy_i.cpp BiDir_Policy_i.h \ - $(ACE_ROOT)/ace/pre.h \ - bidirgiop_export.h \ + $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -847,8 +847,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - BiDirGIOP.h \ + $(ACE_ROOT)/ace/OS_Errno.inl BiDirGIOP.h \ $(TAO_ROOT)/tao/BiDir_Adapter.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -963,8 +962,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - BiDirPolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.h \ + BiDirPolicyC.h $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -986,12 +984,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - BiDirPolicyC.i \ + $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - BiDir_Policy_i.inl \ - $(TAO_ROOT)/tao/Stub.h \ + BiDir_Policy_i.inl $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index 8a00d5030ef..ef00701fee2 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -50,8 +50,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h \ - domain_export.h \ + $(ACE_ROOT)/ace/pre.h domain_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -405,8 +406,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \ $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \ $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index df35ecc8f81..2bad7fd1e66 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -62,8 +62,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -186,8 +187,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -276,12 +276,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i DynAnyFactory.h + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ + DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -404,8 +406,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -494,22 +495,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i DynAny_i.h DynStruct_i.h \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ + DynAny_i.h DynStruct_i.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ DynSequence_i.h DynEnum_i.h DynArray_i.h DynUnion_i.h DynUnion_i_T.h \ - DynUnion_i_T.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + DynUnion_i_T.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -632,8 +634,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -722,12 +723,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i DynAnyFactory.h + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ + DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -850,8 +853,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -940,21 +942,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -976,8 +978,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i DynamicAny.h \ + dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1076,8 +1078,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1166,20 +1167,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1302,8 +1303,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1392,8 +1392,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1402,8 +1401,10 @@ CPPFLAGS += -I$(TAO_ROOT) DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1526,8 +1527,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1616,20 +1616,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1752,8 +1752,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1842,14 +1841,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i \ + DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1972,8 +1972,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2062,7 +2061,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - DynamicAnyC.i + $(TAO_ROOT)/tao/StringSeqC.i DynamicAnyC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index b5b0931a006..b1e90f8ba80 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -59,8 +59,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp Context.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicinterface_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicinterface_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -158,8 +159,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/corbafwd.i \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - Context.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp Context.inl \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -206,6 +206,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -485,11 +487,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -501,11 +499,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ $(TAO_ROOT)/tao/Messaging.h \ @@ -513,11 +516,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Asynch_Invocation.i \ Unknown_User_Exception.h dynamicinterface_export.h \ DII_Reply_Dispatcher.h Request.h Dynamic_Adapter_Impl.h \ - $(TAO_ROOT)/tao/Dynamic_Adapter.h \ - Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(TAO_ROOT)/tao/Dynamic_Adapter.h Context.h \ + Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - Request.inl DII_Invocation.inl \ + $(TAO_ROOT)/tao/NVList.i Request.inl \ + DII_Invocation.inl \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ @@ -525,10 +528,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Mux_Strategy.h .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp \ - DII_Reply_Dispatcher.h \ - $(ACE_ROOT)/ace/pre.h \ + DII_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -550,8 +554,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - dynamicinterface_export.h \ + $(ACE_ROOT)/ace/OS.i dynamicinterface_export.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -667,11 +670,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -702,11 +701,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/IOPC.h \ @@ -761,8 +765,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ Request.h Dynamic_Adapter_Impl.h \ - $(TAO_ROOT)/tao/Dynamic_Adapter.h \ - Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(TAO_ROOT)/tao/Dynamic_Adapter.h Context.h \ + Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -770,8 +774,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - Request.inl \ + $(TAO_ROOT)/tao/NVList.i Request.inl \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ @@ -817,11 +820,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i .obj/Dynamic_Adapter_Impl.o .obj/Dynamic_Adapter_Impl.so .shobj/Dynamic_Adapter_Impl.o .shobj/Dynamic_Adapter_Impl.so: Dynamic_Adapter_Impl.cpp \ - Dynamic_Adapter_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ + Dynamic_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Dynamic_Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -939,8 +943,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Request.h Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Request.h \ + Context.h Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ @@ -1002,8 +1006,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl Server_Request.h \ + $(TAO_ROOT)/tao/MessagingC.i Request.inl \ + Server_Request.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -1116,11 +1120,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i .obj/Dynamic_Implementation.o .obj/Dynamic_Implementation.so .shobj/Dynamic_Implementation.o .shobj/Dynamic_Implementation.so: Dynamic_Implementation.cpp \ - Dynamic_Implementation.h \ - $(ACE_ROOT)/ace/pre.h \ + Dynamic_Implementation.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1273,8 +1278,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Context.h Context.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Context.h \ + Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ @@ -1418,8 +1423,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i .obj/ExceptionList.o .obj/ExceptionList.so .shobj/ExceptionList.o .shobj/ExceptionList.so: ExceptionList.cpp ExceptionList.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicinterface_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicinterface_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1532,6 +1538,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1553,8 +1561,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Dynamic_Adapter_Impl.h \ + $(ACE_ROOT)/ace/OS.i Dynamic_Adapter_Impl.h \ $(TAO_ROOT)/tao/Dynamic_Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1651,8 +1658,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Context.h \ + Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ @@ -1714,8 +1721,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl DII_Invocation.h \ + $(TAO_ROOT)/tao/MessagingC.i Request.inl \ + DII_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ @@ -1820,11 +1827,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Asynch_Invocation.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Transport.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -1836,11 +1839,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Asynch_Timeout_Handler.h \ $(TAO_ROOT)/tao/Messaging.h \ @@ -1854,6 +1862,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1973,8 +1983,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Context.h Context.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Context.h \ + Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ @@ -2012,8 +2022,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ - Server_Request.inl \ - $(TAO_ROOT)/tao/NVList.h \ + Server_Request.inl $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ @@ -2035,9 +2044,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/Unknown_User_Exception.o .obj/Unknown_User_Exception.so .shobj/Unknown_User_Exception.o .shobj/Unknown_User_Exception.so: Unknown_User_Exception.cpp \ - Unknown_User_Exception.h \ - $(ACE_ROOT)/ace/pre.h \ + Unknown_User_Exception.h $(ACE_ROOT)/ace/pre.h \ dynamicinterface_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index 43c48e0fd01..9e1abc1218e 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/Makefile @@ -54,8 +54,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IFR_BaseC.o .obj/IFR_BaseC.so .shobj/IFR_BaseC.o .shobj/IFR_BaseC.so: IFR_BaseC.cpp IFR_BaseC.h \ - $(ACE_ROOT)/ace/pre.h \ - ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -338,16 +339,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + IFR_BaseC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i \ $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \ - $(ACE_ROOT)/ace/pre.h \ - IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h IFR_BaseC.h \ + ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -630,16 +633,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + IFR_BaseC.i IFR_BasicC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i \ $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \ - $(ACE_ROOT)/ace/pre.h \ - IFR_BasicC.h IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h IFR_BasicC.h IFR_BaseC.h \ + ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -922,16 +927,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \ $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.so .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.so: IFR_ComponentsC.cpp IFR_ComponentsC.h \ - $(ACE_ROOT)/ace/pre.h \ - ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h ifr_client_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -939,8 +945,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - IFR_ExtendedC.h IFR_BasicC.h IFR_BaseC.h \ + $(ACE_ROOT)/ace/OS_Errno.inl IFR_ExtendedC.h \ + IFR_BasicC.h IFR_BaseC.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1215,19 +1221,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ - IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \ $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \ - IFR_Client_Adapter_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ + IFR_Client_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1510,10 +1517,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 16a00b69fcb..586e4ed6dbb 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -56,8 +56,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -180,8 +181,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ @@ -217,8 +217,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/IORManip_Loader.o .obj/IORManip_Loader.so .shobj/IORManip_Loader.o .shobj/IORManip_Loader.so: IORManip_Loader.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -341,8 +342,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ @@ -369,6 +369,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -495,8 +497,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 19a4f53da30..74160a607e8 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -54,8 +54,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORTable.o .obj/IORTable.so .shobj/IORTable.o .shobj/IORTable.so: IORTable.cpp IORTable.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -150,8 +151,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -247,9 +247,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - IORTableC.i Table_Adapter.h \ - $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/StringSeqC.i IORTableC.i \ + Table_Adapter.h $(TAO_ROOT)/tao/Adapter.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -274,6 +273,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -467,8 +468,9 @@ CPPFLAGS += -I$(TAO_ROOT) iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -681,8 +683,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - IORTableC.i \ + $(TAO_ROOT)/tao/StringSeqC.i IORTableC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -741,7 +742,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ $(ACE_ROOT)/ace/pre.h IORTable.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -836,8 +838,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -933,8 +934,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - IORTableC.i \ + $(TAO_ROOT)/tao/StringSeqC.i IORTableC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index c64da7cb8e1..c11b19a25d3 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -93,8 +93,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -221,8 +222,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -289,8 +289,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -304,8 +304,9 @@ CPPFLAGS += -I$(TAO_ROOT) Object_Adapter.i .obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -431,8 +432,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -479,8 +480,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -521,17 +522,69 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i $(TAO_ROOT)/tao/ORB.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i .obj/RTPortableServerC.o .obj/RTPortableServerC.so .shobj/RTPortableServerC.o .shobj/RTPortableServerC.so: RTPortableServerC.cpp RTPortableServerC.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -657,8 +710,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -680,11 +732,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i -.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -719,9 +772,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -809,8 +861,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -857,8 +908,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -899,8 +950,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ImplRepoS.h ImplRepoC.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + ImplRepoS.h ImplRepoC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ @@ -999,9 +1050,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.so .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.so: Default_Acceptor_Filter.cpp \ - Default_Acceptor_Filter.h \ - $(ACE_ROOT)/ace/pre.h \ + Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \ portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1130,8 +1182,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.i .obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1139,8 +1192,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - Key_Adapters.h PortableServerC.h \ + $(ACE_ROOT)/ace/OS_Errno.inl Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1258,8 +1311,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1306,8 +1358,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1348,8 +1400,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Strategized_Object_Proxy_Broker.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + Strategized_Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1440,8 +1492,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timeprobe.h .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1615,8 +1668,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1742,8 +1797,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1790,12 +1844,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i .obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1921,11 +1976,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i poa_macros.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - POAManager.i POA.h Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i POAManager.i \ + POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1972,8 +2026,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2012,12 +2066,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i + $(ACE_ROOT)/ace/Containers_T.cpp POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h \ - Key_Adapters.h PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ + PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2143,8 +2198,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2191,19 +2245,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i Servant_Base.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ Servant_Base.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + Active_Object_Map.i $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2329,8 +2384,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ Servant_Base.i POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ @@ -2379,8 +2433,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2419,8 +2473,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Operation_Table.h Collocated_Object.h Collocated_Object.i \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2510,6 +2564,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2544,9 +2600,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2634,8 +2689,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2682,8 +2736,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2724,8 +2778,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ThruPOA_Object_Proxy_Impl.h \ + $(ACE_ROOT)/ace/Containers_T.cpp POA.i \ + ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2798,6 +2852,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Direct_Object_Proxy_Impl.o .obj/Direct_Object_Proxy_Impl.so .shobj/Direct_Object_Proxy_Impl.o .shobj/Direct_Object_Proxy_Impl.so: Direct_Object_Proxy_Impl.cpp \ Direct_Object_Proxy_Impl.h portableserver_export.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2893,8 +2949,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - Object_Adapter.h Key_Adapters.h PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i Object_Adapter.h \ + Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -2924,8 +2980,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2972,8 +3027,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -3009,6 +3064,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.so .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.so: Strategized_Object_Proxy_Broker.cpp \ Strategized_Object_Proxy_Broker.h portableserver_export.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3259,8 +3316,9 @@ CPPFLAGS += -I$(TAO_ROOT) Direct_Object_Proxy_Impl.h ThruPOA_Object_Proxy_Impl.h .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3359,8 +3417,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - Servant_Base.h PortableServerC.h \ + $(TAO_ROOT)/tao/Object.i Servant_Base.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -3387,8 +3445,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ Servant_Base.i Collocated_Object.i Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ @@ -3437,8 +3494,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -3467,8 +3524,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -3552,6 +3608,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3868,8 +3926,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServer.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServer.h \ + portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3996,8 +4056,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -4017,8 +4076,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i \ - $(TAO_ROOT)/tao/ORB.h \ + RTPortableServerC.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -4029,6 +4087,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4204,6 +4264,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4492,10 +4554,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RequestInfo_Util.h .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h \ - ImplRepoC.h \ + $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4821,6 +4884,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4842,8 +4907,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - MessagingS.h \ + $(ACE_ROOT)/ace/OS.i MessagingS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -5147,6 +5211,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5168,8 +5234,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - portableserver_export.h \ + $(ACE_ROOT)/ace/OS.i portableserver_export.h \ $(TAO_ROOT)/tao/Acceptor_Filter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile index 185cec3215a..7fd696dced4 100644 --- a/TAO/tao/SmartProxies/Makefile +++ b/TAO/tao/SmartProxies/Makefile @@ -50,8 +50,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Smart_Proxies.o .obj/Smart_Proxies.so .shobj/Smart_Proxies.o .shobj/Smart_Proxies.so: Smart_Proxies.cpp Smart_Proxies.h \ - $(ACE_ROOT)/ace/pre.h \ - smartproxies_export.h \ + $(ACE_ROOT)/ace/pre.h smartproxies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 7c55188003e..5425422f7cd 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -86,6 +86,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -204,8 +206,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - UIOP_Acceptor.h \ - $(TAO_ROOT)/tao/Pluggable.h \ + UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -328,6 +329,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ UIOP_Transport.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -410,8 +412,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Registry.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ + UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -422,8 +423,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.cpp .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - strategies_export.h \ + $(ACE_ROOT)/ace/pre.h strategies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -544,8 +546,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - UIOP_Acceptor.h \ - $(TAO_ROOT)/tao/Pluggable.h \ + UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -668,6 +669,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ UIOP_Transport.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -750,8 +752,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Registry.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ + UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -770,6 +771,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -946,11 +949,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -981,11 +980,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ @@ -1022,8 +1026,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -1031,8 +1034,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Wait_Strategy.h \ $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \ - UIOP_Profile.i \ - $(TAO_ROOT)/tao/ORB.h \ + UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -1094,14 +1096,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/debug.h \ - uiop_endpoints.h uiop_endpoints.i + $(TAO_ROOT)/tao/debug.h uiop_endpoints.h \ + uiop_endpoints.i .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1237,11 +1241,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -1272,11 +1272,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ strategies_export.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ @@ -1314,8 +1319,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i UIOP_Connection_Handler.h \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ + UIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -1456,8 +1461,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.h \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.inl \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/GIOP_Message_Base.i \ @@ -1469,6 +1474,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1712,13 +1719,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ strategies_export.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - UIOP_Transport.i \ - $(ACE_ROOT)/ace/Acceptor.h \ + UIOP_Transport.i $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ @@ -1730,8 +1737,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.h \ $(TAO_ROOT)/tao/Connector_Impl.inl \ $(TAO_ROOT)/tao/Connector_Impl.cpp \ - UIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -1815,6 +1821,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2054,6 +2062,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ strategies_export.h UIOP_Transport.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -2137,8 +2146,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Registry.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -2152,12 +2160,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \ - UIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ + UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \ UIOP_Transport.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2293,11 +2302,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -2328,11 +2333,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ strategies_export.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ @@ -2370,15 +2380,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ $(TAO_ROOT)/tao/Wait_Strategy.inl \ - UIOP_Connection_Handler.inl \ + UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ @@ -2476,7 +2485,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Messaging_Policy_i.h \ $(TAO_ROOT)/tao/Messaging_Policy_i.i \ - UIOP_Endpoint.h UIOP_Endpoint.i \ $(TAO_ROOT)/tao/Base_Transport_Property.h \ $(TAO_ROOT)/tao/Base_Transport_Property.inl \ $(TAO_ROOT)/tao/GIOP_Message_Lite.h \ @@ -2495,6 +2503,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2589,12 +2599,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Endpoint.i \ - strategies_export.h \ - $(ACE_ROOT)/ace/UNIX_Addr.h \ + strategies_export.h $(ACE_ROOT)/ace/UNIX_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/UNIX_Addr.i \ - UIOP_Endpoint.i UIOP_Connection_Handler.h UIOP_Transport.h \ + $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \ + UIOP_Connection_Handler.h UIOP_Transport.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -2636,11 +2645,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -2671,11 +2676,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Transport.inl \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ @@ -2708,8 +2718,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -2722,6 +2731,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2952,10 +2963,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - SHMIOP_Transport.h \ - $(ACE_ROOT)/ace/MEM_Stream.h \ + SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \ $(ACE_ROOT)/ace/MEM_IO.h \ $(ACE_ROOT)/ace/MEM_SAP.h \ $(ACE_ROOT)/ace/PI_Malloc.h \ @@ -2970,8 +2981,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \ @@ -3074,6 +3085,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3225,9 +3238,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -3346,6 +3358,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3559,6 +3573,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ SHMIOP_Transport.i SHMIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ @@ -3607,16 +3622,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h \ - $(TAO_ROOT)/tao/ORB.h \ + SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ @@ -3708,14 +3722,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.h \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.inl \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ $(TAO_ROOT)/tao/GIOP_Message_Base.i .obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.so .shobj/SHMIOP_Connector.o .shobj/SHMIOP_Connector.so: SHMIOP_Connector.cpp SHMIOP_Connector.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3975,6 +3991,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ SHMIOP_Transport.h strategies_export.h SHMIOP_Transport.i \ @@ -3984,8 +4001,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.h \ $(TAO_ROOT)/tao/Connector_Impl.inl \ $(TAO_ROOT)/tao/Connector_Impl.cpp \ - SHMIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + SHMIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -4001,15 +4017,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h \ - $(TAO_ROOT)/tao/ORB.h \ + SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/ORB.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Base_Transport_Property.h \ $(TAO_ROOT)/tao/Base_Transport_Property.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -4070,6 +4084,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4297,6 +4313,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ SHMIOP_Transport.h strategies_export.h \ @@ -4315,8 +4332,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \ @@ -4423,6 +4440,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4624,6 +4643,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ SHMIOP_Transport.h strategies_export.h \ @@ -4642,8 +4662,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/debug.h \ @@ -4755,10 +4775,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.h \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Handler.inl \ + $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/GIOP_Message_Base.i \ @@ -4767,16 +4787,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Base_Transport_Property.h \ $(TAO_ROOT)/tao/Base_Transport_Property.inl \ - SHMIOP_Endpoint.h \ - $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i + SHMIOP_Endpoint.h $(ACE_ROOT)/ace/MEM_Addr.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i .obj/SHMIOP_Endpoint.o .obj/SHMIOP_Endpoint.so .shobj/SHMIOP_Endpoint.o .shobj/SHMIOP_Endpoint.so: SHMIOP_Endpoint.cpp SHMIOP_Endpoint.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4871,8 +4891,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Endpoint.i \ - strategies_export.h \ - $(TAO_ROOT)/tao/ORB.h \ + strategies_export.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -4910,8 +4929,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Connection_Handler.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ @@ -5012,10 +5031,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - SHMIOP_Transport.h \ - $(ACE_ROOT)/ace/MEM_Stream.h \ + SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \ $(ACE_ROOT)/ace/MEM_IO.h \ $(ACE_ROOT)/ace/MEM_SAP.h \ $(ACE_ROOT)/ace/PI_Malloc.h \ @@ -5028,15 +5047,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/debug.h .obj/TAO_Strategies_Internal.o .obj/TAO_Strategies_Internal.so .shobj/TAO_Strategies_Internal.o .shobj/TAO_Strategies_Internal.so: TAO_Strategies_Internal.cpp \ - TAO_Strategies_Internal.h \ - $(ACE_ROOT)/ace/pre.h \ + TAO_Strategies_Internal.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5298,6 +5318,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5416,12 +5438,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - uiop_endpoints.i + $(TAO_ROOT)/tao/Any.i uiop_endpoints.i .obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \ - $(ACE_ROOT)/ace/pre.h \ - strategies_export.h \ + $(ACE_ROOT)/ace/pre.h strategies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5732,11 +5754,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/TP_Reactor.i .obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.so .shobj/Reactor_Per_Priority.o .shobj/Reactor_Per_Priority.so: Reactor_Per_Priority.cpp \ - Reactor_Per_Priority.h \ - $(ACE_ROOT)/ace/pre.h \ + Reactor_Per_Priority.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Reactor_Registry.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5993,6 +6016,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6014,8 +6039,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Linear_Priority_Mapping.h \ + $(ACE_ROOT)/ace/OS.i Linear_Priority_Mapping.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -6148,6 +6172,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6169,8 +6195,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Direct_Priority_Mapping.h \ + $(ACE_ROOT)/ace/OS.i Direct_Priority_Mapping.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/corbafwd.h \ diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile index bfd1598b3eb..09d5e29fbcb 100644 --- a/TAO/tao/TypeCodeFactory/Makefile +++ b/TAO/tao/TypeCodeFactory/Makefile @@ -59,8 +59,9 @@ realclean: clean .obj/TypeCodeFactoryC.o .obj/TypeCodeFactoryC.so .shobj/TypeCodeFactoryC.o .shobj/TypeCodeFactoryC.so: TypeCodeFactoryC.cpp TypeCodeFactory_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - typecodefactory_export.h \ + $(ACE_ROOT)/ace/pre.h typecodefactory_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -184,8 +185,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - TypeCodeFactoryC.h \ - $(TAO_ROOT)/tao/Object.h \ + TypeCodeFactoryC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -198,22 +198,13 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/DynamicC.i + $(TAO_ROOT)/tao/Environment.i .obj/TypeCodeFactory_i.o .obj/TypeCodeFactory_i.so .shobj/TypeCodeFactory_i.o .shobj/TypeCodeFactory_i.so: TypeCodeFactory_i.cpp TypeCodeFactory_i.h \ - $(ACE_ROOT)/ace/pre.h \ - TypeCodeFactory_Loader.h typecodefactory_export.h \ + $(ACE_ROOT)/ace/pre.h TypeCodeFactory_Loader.h \ + typecodefactory_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -337,8 +328,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - TypeCodeFactoryC.h \ - $(TAO_ROOT)/tao/Object.h \ + TypeCodeFactoryC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -503,10 +493,6 @@ realclean: clean $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \ $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -523,6 +509,8 @@ realclean: clean $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -645,8 +633,7 @@ realclean: clean TypeCodeFactory_i.h TypeCodeFactory_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.i \ - TypeCodeFactoryC.h \ - $(TAO_ROOT)/tao/Object.h \ + TypeCodeFactoryC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -775,9 +762,10 @@ realclean: clean $(TAO_ROOT)/tao/ORB_Core.i .obj/TypeCodeFactory_Loader.o .obj/TypeCodeFactory_Loader.so .shobj/TypeCodeFactory_Loader.o .shobj/TypeCodeFactory_Loader.so: TypeCodeFactory_Loader.cpp \ - TypeCodeFactory_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ + TypeCodeFactory_Loader.h $(ACE_ROOT)/ace/pre.h \ typecodefactory_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -901,8 +889,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - TypeCodeFactoryC.h \ - $(TAO_ROOT)/tao/Object.h \ + TypeCodeFactoryC.h $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ |