diff options
Diffstat (limited to 'TAO/utils')
-rw-r--r-- | TAO/utils/IOR-parser/Makefile | 11 | ||||
-rw-r--r-- | TAO/utils/catior/Makefile | 17 | ||||
-rw-r--r-- | TAO/utils/nslist/Makefile | 94 |
3 files changed, 80 insertions, 42 deletions
diff --git a/TAO/utils/IOR-parser/Makefile b/TAO/utils/IOR-parser/Makefile index 821995012ac..cacd44988e2 100644 --- a/TAO/utils/IOR-parser/Makefile +++ b/TAO/utils/IOR-parser/Makefile @@ -44,13 +44,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/ior-handler.o .obj/ior-handler.so .shobj/ior-handler.o .shobj/ior-handler.so: ior-handler.cpp ior-handler.h \ +.obj/ior-handler.o .obj/ior-handler.o .obj/ior-handler.o .obj/ior-handler.o: ior-handler.cpp ior-handler.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile index 4a83ef135c7..11206836e45 100644 --- a/TAO/utils/catior/Makefile +++ b/TAO/utils/catior/Makefile @@ -43,7 +43,7 @@ include $(TAO_ROOT)/taoconfig.mk # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/catior.o .obj/catior.so .shobj/catior.o .shobj/catior.so: catior.cpp \ +.obj/catior.o .obj/catior.o .obj/catior.o .obj/catior.o: catior.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -52,6 +52,15 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -124,6 +133,7 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -178,6 +188,7 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.i \ @@ -256,8 +267,8 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Object_Adapter.i \ $(TAO_ROOT)/tao/POAManager.h \ $(TAO_ROOT)/tao/POAManager.i \ - $(TAO_ROOT)/tao/rtcorbafwd.h \ - $(TAO_ROOT)/tao/rtcorbafwd.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile index 096d40b662f..eb455723928 100644 --- a/TAO/utils/nslist/Makefile +++ b/TAO/utils/nslist/Makefile @@ -53,7 +53,7 @@ include $(TAO_ROOT)/taoconfig.mk # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/nslist.o .obj/nslist.so .shobj/nslist.o .shobj/nslist.so: nslist.cpp \ +.obj/nslist.o .obj/nslist.o .obj/nslist.o .obj/nslist.o: nslist.cpp \ $(TAO_ROOT)/tao/TAO.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -72,19 +72,21 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -209,8 +211,6 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -220,9 +220,16 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Context.h \ $(TAO_ROOT)/tao/Context.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/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ @@ -231,6 +238,8 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -259,6 +268,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ $(TAO_ROOT)/tao/Active_Object_Map.i \ @@ -332,15 +344,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/InterfaceC.h \ - $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/MessagingS.h \ @@ -356,7 +362,7 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i -.obj/nsadd.o .obj/nsadd.so .shobj/nsadd.o .shobj/nsadd.so: nsadd.cpp \ +.obj/nsadd.o .obj/nsadd.o .obj/nsadd.o .obj/nsadd.o: nsadd.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ @@ -372,12 +378,18 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -385,10 +397,6 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -511,8 +519,6 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Interceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -522,9 +528,16 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Context.h \ $(TAO_ROOT)/tao/Context.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/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ @@ -533,6 +546,8 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -561,6 +576,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ $(TAO_ROOT)/tao/Active_Object_Map.i \ @@ -634,15 +652,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/InterfaceC.h \ - $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/MessagingS.h \ @@ -658,7 +670,7 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i -.obj/nsdel.o .obj/nsdel.so .shobj/nsdel.o .shobj/nsdel.so: nsdel.cpp \ +.obj/nsdel.o .obj/nsdel.o .obj/nsdel.o .obj/nsdel.o: nsdel.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ @@ -674,12 +686,18 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -687,10 +705,6 @@ include $(TAO_ROOT)/taoconfig.mk $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ @@ -813,8 +827,6 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Interceptor.i \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -824,9 +836,16 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Context.h \ $(TAO_ROOT)/tao/Context.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/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/Smart_Proxies.h \ + $(TAO_ROOT)/tao/Smart_Proxies.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/Server_Request.h \ @@ -835,6 +854,8 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/Object_Adapter.h \ $(TAO_ROOT)/tao/Key_Adapters.h \ @@ -863,6 +884,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/DynAnyC.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/InterfaceC.h \ + $(TAO_ROOT)/tao/ifrfwd.h \ + $(TAO_ROOT)/tao/InterfaceC.i \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Active_Object_Map.h \ $(TAO_ROOT)/tao/Active_Object_Map.i \ @@ -936,15 +960,9 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \ $(TAO_ROOT)/tao/DynAny_i.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/InterfaceC.h \ - $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/MessagingS.h \ |