diff options
| author | cleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-15 22:01:49 +0000 |
|---|---|---|
| committer | cleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-15 22:01:49 +0000 |
| commit | 0de5d7daa2e83c0b9df51bc6bbd75fbb4790d825 (patch) | |
| tree | 58eac8445cf61d730624fbb6c008482a7b99523f | |
| parent | 30c80aad35cabfcb0b88f63a10fdfdbe9885476c (diff) | |
| download | ATCD-0de5d7daa2e83c0b9df51bc6bbd75fbb4790d825.tar.gz | |
The Big Change that made TAO not have to be installed in a proto
directory.
67 files changed, 1950 insertions, 498 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 8d43508c4f2..4506854a613 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,53 @@ +Tue Jul 15 16:13:53 1997 Chris Cleeland <cleeland@cs.wustl.edu> + + * tests/Cubit/TAO/cubitC.cpp: Added missing calls to Release() + after QueryInterface() calls. The tip-off that this wasn't + happening was the fact that, upon client exit, there were upwards + of 15 references to the object references. Now it's only 5-7 + (more work to go). + + * tests/Cubit/TAO/*: Changed all #include paths to be "tao/...". + Also, changes to orb.h (see below) obviated additional header + inclusion in certain files. + + * tao/compat/*.h: Changed the guts of these files so that they + work more like their "real" counterparts in the VC++ 5.0. This + should encourage compatibility. Note that, unlike the previous + files, objbase.h MUST be included before initguid.h; this is + consistent with the model on WIN32. + + * tao/*.{h,cpp}: Changed all #include paths to be "tao/...". + Also, changes to orb.h (see below) obviated additional header + inclusion in certain files. + + * tao/giop.cpp: Removed get_request() crufty old code. + + * tao/iiopobj.cpp: Backed out many prior special-code additions + for defining IIDs. Hopefully the need for these is negated by + changes elsewhere in the "compat" files. + + * tao/object.cpp: Corrected the conditional compilation switch + used to determine if we define IID_IUnknown. This now happens + whenever WIN32 isn't defined, instead of before when it was only + on unix or vxworks platforms. + + * tao/Makefile: Eliminated the need to copy files into a "proto/" + directory; now, everything is built into and used from the "tao" + directory. + + There is also a new, optional, environment + variable--TAO_ROOT--which should be set to the ".../TAO" + directory. If it's not set, the Makefile will set it to + $WRAPPER_ROOT/TAO. + + Lastly, libcorba.* has changed to libTAO.*. + + * tao/orb.h: Eliminated many header files which had been + explicitly included here and were causing all manner of problems + with circular includes. Library components must now be careful to + include appropriate headers for all components they use, and we + will likely have to create a corba.h file for clients to use. + Fri Jul 11 12:12:40 1997 Darrell Brunsch <brunsch@cs.wustl.edu> * tao/TAO.dsp: changed to use ace-r.dll in the release diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 906cd1acbe5..433cd237d9f 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------------- MAKEFILE = Makefile -LIBNAME = libcorba +LIBNAME = libTAO LIB = $(LIBNAME).a SHLIB = $(LIBNAME).so @@ -41,7 +41,11 @@ OTHERS_SRCS = \ FILES = $(OTHERS_SRCS) $(CORBA_SRCS) -COMPATDIR = ./compat +ifndef TAO_ROOT +TAO_ROOT = $(WRAPPER_ROOT)/TAO +endif + +COMPATDIR = $(TAO_ROOT)/tao/compat COMPATFILES = objbase.h initguid.h BIN = # t-xdr t-sizes @@ -78,7 +82,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- #RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS)) -CPPFLAGS += -D__IIOP_BUILD -I$(COMPATDIR) -DDEBUG +#CPPFLAGS += -D__IIOP_BUILD -I$(COMPATDIR) -DDEBUG +CPPFLAGS += -I$(TAO_ROOT) -I$(COMPATDIR) LDFLAGS += $(RLDFLAGS) INSINC = ../proto/include @@ -91,8 +96,7 @@ INSTALL = $(INSLIB)/libcorba.so \ $(addprefix $(INSINC)/corba/, $(addsuffix .h,$(CORBA_SRCS) $(CORBA_HDRS) debug)) \ -#INST = install -c -INST = /pkg/gnu/bin/install -c +INST = install -c INSTALL_BY_COPY = $(INST) $^ $@ $(INSINC)/%: % @@ -114,8 +118,7 @@ copy: $(INSTALL) # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/giop.o .shobj/giop.so: giop.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ +.obj/giop.o .shobj/giop.so: giop.cpp $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ @@ -137,8 +140,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/SOCK_IO.i \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i orb.h \ - orbconf.h corbacom.h except.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -150,12 +160,13 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h orbobj.h factories.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -172,6 +183,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -181,7 +193,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -191,10 +205,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -202,6 +221,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -210,29 +230,150 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i orbobj.i giop.h stub.h iiopobj.h iiopobj.i -.obj/iiopobj.o .shobj/iiopobj.so: iiopobj.cpp iiopobj.h iiopobj.i -.obj/iioporb.o .shobj/iioporb.so: iioporb.cpp iioporb.h orbobj.h factories.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.h \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/iiopobj.o .shobj/iiopobj.so: iiopobj.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i +.obj/iioporb.o .shobj/iioporb.so: iioporb.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/iioporb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.h \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ @@ -261,6 +402,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -270,7 +412,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -280,10 +424,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -291,6 +440,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -299,28 +449,55 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i orbobj.i iioporb.i iiopobj.h iiopobj.i -.obj/invoke.o .shobj/invoke.so: invoke.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.i \ + $(WRAPPER_ROOT)/TAO/tao/iioporb.i \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i +.obj/invoke.o .shobj/invoke.so: invoke.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -332,7 +509,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -344,12 +526,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h giop.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -362,7 +555,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -379,6 +575,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -388,7 +585,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -398,10 +597,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -409,6 +613,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -417,28 +622,53 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/roa.o .shobj/roa.so: roa.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/roa.o .shobj/roa.so: roa.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -450,7 +680,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -462,16 +697,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h roa.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/roa.h \ $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/Addr.h \ $(WRAPPER_ROOT)/ace/Addr.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.i boa.h \ + $(WRAPPER_ROOT)/ace/INET_Addr.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -480,11 +714,37 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/SOCK.i \ $(WRAPPER_ROOT)/ace/SOCK_IO.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - objtable.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ - $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.h params.i connect.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.i \ + $(WRAPPER_ROOT)/ace/Service_Object.i \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ @@ -493,33 +753,27 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Containers.h \ - $(WRAPPER_ROOT)/ace/Containers.i \ - $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.i \ - $(WRAPPER_ROOT)/ace/Service_Object.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.i \ - $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -527,6 +781,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -536,31 +791,59 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ + $(WRAPPER_ROOT)/ace/SString.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ + $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Acceptor.i \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ - connect.i roa.i giop.h stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/roa.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ $(WRAPPER_ROOT)/ace/SOCK_Connector.i \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Connector.i \ - factories.i orbobj.h orbobj.i -.obj/params.o .shobj/params.so: params.cpp params.h boa.h \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ - $(WRAPPER_ROOT)/ace/SOCK_IO.h \ - $(WRAPPER_ROOT)/ace/SOCK.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.h \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/params.o .shobj/params.so: params.cpp $(WRAPPER_ROOT)/TAO/tao/params.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -568,19 +851,17 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Addr.h \ - $(WRAPPER_ROOT)/ace/Addr.i \ - $(WRAPPER_ROOT)/ace/IPC_SAP.h \ - $(WRAPPER_ROOT)/ace/IPC_SAP.i \ - $(WRAPPER_ROOT)/ace/SOCK.i \ - $(WRAPPER_ROOT)/ace/SOCK_IO.i \ - $(WRAPPER_ROOT)/ace/INET_Addr.h \ - $(WRAPPER_ROOT)/ace/INET_Addr.i \ - $(WRAPPER_ROOT)/ace/SOCK_Stream.i orb.h \ - orbconf.h corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -592,16 +873,53 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.i \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/INET_Addr.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h objtable.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ - $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.i \ + $(WRAPPER_ROOT)/ace/Service_Object.i \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ @@ -610,33 +928,27 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ - $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Containers.h \ - $(WRAPPER_ROOT)/ace/Containers.i \ - $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ $(WRAPPER_ROOT)/ace/Pipe.i \ $(WRAPPER_ROOT)/ace/Reactor.i \ - $(WRAPPER_ROOT)/ace/Acceptor.h \ - $(WRAPPER_ROOT)/ace/Service_Config.h \ - $(WRAPPER_ROOT)/ace/Service_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.h \ - $(WRAPPER_ROOT)/ace/Shared_Object.i \ - $(WRAPPER_ROOT)/ace/Service_Object.i \ - $(WRAPPER_ROOT)/ace/Thread_Manager.h \ - $(WRAPPER_ROOT)/ace/Thread_Manager.i \ - $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Proactor.h \ $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -644,6 +956,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -653,20 +966,40 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ + $(WRAPPER_ROOT)/ace/SString.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ + $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Acceptor.i \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ - connect.i -.obj/factories.o .shobj/factories.so: factories.cpp factories.h \ + $(WRAPPER_ROOT)/TAO/tao/connect.i +.obj/factories.o .shobj/factories.so: factories.cpp \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ @@ -714,10 +1047,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Synch.i \ $(WRAPPER_ROOT)/ace/Synch_T.h \ $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -727,7 +1062,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -737,10 +1074,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -748,6 +1090,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -756,33 +1099,73 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h orb.h orbconf.h corbacom.h except.h sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h objtable.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/objtable.o .shobj/objtable.so: objtable.cpp objtable.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i +.obj/objtable.o .shobj/objtable.so: objtable.cpp \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ @@ -806,16 +1189,96 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.i \ + $(WRAPPER_ROOT)/ace/Service_Object.i \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Service_Config.i \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/Free_List.h \ + $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ + $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Token.i \ + $(WRAPPER_ROOT)/ace/Pipe.h \ + $(WRAPPER_ROOT)/ace/Pipe.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.i \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/INET_Addr.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/Reactor.i \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Asynch_IO.h \ + $(WRAPPER_ROOT)/ace/Timer_List.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Heap.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.i \ + $(WRAPPER_ROOT)/ace/Memory_Pool.i \ + $(WRAPPER_ROOT)/ace/Message_Block.i \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Strategies.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ + $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ + $(WRAPPER_ROOT)/ace/ReactorEx.i \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i orb.h \ - orbconf.h corbacom.h except.h sequence.h principa.h typecode.h any.h \ - any.i typecode.i nvlist.h request.h object.h object.i svrrqst.h cdr.h \ - align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/connect.o .shobj/connect.so: connect.cpp connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/TAO/tao/object.i +.obj/connect.o .shobj/connect.so: connect.cpp $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Reactor.h \ $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/ACE.h \ @@ -843,14 +1306,18 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -882,10 +1349,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -893,6 +1365,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -903,7 +1376,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ @@ -911,21 +1387,95 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Acceptor.i \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ - connect.i roa.h boa.h orb.h orbconf.h corbacom.h except.h sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/roa.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h objtable.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.h params.i roa.i -.obj/xdr.o .shobj/xdr.so: xdr.cpp xdr.h -.obj/cdr.o .shobj/cdr.so: cdr.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/roa.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/xdr.o .shobj/xdr.so: xdr.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/xdr.h \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i +.obj/cdr.o .shobj/cdr.so: cdr.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -937,7 +1487,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -949,14 +1504,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/debug.o .shobj/debug.so: debug.cpp -.obj/interp.o .shobj/interp.so: interp.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i +.obj/debug.o .shobj/debug.so: debug.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -968,7 +1532,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -980,13 +1549,56 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/interp.o .shobj/interp.so: interp.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/marshal.o .shobj/marshal.so: marshal.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i +.obj/marshal.o .shobj/marshal.so: marshal.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -998,7 +1610,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1010,13 +1627,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/encode.o .shobj/encode.so: encode.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i +.obj/encode.o .shobj/encode.so: encode.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1028,7 +1655,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1040,12 +1672,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h giop.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -1058,7 +1701,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -1075,6 +1721,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1084,7 +1731,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1094,10 +1743,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1105,6 +1759,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1113,28 +1768,52 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/decode.o .shobj/decode.so: decode.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/decode.o .shobj/decode.so: decode.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1146,7 +1825,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1158,12 +1842,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h giop.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -1176,7 +1871,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -1193,6 +1891,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1202,7 +1901,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1212,10 +1913,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1223,6 +1929,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1231,28 +1938,52 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/deep_copy.o .shobj/deep_copy.so: deep_copy.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/deep_copy.o .shobj/deep_copy.so: deep_copy.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1264,7 +1995,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1276,12 +2012,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h giop.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -1294,7 +2041,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -1311,6 +2061,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1320,7 +2071,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1330,10 +2083,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1341,6 +2099,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1349,28 +2108,52 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/deep_free.o .shobj/deep_free.so: deep_free.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/deep_free.o .shobj/deep_free.so: deep_free.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1382,7 +2165,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1394,12 +2182,23 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h giop.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/giop.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -1412,7 +2211,10 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - stub.h iiopobj.h iiopobj.i factories.h \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.h \ + $(WRAPPER_ROOT)/TAO/tao/iiopobj.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ @@ -1429,6 +2231,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1438,7 +2241,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1448,10 +2253,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1459,6 +2269,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1467,29 +2278,52 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i -.obj/tc_const.o .shobj/tc_const.so: tc_const.cpp -.obj/any.o .shobj/any.so: any.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/tc_const.o .shobj/tc_const.so: tc_const.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1501,7 +2335,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1513,26 +2352,60 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/corbacom.o .shobj/corbacom.so: corbacom.cpp -.obj/except.o .shobj/except.so: except.cpp \ - $(WRAPPER_ROOT)/ace/Log_Msg.h \ - $(WRAPPER_ROOT)/ace/Log_Record.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i +.obj/any.o .shobj/any.so: any.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/Log_Record.i -.obj/nvlist.o .shobj/nvlist.so: nvlist.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/corbacom.o .shobj/corbacom.so: corbacom.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1544,7 +2417,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1556,13 +2434,90 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i +.obj/except.o .shobj/except.so: except.cpp $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/object.o .shobj/object.so: object.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i +.obj/nvlist.o .shobj/nvlist.so: nvlist.cpp $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h +.obj/object.o .shobj/object.so: object.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1574,7 +2529,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1586,16 +2546,99 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h optable.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/optable.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.i \ + $(WRAPPER_ROOT)/ace/Service_Object.i \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Service_Config.i \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/Free_List.h \ + $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ + $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Token.i \ + $(WRAPPER_ROOT)/ace/Pipe.h \ + $(WRAPPER_ROOT)/ace/Pipe.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.i \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/INET_Addr.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/Reactor.i \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Asynch_IO.h \ + $(WRAPPER_ROOT)/ace/Timer_List.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Heap.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.i \ + $(WRAPPER_ROOT)/ace/Memory_Pool.i \ + $(WRAPPER_ROOT)/ace/Message_Block.i \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Strategies.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ + $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ + $(WRAPPER_ROOT)/ace/ReactorEx.i \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i stub.h -.obj/orbobj.o .shobj/orbobj.so: orbobj.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i +.obj/orbobj.o .shobj/orbobj.so: orbobj.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1607,7 +2650,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1619,13 +2667,16 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/iioporb.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h stub.h iioporb.h orbobj.h \ - factories.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.h \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ @@ -1654,6 +2705,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1663,7 +2715,9 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1673,10 +2727,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1684,6 +2743,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1692,29 +2752,66 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h boa.h objtable.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - params.i connect.h \ + $(WRAPPER_ROOT)/ace/SString.i \ + $(WRAPPER_ROOT)/TAO/tao/boa.i \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i orbobj.i iioporb.i roa.h roa.i -.obj/principa.o .shobj/principa.so: principa.cpp -.obj/request.o .shobj/request.so: request.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i \ + $(WRAPPER_ROOT)/TAO/tao/orbobj.i \ + $(WRAPPER_ROOT)/TAO/tao/iioporb.i \ + $(WRAPPER_ROOT)/TAO/tao/roa.h \ + $(WRAPPER_ROOT)/TAO/tao/roa.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h +.obj/principa.o .shobj/principa.so: principa.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1726,7 +2823,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1738,13 +2840,11 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ - $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h stub.h -.obj/svrrqst.o .shobj/svrrqst.so: svrrqst.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h +.obj/request.o .shobj/request.so: request.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1756,7 +2856,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1768,13 +2873,25 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/stub.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/boa.o .shobj/boa.so: boa.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h +.obj/svrrqst.o .shobj/svrrqst.so: svrrqst.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1786,7 +2903,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1798,12 +2920,54 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h boa.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/nvlist.h \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/boa.o .shobj/boa.so: boa.cpp orb.h $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h corbacom.h object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp object.i boa.h \ $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ $(WRAPPER_ROOT)/ace/SOCK_IO.h \ $(WRAPPER_ROOT)/ace/SOCK.h \ @@ -1816,17 +2980,26 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/INET_Addr.h \ $(WRAPPER_ROOT)/ace/INET_Addr.i \ $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ - objtable.h \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.h \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ + $(WRAPPER_ROOT)/ace/Singleton.h \ + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/svrrqst.i \ + $(WRAPPER_ROOT)/TAO/tao/objtable.h \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ - $(WRAPPER_ROOT)/ace/SString.h \ - $(WRAPPER_ROOT)/ace/SString.i boa.i \ - iioporb.h orbobj.h factories.h \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ - $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ - $(WRAPPER_ROOT)/ace/SOCK_Connector.i \ - $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ @@ -1837,6 +3010,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Signal.h \ $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1844,9 +3018,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Free_List.h \ $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ $(WRAPPER_ROOT)/ace/Pipe.h \ @@ -1856,10 +3033,15 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Asynch_IO.h \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/Message_Queue.h \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -1867,6 +3049,7 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Malloc.i \ $(WRAPPER_ROOT)/ace/Malloc_T.h \ $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1874,25 +3057,53 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Message_Block.i \ $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ - $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/SString.h \ + $(WRAPPER_ROOT)/ace/SString.i boa.i iioporb.h orbobj.h \ + $(WRAPPER_ROOT)/TAO/tao/factories.h \ + $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ + $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.h \ + $(WRAPPER_ROOT)/ace/SOCK_Connector.i \ $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ + $(WRAPPER_ROOT)/ace/Map_Manager.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.h \ $(WRAPPER_ROOT)/ace/Task.h \ $(WRAPPER_ROOT)/ace/Task.i \ $(WRAPPER_ROOT)/ace/Task_T.h \ $(WRAPPER_ROOT)/ace/Task_T.i \ + $(WRAPPER_ROOT)/ace/Task_T.cpp \ + $(WRAPPER_ROOT)/ace/Module.h \ + $(WRAPPER_ROOT)/ace/Module.i \ + $(WRAPPER_ROOT)/ace/Module.cpp \ + $(WRAPPER_ROOT)/ace/Stream_Modules.h \ + $(WRAPPER_ROOT)/ace/Stream_Modules.i \ + $(WRAPPER_ROOT)/ace/Stream_Modules.cpp \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ + $(WRAPPER_ROOT)/ace/Svc_Handler.cpp \ + $(WRAPPER_ROOT)/ace/Dynamic.h \ + $(WRAPPER_ROOT)/ace/Dynamic.i \ $(WRAPPER_ROOT)/ace/Connector.i \ - params.h params.i connect.h \ + $(WRAPPER_ROOT)/ace/Connector.cpp \ + $(WRAPPER_ROOT)/TAO/tao/params.h \ + $(WRAPPER_ROOT)/TAO/tao/boa.h \ + $(WRAPPER_ROOT)/TAO/tao/params.i \ + $(WRAPPER_ROOT)/TAO/tao/connect.h \ $(WRAPPER_ROOT)/ace/Acceptor.h \ $(WRAPPER_ROOT)/ace/Acceptor.i \ - connect.i factories.i orbobj.i iioporb.i roa.h roa.i -.obj/typecode.o .shobj/typecode.so: typecode.cpp orb.h orbconf.h \ + $(WRAPPER_ROOT)/ace/Acceptor.cpp \ + $(WRAPPER_ROOT)/TAO/tao/connect.i \ + $(WRAPPER_ROOT)/TAO/tao/factories.i orbobj.i iioporb.i \ + roa.h roa.i +.obj/typecode.o .shobj/typecode.so: typecode.cpp $(WRAPPER_ROOT)/TAO/tao/orb.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -1904,7 +3115,12 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - corbacom.h except.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1916,13 +3132,24 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ - $(WRAPPER_ROOT)/ace/Thread.i sequence.h \ - principa.h typecode.h any.h any.i typecode.i nvlist.h request.h \ - object.h object.i svrrqst.h cdr.h align.h marshal.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ + $(WRAPPER_ROOT)/TAO/tao/object.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.h \ + $(WRAPPER_ROOT)/TAO/tao/align.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.h \ $(WRAPPER_ROOT)/ace/Singleton.h \ $(WRAPPER_ROOT)/ace/Singleton.i \ - marshal.i cdr.i svrrqst.i debug.h -.obj/optable.o .shobj/optable.so: optable.cpp optable.h \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/typecode.h \ + $(WRAPPER_ROOT)/TAO/tao/any.h \ + $(WRAPPER_ROOT)/TAO/tao/any.i \ + $(WRAPPER_ROOT)/TAO/tao/typecode.i \ + $(WRAPPER_ROOT)/TAO/tao/principa.h \ + $(WRAPPER_ROOT)/TAO/tao/marshal.i \ + $(WRAPPER_ROOT)/TAO/tao/cdr.i \ + $(WRAPPER_ROOT)/TAO/tao/debug.h +.obj/optable.o .shobj/optable.so: optable.cpp $(WRAPPER_ROOT)/TAO/tao/optable.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ @@ -1946,13 +3173,97 @@ copy: $(INSTALL) $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Synch_T.cpp \ $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.cpp \ + $(WRAPPER_ROOT)/ace/Service_Config.h \ + $(WRAPPER_ROOT)/ace/Service_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.h \ + $(WRAPPER_ROOT)/ace/Shared_Object.i \ + $(WRAPPER_ROOT)/ace/Service_Object.i \ + $(WRAPPER_ROOT)/ace/Thread_Manager.h \ + $(WRAPPER_ROOT)/ace/Thread_Manager.i \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Containers.cpp \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Service_Config.i \ + $(WRAPPER_ROOT)/ace/Reactor.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.h \ + $(WRAPPER_ROOT)/ace/Handle_Set.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue.h \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/Free_List.h \ + $(WRAPPER_ROOT)/ace/Free_List.i \ + $(WRAPPER_ROOT)/ace/Free_List.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.cpp \ + $(WRAPPER_ROOT)/ace/Token.h \ + $(WRAPPER_ROOT)/ace/Token.i \ + $(WRAPPER_ROOT)/ace/Pipe.h \ + $(WRAPPER_ROOT)/ace/Pipe.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.h \ + $(WRAPPER_ROOT)/ace/SOCK_IO.h \ + $(WRAPPER_ROOT)/ace/SOCK.h \ + $(WRAPPER_ROOT)/ace/Addr.h \ + $(WRAPPER_ROOT)/ace/Addr.i \ + $(WRAPPER_ROOT)/ace/IPC_SAP.h \ + $(WRAPPER_ROOT)/ace/IPC_SAP.i \ + $(WRAPPER_ROOT)/ace/SOCK.i \ + $(WRAPPER_ROOT)/ace/SOCK_IO.i \ + $(WRAPPER_ROOT)/ace/INET_Addr.h \ + $(WRAPPER_ROOT)/ace/INET_Addr.i \ + $(WRAPPER_ROOT)/ace/SOCK_Stream.i \ + $(WRAPPER_ROOT)/ace/Reactor.i \ + $(WRAPPER_ROOT)/ace/Proactor.h \ + $(WRAPPER_ROOT)/ace/Asynch_IO.h \ + $(WRAPPER_ROOT)/ace/Timer_List.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.h \ + $(WRAPPER_ROOT)/ace/Timer_List_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Heap.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Heap_T.cpp \ + $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ + $(WRAPPER_ROOT)/ace/Timer_Wheel_T.cpp \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ + $(WRAPPER_ROOT)/ace/High_Res_Timer.i \ + $(WRAPPER_ROOT)/ace/ReactorEx.h \ + $(WRAPPER_ROOT)/ace/Message_Queue.h \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.cpp \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.i \ + $(WRAPPER_ROOT)/ace/Memory_Pool.i \ + $(WRAPPER_ROOT)/ace/Message_Block.i \ + $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ + $(WRAPPER_ROOT)/ace/Strategies.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Strategies_T.cpp \ + $(WRAPPER_ROOT)/ace/Message_Queue.i \ + $(WRAPPER_ROOT)/ace/Message_Queue.cpp \ + $(WRAPPER_ROOT)/ace/ReactorEx.i \ + $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/SString.h \ $(WRAPPER_ROOT)/ace/SString.i \ $(WRAPPER_ROOT)/ace/Singleton.h \ - $(WRAPPER_ROOT)/ace/Singleton.i orb.h \ - orbconf.h corbacom.h except.h sequence.h principa.h typecode.h any.h \ - any.i typecode.i nvlist.h request.h object.h object.i svrrqst.h cdr.h \ - align.h marshal.h marshal.i cdr.i svrrqst.i debug.h + $(WRAPPER_ROOT)/ace/Singleton.i \ + $(WRAPPER_ROOT)/ace/Singleton.cpp \ + $(WRAPPER_ROOT)/TAO/tao/orb.h \ + $(WRAPPER_ROOT)/TAO/tao/orbconf.h \ + $(WRAPPER_ROOT)/TAO/tao/corbacom.h \ + $(WRAPPER_ROOT)/TAO/tao/object.h \ + $(WRAPPER_ROOT)/TAO/tao/request.h \ + $(WRAPPER_ROOT)/TAO/tao/sequence.h \ + $(WRAPPER_ROOT)/TAO/tao/except.h \ + $(WRAPPER_ROOT)/TAO/tao/object.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/any.cpp b/TAO/tao/any.cpp index ef64c9eda55..61fe8ad8f05 100644 --- a/TAO/tao/any.cpp +++ b/TAO/tao/any.cpp @@ -32,11 +32,13 @@ // COM NOTE: Yes, this is a utility data type whose implementation is // fully exposed. Factories for these are not normally used in C++. -#include "orb.h" -#include "cdr.h" - +#include <objbase.h> #include <initguid.h> +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/debug.h" + #if !defined (__ACE_INLINE__) # include "any.i" #endif diff --git a/TAO/tao/any.h b/TAO/tao/any.h index cd2520a25da..97cca2e3ec9 100644 --- a/TAO/tao/any.h +++ b/TAO/tao/any.h @@ -19,7 +19,11 @@ #if !defined (TAO_ANY_H) #define TAO_ANY_H -extern const IID IID_CORBA_Any; +#include <objbase.h> + +#include "ace/Synch_T.h" + +extern "C" const IID IID_CORBA_Any; class ACE_Svc_Export CORBA_Any : public IUnknown // = TITLE diff --git a/TAO/tao/boa.cpp b/TAO/tao/boa.cpp index 2ef87713648..e5c04bccf62 100644 --- a/TAO/tao/boa.cpp +++ b/TAO/tao/boa.cpp @@ -19,6 +19,7 @@ #include "iioporb.h" #include "roa.h" +#include <objbase.h> #include <initguid.h> diff --git a/TAO/tao/boa.h b/TAO/tao/boa.h index d531a6cb932..24fe59b0be1 100644 --- a/TAO/tao/boa.h +++ b/TAO/tao/boa.h @@ -24,11 +24,14 @@ #if !defined (TAO_BOA_H) # define TAO_BOA_H +# include <objbase.h> + # include "ace/SOCK_Stream.h" -# include "orb.h" -# include "corbacom.h" -# include "objtable.h" +# include "tao/orb.h" +# include "tao/sequence.h" +# include "tao/svrrqst.h" +# include "tao/objtable.h" // @@ Shouldn't this go into the CORBA:: namespace? It doesn't belong // at global scope! @@ -39,7 +42,7 @@ CORBA_Boolean is_nil (CORBA_BOA_ptr obj); // Decrement reference count on <obj>. void release (CORBA_BOA_ptr obj); -extern const IID IID_BOA; +extern "C" const IID IID_BOA; struct TAO_Dispatch_Context; class TAO_Object_Table; diff --git a/TAO/tao/compat/initguid.h b/TAO/tao/compat/initguid.h index 1e0d240504f..b9315574ca7 100644 --- a/TAO/tao/compat/initguid.h +++ b/TAO/tao/compat/initguid.h @@ -1,6 +1,15 @@ -// assert DEFINE_GUID is defined +/* This may look like C, but it's really -*- C++ -*- */ +#ifndef TAO_COMPAT_INITGUID_H +# define TAO_COMPAT_INITGUID_H + +/* Insure proper inclusion order */ +#ifndef DEFINE_GUID +#error initguid: must include objbase.h first. +#endif + +/* assert DEFINE_GUID is defined */ #undef DEFINE_GUID -// XXX assign these a value ... -#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) \ - const IID name = { 0 } +#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) EXTERN_C const IID name = { 0 } + +#endif /* TAO_COMPAT_INITGUID_H */ diff --git a/TAO/tao/compat/objbase.h b/TAO/tao/compat/objbase.h index 7a4afe01d60..5ca14b2728d 100644 --- a/TAO/tao/compat/objbase.h +++ b/TAO/tao/compat/objbase.h @@ -1,3 +1,4 @@ +/* This may look like C, but it's really -*- C++ -*- */ // @(#)objbase.h 1.4 95/09/25 // Copyright 1995 by Sun Microsystems, Inc. // @@ -28,6 +29,12 @@ typedef unsigned long HRESULT; // #define __stdcall // MS-Windows non-varargs call convention +#if defined(__cplusplus) +# define EXTERN_C extern "C" +#else +# define EXTERN_C extern +#endif + // // IDs come built from UUIDs // IID -- interface ID @@ -35,14 +42,18 @@ typedef unsigned long HRESULT; // typedef char IID [16]; // XXX actually a struct typedef const IID &REFIID; -#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name; +#if !defined(INITGUID) +# define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name +#else +# define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name = { 0 } +#endif // // All objects in the "Component Object Model" (COM) inherit from // this pure virtual base class. // -DEFINE_GUID (IID_IUnknown, b,c,d,e,f,g,h,i,j,k,l) +DEFINE_GUID (IID_IUnknown, b,c,d,e,f,g,h,i,j,k,l); class IUnknown { public: diff --git a/TAO/tao/corbacom.cpp b/TAO/tao/corbacom.cpp index f6a3f451a54..dafffa7356b 100644 --- a/TAO/tao/corbacom.cpp +++ b/TAO/tao/corbacom.cpp @@ -4,7 +4,7 @@ // // ORB: support for primitive data types -#include "orb.h" +#include "tao/orb.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h index 7524b35f783..9bdd00f0e0c 100644 --- a/TAO/tao/corbacom.h +++ b/TAO/tao/corbacom.h @@ -19,7 +19,7 @@ #if !defined (TAO_CORBACOM_H) #define TAO_CORBACOM_H -#include <objbase.h> // Win32 name for "compobj.h" +//#include <objbase.h> // Win32 name for "compobj.h" #if SIZEOF_BOOL != 0 typedef bool CORBA_Boolean; diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index 39790e9abc1..c578844f366 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -11,8 +11,8 @@ // // XXX on Windows, make it always use OutputDebugString () instead of stdio -#include "orb.h" -#include "debug.h" +#include "tao/orb.h" +#include "tao/debug.h" #if !defined (ACE_HAS_PTHREADS) // _POSIX_THREAD_SAFE_FUNCTIONS implied #define flockfile(f) diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 4f22aa2f352..7866b912c25 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -20,9 +20,10 @@ // // ============================================================================ -#include "orb.h" -#include "cdr.h" -#include "giop.h" +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/giop.h" +#include "tao/debug.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp index 381e5faf671..db926d46161 100644 --- a/TAO/tao/deep_copy.cpp +++ b/TAO/tao/deep_copy.cpp @@ -26,9 +26,10 @@ // // ============================================================================ -#include "orb.h" -#include "cdr.h" -#include "giop.h" +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/giop.h" +#include "tao/debug.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index a8dcf46b9f5..04a39b99a89 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -28,9 +28,10 @@ // // ============================================================================ -#include "orb.h" -#include "cdr.h" -#include "giop.h" +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/giop.h" +#include "tao/debug.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index ce5944c60e1..e9010b37641 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -19,9 +19,10 @@ // // ============================================================================ -#include "orb.h" -#include "cdr.h" -#include "giop.h" +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/giop.h" +#include "tao/debug.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/except.cpp b/TAO/tao/except.cpp index 3f470164f3c..7cd19d0f5f3 100644 --- a/TAO/tao/except.cpp +++ b/TAO/tao/except.cpp @@ -7,11 +7,13 @@ // THREADING NOTE: calling thread handles mutual exclusion policy // on all of these data structures. -#include "orb.h" +#include <objbase.h> +#include <initguid.h> + #include "ace/Log_Msg.h" -#include "cdr.h" -#include <initguid.h> +#include "tao/orb.h" +#include "tao/cdr.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/except.h b/TAO/tao/except.h index 113fa6bc9a0..998408f76dc 100644 --- a/TAO/tao/except.h +++ b/TAO/tao/except.h @@ -22,9 +22,11 @@ # include "ace/OS.h" # include "ace/Synch.h" -extern const IID IID_CORBA_Exception; -extern const IID IID_CORBA_UserException; -extern const IID IID_CORBA_SystemException; +# include <objbase.h> + +extern "C" const IID IID_CORBA_Exception; +extern "C" const IID IID_CORBA_UserException; +extern "C" const IID IID_CORBA_SystemException; class ACE_Svc_Export CORBA_Exception : public IUnknown // = TITLE diff --git a/TAO/tao/factories.cpp b/TAO/tao/factories.cpp index 16a084340a2..2d64aa38ab0 100644 --- a/TAO/tao/factories.cpp +++ b/TAO/tao/factories.cpp @@ -1,4 +1,4 @@ -#include "factories.h" +#include "tao/factories.h" #if !defined(__ACE_INLINE__) # include "factories.i" diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h index 9832aace1d5..3149f136878 100644 --- a/TAO/tao/factories.h +++ b/TAO/tao/factories.h @@ -24,13 +24,9 @@ # include "ace/Connector.h" # include "ace/Synch.h" -# include "params.h" -# include "connect.h" -# if defined (__IIOP_BUILD) -# include "objtable.h" -# else -# include "corba/objtable.h" -# endif +# include "tao/params.h" +# include "tao/connect.h" +# include "tao/objtable.h" class TAO_Client_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> // = TITLE diff --git a/TAO/tao/giop.cpp b/TAO/tao/giop.cpp index 3e7b6236a1f..834098b99b6 100644 --- a/TAO/tao/giop.cpp +++ b/TAO/tao/giop.cpp @@ -40,13 +40,16 @@ // error is detected when marshaling or unmarshaling, it should be // reported. -#include "orb.h" #include "ace/Log_Msg.h" #include "ace/SOCK_Stream.h" -#include "orbobj.h" -#include "factories.h" -#include "cdr.h" -#include "giop.h" + +#include "tao/giop.h" +#include "tao/orb.h" +#include "tao/orbobj.h" +#include "tao/factories.h" +#include "tao/cdr.h" +#include "tao/debug.h" + // defined by GIOP 1.0 protocol #define TAO_GIOP_HEADER_LEN 12 @@ -609,7 +612,6 @@ GIOP::Invocation::start (CORBA_Environment &env) ACE_MT (ACE_GUARD (ACE_Thread_Mutex, guard, lock_)); -#if !defined (USE_OLD_CODE) // Get a CORBA_Object_ptr from _data using QueryInterface () CORBA_Object_ptr obj = 0; @@ -644,25 +646,6 @@ GIOP::Invocation::start (CORBA_Environment &env) // Use the ACE_SOCK_Stream from the Client_Connection_Handler for // communication inplace of the endpoint used below. -#else - if (_data->fwd_profile != 0) - { - key = &_data->fwd_profile->object_key; - endpoint = client_endpoint::lookup ((char *)_data->fwd_profile->host, - _data->fwd_profile->port, env); - } - else - { - key = &_data->profile.object_key; - endpoint = client_endpoint::lookup ((char *)_data->profile.host, - _data->profile.port, env); - } - if (env.exception () != 0) - { - dexc (env, "invoke, lookup client endpoint"); - return; - } -#endif /* USE_OLD_CODE */ // POLICY DECISION: If the client expects most agents to forward, // then it could try to make sure that it's been forwarded at least @@ -1042,7 +1025,7 @@ GIOP::Invocation::invoke (CORBA_ExceptionList &exceptions, &obj, 0, env) != CORBA_TypeCode::TRAVERSE_CONTINUE || obj->QueryInterface (IID_IIOP_Object, - (void **)&obj2) != NOERROR) + (void **)&obj2) != NOERROR) { dexc (env, "invoke, location forward"); send_error (handler_->peer ()); diff --git a/TAO/tao/giop.h b/TAO/tao/giop.h index b3d14501528..8a2eaf5bfb5 100644 --- a/TAO/tao/giop.h +++ b/TAO/tao/giop.h @@ -21,16 +21,12 @@ # include "ace/OS.h" # include "ace/SOCK_Stream.h" -# if defined (__IIOP_BUILD) -# include "orb.h" -# include "stub.h" -# else -# include <corba/orb.h> -# include <corba/stub.h> -# endif /* __IIOP_BUILD */ - -# include "iiopobj.h" // XXX -- not generic! -# include "factories.h" + +# include "tao/orb.h" +# include "tao/stub.h" + +# include "tao/iiopobj.h" // XXX -- not generic! +# include "tao/factories.h" // XXX this same typedef is used in other places, e.g. iiopobj.hh typedef CORBA_SEQUENCE <CORBA_Octet> opaque; diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp index 5eaa88fca39..b4e5e57a494 100644 --- a/TAO/tao/iiopobj.cpp +++ b/TAO/tao/iiopobj.cpp @@ -8,11 +8,12 @@ // based implementation, and can neither be used by other kinds of // objref nor have a default implementation. -#include "orb.h" -#include <initguid.h> +#include <objbase.h> +#include <initguid.h> -#include "stub.h" -#include "iiopobj.h" +#include "tao/orb.h" +#include "tao/stub.h" +#include "tao/iiopobj.h" #if !defined (__ACE_INLINE__) # include "iiopobj.i" @@ -126,11 +127,12 @@ IIOP_Object::is_equivalent (CORBA_Object_ptr other_obj, DEFINE_GUID (IID_IIOP_Object, 0xa201e4c3, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); +#if 0 // Added by BRM: 2/21/97 // IID_STUB_Object and IID_CORBA_Object were not being defined. // Need a central place for all of these macros. -#if defined(WIN32) +#if 0 //defined(WIN32) EXTERN_C ACE_Svc_Export GUID IID_STUB_Object = {0xa201e4c7, 0xf258, 0x11ce, {0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98} }; #else @@ -145,6 +147,7 @@ DEFINE_GUID (IID_CORBA_Object, // End - Added by BRM: 2/21/97 IID_STUB_Object and IID_CORBA_Object // were not being defined. Need a central place for all of these // macros. +#endif ULONG __stdcall IIOP_Object::AddRef (void) diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h index 721886ac5ef..6952488fd01 100644 --- a/TAO/tao/iiopobj.h +++ b/TAO/tao/iiopobj.h @@ -25,6 +25,11 @@ # include "ace/OS.h" +# include "tao/corbacom.h" +# include "tao/sequence.h" +# include "tao/object.h" +# include "tao/stub.h" + // @@ Can we use the ACE_SYNCH_MUTEX here rather than these typedefs? # if !defined (ACE_HAS_THREADS) typedef ACE_Null_Mutex ACE_Thread_Mutex; diff --git a/TAO/tao/iioporb.cpp b/TAO/tao/iioporb.cpp index 87a400bd186..c357f12ea57 100644 --- a/TAO/tao/iioporb.cpp +++ b/TAO/tao/iioporb.cpp @@ -7,12 +7,14 @@ // This includes objref stringification/destringification for IIOP // object references. -#include "orb.h" -#include <initguid.h> -#include "stub.h" -#include "cdr.h" -#include "iioporb.h" -#include "iiopobj.h" +#include <objbase.h> +#include <initguid.h> + +#include "tao/orb.h" +#include "tao/stub.h" +#include "tao/cdr.h" +#include "tao/iioporb.h" +#include "tao/iiopobj.h" static const char ior_prefix [] = "IOR:"; static const char iiop_prefix [] = "iiop:"; diff --git a/TAO/tao/iioporb.h b/TAO/tao/iioporb.h index 39859d3940d..598ae899b6c 100644 --- a/TAO/tao/iioporb.h +++ b/TAO/tao/iioporb.h @@ -22,7 +22,7 @@ typedef class IIOP_ORB *IIOP_ORB_ptr; -extern const IID IID_IIOP_ORB; +extern "C" const IID IID_IIOP_ORB; // ORB pseudo-objref diff --git a/TAO/tao/interp.cpp b/TAO/tao/interp.cpp index 9305c86cbaf..4e3d723d4cf 100644 --- a/TAO/tao/interp.cpp +++ b/TAO/tao/interp.cpp @@ -66,8 +66,8 @@ // only the data being fed to the interpreter must be protected // against concurrency. -#include "orb.h" -#include "cdr.h" +#include "tao/orb.h" +#include "tao/cdr.h" // Utility routines are used to manipulate CDR-encapsulated TypeCode // parameter lists, calculating the size and alignment of the data diff --git a/TAO/tao/invoke.cpp b/TAO/tao/invoke.cpp index 5aa2237114b..7806dfface9 100644 --- a/TAO/tao/invoke.cpp +++ b/TAO/tao/invoke.cpp @@ -28,9 +28,11 @@ // generate better code, which in some cases may be very hard to // unwind. -#include "orb.h" -#include "cdr.h" -#include "giop.h" +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/giop.h" +#include "tao/nvlist.h" +#include "tao/debug.h" class ACE_Synchronous_Cancellation_Required // = TITLE diff --git a/TAO/tao/marshal.cpp b/TAO/tao/marshal.cpp index 593783f8fb9..4d758c0cce7 100644 --- a/TAO/tao/marshal.cpp +++ b/TAO/tao/marshal.cpp @@ -19,9 +19,9 @@ // // ============================================================================ -#include "orb.h" -#include "align.h" -#include "cdr.h" +#include "tao/orb.h" +#include "tao/align.h" +#include "tao/cdr.h" #if defined (HAVE_WIDEC_H) # include <widec.h> diff --git a/TAO/tao/marshal.h b/TAO/tao/marshal.h index b0bcff515f7..fb9ec4edf6d 100644 --- a/TAO/tao/marshal.h +++ b/TAO/tao/marshal.h @@ -23,6 +23,10 @@ #include "ace/Synch.h" #include "ace/Singleton.h" +#include "tao/typecode.h" +#include "tao/object.h" // CORBA_Object::_duplicate() needed by inline method +#include "tao/principa.h" + CORBA_TypeCode::traverse_status DEEP_COPY (CORBA_TypeCode_ptr param, const void *source, diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp index db37f615e22..88053630095 100644 --- a/TAO/tao/nvlist.cpp +++ b/TAO/tao/nvlist.cpp @@ -6,8 +6,15 @@ // // Implementation of Named Value List -#include "orb.h" -#include <initguid.h> +#include <objbase.h> +#include <initguid.h> + +#include "ace/Synch_T.h" + +#include "tao/orb.h" +#include "tao/any.h" +#include "tao/except.h" +#include "tao/nvlist.h" // COM's IUnknown support diff --git a/TAO/tao/nvlist.h b/TAO/tao/nvlist.h index 2929ea7f98f..65b284b65c0 100644 --- a/TAO/tao/nvlist.h +++ b/TAO/tao/nvlist.h @@ -18,6 +18,8 @@ # include "ace/OS.h" +# include "tao/any.h" + // @@ IS it necessary to use ACE_Svc_Export on a forward decl? I // simply did a global replace of _EXPCLASS with ACE_Svc_Export. I'm // not familiar enough with crazy MSVC nuances to know if this is diff --git a/TAO/tao/objtable.cpp b/TAO/tao/objtable.cpp index 94aa46a1c3f..7534f9a41c9 100644 --- a/TAO/tao/objtable.cpp +++ b/TAO/tao/objtable.cpp @@ -1,4 +1,4 @@ -#include "objtable.h" +#include "tao/objtable.h" // Template Specialization for char* int diff --git a/TAO/tao/objtable.h b/TAO/tao/objtable.h index cd2819fcfd0..f834b10e666 100644 --- a/TAO/tao/objtable.h +++ b/TAO/tao/objtable.h @@ -21,7 +21,8 @@ # include "ace/Hash_Map_Manager.h" # include "ace/SString.h" -# include "orb.h" +# include "tao/orb.h" +# include "tao/sequence.h" // Dynamic Hashing scheme. //typedef ACE_Hash_Map_Manager<ACE_CString, CORBA_Object_ptr, ACE_SYNCH_RW_MUTEX> OBJ_MAP_MANAGER; diff --git a/TAO/tao/optable.cpp b/TAO/tao/optable.cpp index 0340e1c55bd..8783bbe713f 100644 --- a/TAO/tao/optable.cpp +++ b/TAO/tao/optable.cpp @@ -1,4 +1,4 @@ -#include "optable.h" +#include "tao/optable.h" TAO_Operation_Table::~TAO_Operation_Table (void) { diff --git a/TAO/tao/optable.h b/TAO/tao/optable.h index 2adda361197..f2187de7eeb 100644 --- a/TAO/tao/optable.h +++ b/TAO/tao/optable.h @@ -22,7 +22,7 @@ #include "ace/SString.h" #include "ace/Singleton.h" -#include "orb.h" +#include "tao/orb.h" typedef ACE_Hash_Map_Manager<ACE_CString, TAO_Skeleton, ACE_SYNCH_RW_MUTEX> OP_MAP_MANAGER; diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp index d7a37a05364..bc0f2b38030 100644 --- a/TAO/tao/orbobj.cpp +++ b/TAO/tao/orbobj.cpp @@ -9,14 +9,16 @@ // component and have a loose table-driven coupling to ORB/protocol // library components. -#include "orb.h" -#include "stub.h" -#include "iioporb.h" // XXX +#include <objbase.h> +#include <initguid.h> -#include "params.h" -#include "boa.h" -#include "roa.h" -#include <initguid.h> +#include "tao/orb.h" +#include "tao/stub.h" +#include "tao/iioporb.h" // XXX +#include "tao/params.h" +#include "tao/boa.h" +#include "tao/roa.h" +#include "tao/nvlist.h" extern void __TC_init_table (void); extern void __TC_init_standard_exceptions (CORBA_Environment &env); @@ -32,11 +34,10 @@ extern void __TC_init_standard_exceptions (CORBA_Environment &env); DEFINE_GUID (IID_CORBA_ORB, 0xa201e4c6, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); -#if 0 +// CJC Why was this commented out? // {A201E4C7-F258-11ce-9598-0000C07CA898} DEFINE_GUID (IID_STUB_Object, 0xa201e4c7, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); -#endif ULONG __stdcall CORBA_ORB::Release (void) diff --git a/TAO/tao/orbobj.h b/TAO/tao/orbobj.h index e508143ddf7..dc3ba93a7c6 100644 --- a/TAO/tao/orbobj.h +++ b/TAO/tao/orbobj.h @@ -24,14 +24,15 @@ # define TAO_ORBOBJ_H # include "ace/OS.h" -# include "factories.h" -# include "params.h" + +# include "tao/factories.h" +# include "tao/params.h" // Can't have forward decls if we're doing inlines of these functions ACE_INLINE void CORBA_release (CORBA_ORB_ptr orb); ACE_INLINE CORBA_Boolean CORBA_is_nil (CORBA_ORB_ptr orb); -extern const IID IID_CORBA_ORB; +extern "C" const IID IID_CORBA_ORB; // @@ Shoudn't this be hidden within a namespace? According to the // spec, CORBA_ORB_init() is a valid signature for this function, as diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 96ba968ea38..846c14c75ed 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -1,6 +1,6 @@ -#include "params.h" -#include "connect.h" -#include "objtable.h" +#include "tao/params.h" +#include "tao/connect.h" +#include "tao/objtable.h" TAO_OA_Parameters * TAO_OA_Parameters::instance (void) diff --git a/TAO/tao/params.h b/TAO/tao/params.h index f91b95ae07c..4ee9d9bc02f 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -16,13 +16,11 @@ #if !defined (TAO_PARAMS_H) # define TAO_PARAMS_H -# if defined(__IIOP_BUILD) -# include "boa.h" -# else -# include <corba/boa.h> -# endif +# include "ace/OS.h" -# include "ace/Singleton.h" +# include "tao/orb.h" // get types +# include "tao/boa.h" // Need the DSI Handler +# include "tao/sequence.h" // for CORBA_OctetSeq // Forward decls. diff --git a/TAO/tao/principa.cpp b/TAO/tao/principa.cpp index 1355c645d11..587a621d5ed 100644 --- a/TAO/tao/principa.cpp +++ b/TAO/tao/principa.cpp @@ -5,8 +5,11 @@ // ORB: Principal identifier pseudo-objref // -#include "orb.h" -#include <initguid.h> +#include <objbase.h> +#include <initguid.h> + +#include "tao/orb.h" +#include "tao/principa.h" void CORBA_release (CORBA_Principal_ptr principal) diff --git a/TAO/tao/principa.h b/TAO/tao/principa.h index 0b6aa467e55..2bd467d3241 100644 --- a/TAO/tao/principa.h +++ b/TAO/tao/principa.h @@ -23,14 +23,19 @@ #if !defined (TAO_PRINCIPAL_H) # define TAO_PRINCIPAL_H +# include <objbase.h> +# include <initguid.h> + # include "ace/OS.h" # include "ace/Synch.h" +# include "tao/sequence.h" + +extern "C" const IID IID_CORBA_Principal; + void CORBA_release (CORBA_Principal_ptr principal); CORBA_Boolean CORBA_is_nil (CORBA_Principal_ptr principal); -extern const IID IID_CORBA_Principal; - class ACE_Svc_Export CORBA_Principal : public IUnknown { public: diff --git a/TAO/tao/request.cpp b/TAO/tao/request.cpp index f50b2ebaf8e..2e288e414de 100644 --- a/TAO/tao/request.cpp +++ b/TAO/tao/request.cpp @@ -4,11 +4,13 @@ // // Implementation of Dynamic Invocation Interface // -#include "orb.h" -#include "stub.h" +#include <objbase.h> #include <initguid.h> -#include "cdr.h" +#include "tao/orb.h" +#include "tao/stub.h" +#include "tao/cdr.h" +#include "tao/nvlist.h" // {77420085-F276-11ce-9598-0000C07CA898} DEFINE_GUID (IID_CORBA_Request, diff --git a/TAO/tao/request.h b/TAO/tao/request.h index 4b569db3c64..9d9cdf3f9d6 100644 --- a/TAO/tao/request.h +++ b/TAO/tao/request.h @@ -23,7 +23,8 @@ # include "ace/OS.h" -# include "sequence.h" +# include "tao/sequence.h" +# include "tao/except.h" void ACE_Svc_Export CORBA_release (CORBA_Request_ptr req); CORBA_Boolean ACE_Svc_Export CORBA_is_nil (CORBA_Request_ptr req); @@ -31,7 +32,7 @@ CORBA_Boolean ACE_Svc_Export CORBA_is_nil (CORBA_Request_ptr req); typedef CORBA_SEQUENCE <CORBA_TypeCode_ptr> CORBA_ExceptionList; typedef CORBA_ExceptionList *CORBA_ExceptionList_ptr; -extern const IID IID_CORBA_Request; +extern "C" const IID IID_CORBA_Request; class ACE_Svc_Export CORBA_Request : public IUnknown { diff --git a/TAO/tao/roa.cpp b/TAO/tao/roa.cpp index da38684cdc0..353cc7cd8d5 100644 --- a/TAO/tao/roa.cpp +++ b/TAO/tao/roa.cpp @@ -1,16 +1,20 @@ // $Id$ -#include "orb.h" -#include "roa.h" -#include "boa.h" -#include "cdr.h" -#include "connect.h" -#include "giop.h" -#include "params.h" -#include "factories.h" -#include "orbobj.h" +#include <objbase.h> #include <initguid.h> +#include "tao/orb.h" +#include "tao/roa.h" +#include "tao/boa.h" +#include "tao/cdr.h" +#include "tao/connect.h" +#include "tao/giop.h" +#include "tao/params.h" +#include "tao/factories.h" +#include "tao/orbobj.h" +#include "tao/nvlist.h" +#include "tao/debug.h" + // Forward declarations... static void request_dispatcher (GIOP::RequestHeader &req, CDR &request_body, diff --git a/TAO/tao/roa.h b/TAO/tao/roa.h index 381f69c958c..4a6c557a925 100644 --- a/TAO/tao/roa.h +++ b/TAO/tao/roa.h @@ -20,19 +20,15 @@ # include "ace/INET_Addr.h" -# if defined (__IIOP_BUILD) -# include "boa.h" -# else -# include <corba/boa.h> -# endif +# include "tao/boa.h" +# include "tao/params.h" +# include "tao/connect.h" class ACE_Svc_Export ROA; typedef ROA* ROA_ptr; -# include "params.h" -# include "connect.h" -extern const IID IID_ROA; +extern "C" const IID IID_ROA; class ACE_Svc_Export ROA : public CORBA_BOA // = TITLE diff --git a/TAO/tao/svrrqst.cpp b/TAO/tao/svrrqst.cpp index 91dd8730728..b7f8684364d 100644 --- a/TAO/tao/svrrqst.cpp +++ b/TAO/tao/svrrqst.cpp @@ -4,10 +4,14 @@ // // Implementation of the Dynamic Server Skeleton Interface -#include "orb.h" +#include <objbase.h> #include <initguid.h> -#include "cdr.h" -#include "svrrqst.h" + +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/svrrqst.h" +#include "tao/nvlist.h" +#include "tao/debug.h" // {77420086-F276-11ce-9598-0000C07CA898} DEFINE_GUID (IID_IIOP_ServerRequest, diff --git a/TAO/tao/svrrqst.h b/TAO/tao/svrrqst.h index 6166245e814..f0e7b87a63d 100644 --- a/TAO/tao/svrrqst.h +++ b/TAO/tao/svrrqst.h @@ -25,12 +25,13 @@ # define TAO_SVRRQST_H # include "ace/OS.h" -# include "cdr.h" + +# include "tao/cdr.h" void CORBA_release (CORBA_ServerRequest_ptr req); CORBA_Boolean CORBA_is_nil (CORBA_ServerRequest_ptr req); -extern const IID IID_CORBA_ServerRequest; +extern "C" const IID IID_CORBA_ServerRequest; class ACE_Svc_Export CORBA_ServerRequest : public IUnknown // = TITLE @@ -79,7 +80,7 @@ public: virtual CORBA_ORB_ptr __stdcall orb (void) = 0; }; -extern const IID IID_IIOP_ServerRequest; +extern "C" const IID IID_IIOP_ServerRequest; class ACE_Svc_Export IIOP_ServerRequest : public CORBA_ServerRequest { diff --git a/TAO/tao/t-sizes.cpp b/TAO/tao/t-sizes.cpp index 99e47ecc678..f791c064c15 100644 --- a/TAO/tao/t-sizes.cpp +++ b/TAO/tao/t-sizes.cpp @@ -1,4 +1,4 @@ -#include "orb.h" +#include "tao/orb.h" #define SHOWSIZE(t) cout << "sizeof(" #t ") = " << sizeof(t) << endl; diff --git a/TAO/tao/t-xdr.cpp b/TAO/tao/t-xdr.cpp index 3c3c4e4d5e8..393aed26e88 100644 --- a/TAO/tao/t-xdr.cpp +++ b/TAO/tao/t-xdr.cpp @@ -7,16 +7,16 @@ // // It's suitable only for a simple performance test just now ... -#include "orb.h" +#include "tao/orb.h" #if defined(HAVE_WIDEC_H) # include <widec.h> #endif -#include "cdr.h" -#include "debug.h" +#include "tao/cdr.h" +#include "tao/debug.h" -#include "xdr.h" +#include "tao/xdr.h" // A structure that's somewhat representative of an IIOP message in // terms of overall complexity, so that its encoding cost is diff --git a/TAO/tao/tc_const.cpp b/TAO/tao/tc_const.cpp index 8b898a29360..66a413dca2b 100644 --- a/TAO/tao/tc_const.cpp +++ b/TAO/tao/tc_const.cpp @@ -14,7 +14,8 @@ // THREADING NOTE: no issues, these are immutable constants // -#include "orb.h" +#include "tao/orb.h" +#include "tao/typecode.h" // Null and void diff --git a/TAO/tao/typecode.cpp b/TAO/tao/typecode.cpp index d0087d72a05..6c4f06cd8d4 100644 --- a/TAO/tao/typecode.cpp +++ b/TAO/tao/typecode.cpp @@ -16,10 +16,13 @@ // only mutual exclusion relates to reference counting and // construction. -#include "orb.h" -#include "cdr.h" +#include <objbase.h> #include <initguid.h> +#include "tao/orb.h" +#include "tao/cdr.h" +#include "tao/debug.h" + // @@ This is a botch... size_t calc_key_union_attributes (CDR *stream, diff --git a/TAO/tao/typecode.h b/TAO/tao/typecode.h index e5767d3ba45..b95cbf2a7c2 100644 --- a/TAO/tao/typecode.h +++ b/TAO/tao/typecode.h @@ -29,7 +29,9 @@ # define TAO_TYPECODE_H # include "ace/OS.h" -# include "any.h" + +# include "tao/any.h" +# include "tao/except.h" struct CDR; @@ -102,7 +104,7 @@ public: void CORBA_release (CORBA_TypeCode_ptr); CORBA_Boolean CORBA_is_nil (CORBA_TypeCode_ptr obj); -extern const IID IID_CORBA_TypeCode; +extern "C" const IID IID_CORBA_TypeCode; class TC_Private_State; class ACE_Svc_Export CORBA_TypeCode : public IUnknown diff --git a/TAO/tao/xdr.cpp b/TAO/tao/xdr.cpp index 2174bf2c3a6..43f0f505e32 100644 --- a/TAO/tao/xdr.cpp +++ b/TAO/tao/xdr.cpp @@ -27,15 +27,15 @@ // arrays of "short" data (e.g. unicode strings) pack tightly. // -#include "orb.h" +#include "tao/orb.h" +#include "tao/debug.h" +#include "tao/principa.h" +#include "tao/xdr.h" #if defined(HAVE_WIDEC_H) # include <widec.h> #endif -#include "debug.h" - -#include "xdr.h" // diff --git a/TAO/tao/xdr.h b/TAO/tao/xdr.h index 4fb02d79da3..efcd10081d1 100644 --- a/TAO/tao/xdr.h +++ b/TAO/tao/xdr.h @@ -20,8 +20,9 @@ #if !defined (TAO_XDR_H) #define TAO_XDR_H -#include <sys/types.h> -#include <netinet/in.h> +#include "ace/OS.h" + +#include "tao/typecode.h" // Define on systems that fully support exceptions ... excluding // some very common platforms like G++ and VC++ 2.2 diff --git a/TAO/tests/Cubit/TAO/Makefile b/TAO/tests/Cubit/TAO/Makefile index 4fb42d17ec0..4f6e16e9842 100644 --- a/TAO/tests/Cubit/TAO/Makefile +++ b/TAO/tests/Cubit/TAO/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lcorba +LDLIBS = -lTAO PROG_SRCS = svr.cpp clnt.cpp cubit.cpp \ test1.cpp test1_clnt.cpp test1_svr.cpp \ @@ -42,8 +42,13 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU # Local modifications to variables imported by includes above. -LDFLAGS += -L../../../proto/lib -CPPFLAGS += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG +#LDFLAGS += -L../../../proto/lib +#CPPFLAGS += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG +ifndef TAO_ROOT +TAO_ROOT = $(WRAPPER_ROOT)/TAO +endif +LDFLAGS += -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat svr: $(addprefix $(VDIR),$(CUBIT_SVR_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) diff --git a/TAO/tests/Cubit/TAO/clnt.cpp b/TAO/tests/Cubit/TAO/clnt.cpp index f0249489889..1c345abddb5 100644 --- a/TAO/tests/Cubit/TAO/clnt.cpp +++ b/TAO/tests/Cubit/TAO/clnt.cpp @@ -22,9 +22,11 @@ #endif // unix -#include "cubitC.h" +#include "cubitC.h" -#include <corba/debug.h> +#include "tao/debug.h" +#include "tao/orbobj.h" +#include "tao/nvlist.h" #if !defined (_WIN32) diff --git a/TAO/tests/Cubit/TAO/cubit.cpp b/TAO/tests/Cubit/TAO/cubit.cpp index d232de8eee8..0d04753139d 100644 --- a/TAO/tests/Cubit/TAO/cubit.cpp +++ b/TAO/tests/Cubit/TAO/cubit.cpp @@ -33,9 +33,9 @@ // #include "cubit.h" // for stubs ... -#include <corba/boa.h> // ... and skeletons +#include "tao/boa.h" // ... and skeletons -#include <corba/debug.h> // ... and debugging +#include "tao/debug.h" // ... and debugging // diff --git a/TAO/tests/Cubit/TAO/cubit.h b/TAO/tests/Cubit/TAO/cubit.h index 92dd6b381bd..d5421988ea2 100644 --- a/TAO/tests/Cubit/TAO/cubit.h +++ b/TAO/tests/Cubit/TAO/cubit.h @@ -20,8 +20,8 @@ #pragma pack (push, 1) // VC++, known padding rules #endif // VC++ -#include <corba/orb.h> -#include <corba/stub.h> +#include "tao/orb.h" +#include "tao/stub.h" // diff --git a/TAO/tests/Cubit/TAO/cubitC.cpp b/TAO/tests/Cubit/TAO/cubitC.cpp index 99416520c15..3b0518d6f4d 100644 --- a/TAO/tests/Cubit/TAO/cubitC.cpp +++ b/TAO/tests/Cubit/TAO/cubitC.cpp @@ -17,18 +17,25 @@ Cubit_ptr Cubit::_duplicate(Cubit_ptr obj) Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj) { - CORBA_Environment env; - if (obj->_is_a("IDL:Cubit:1.0", env)) - { + CORBA_Environment env; + if (obj->_is_a("IDL:Cubit:1.0", env)) + { + obj->Release(); // Release the reference grabbed by _is_a() + STUB_Object *istub; if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR) - { - return Cubit::_nil(); - } + { + return Cubit::_nil(); + } + obj->Release(); Cubit_ptr new_obj = new Cubit(istub); return Cubit::_duplicate(new_obj); - } - return Cubit::_nil(); + } + else + { + // Do we need to do an obj->Release() here if _is_a() failed? + } + return Cubit::_nil(); } Cubit_ptr Cubit::_nil() @@ -67,7 +74,8 @@ Cubit::Cubit_cube_octet (CORBA_Octet o, env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return 0; } - + this->Release(); + istub->do_call (env, &Cubit_cube_octet_calldata, &retval, &o); istub->Release (); @@ -106,6 +114,7 @@ Cubit::Cubit_cube_short (CORBA_Short s, env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return 0; } + this->Release(); istub->do_call(env, &Cubit_cube_short_calldata, &retval, &s); @@ -145,6 +154,7 @@ Cubit::Cubit_cube_long (CORBA_Long l, env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return 0; } + this->Release(); istub->do_call (env, &Cubit_cube_long_calldata, &retval, &l); @@ -218,6 +228,7 @@ Cubit::Cubit_cube_struct (Cubit_Many &values, env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return 0; } + this->Release(); istub->do_call (env, &Cubit_cube_struct_calldata, &retval, &values); @@ -345,6 +356,7 @@ Cubit::Cubit_cube_union (Cubit_oneof &values, env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return 0; } + this->Release(); istub->do_call (env, &Cubit_cube_union_calldata, &retval, &values); @@ -375,6 +387,7 @@ Cubit::Cubit_please_exit (CORBA_Environment &env) env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO)); return; } + this->Release(); istub->do_call (env, &Cubit_please_exit_calldata); istub->Release (); diff --git a/TAO/tests/Cubit/TAO/cubitC.h b/TAO/tests/Cubit/TAO/cubitC.h index 8f9dfe53841..defe9121b5e 100644 --- a/TAO/tests/Cubit/TAO/cubitC.h +++ b/TAO/tests/Cubit/TAO/cubitC.h @@ -17,8 +17,10 @@ implementation #pragma pack (push, 1) // VC++, known padding rules #endif // VC++ -#include "corba/orb.h" -#include "corba/stub.h" +#include "tao/orb.h" +#include "tao/object.h" +#include "tao/stub.h" +#include "tao/typecode.h" #include <iostream.h> diff --git a/TAO/tests/Cubit/TAO/cubitS.cpp b/TAO/tests/Cubit/TAO/cubitS.cpp index b153b71db1b..5f4108312b7 100644 --- a/TAO/tests/Cubit/TAO/cubitS.cpp +++ b/TAO/tests/Cubit/TAO/cubitS.cpp @@ -5,16 +5,16 @@ // TEST: hand-written C-style "Cubit" stubs and "skeletons" // -#include "cubitS.h" -#include "cubitC.cpp" +#include "tao/connect.h" +#include "tao/params.h" +#include "tao/debug.h" // ... and debugging +#include "tao/optable.h" // TAO Dynamic Operation Table +#include "tao/iiopobj.h" -#include "connect.h" -#include "params.h" +#include "cubitS.h" +#include "cubitC.cpp" -#include "corba/debug.h" // ... and debugging -#include "corba/optable.h" // TAO Dynamic Operation Table #include "method_db.i" -#include "iiopobj.h" #if defined(CUBIT_USE_DYNAMIC_HASH) TAO_Dynamic_Hash_OpTable tao_cubit_optable(7); // Dynamic Operation Table @@ -33,7 +33,7 @@ _skel_Cubit::_skel_Cubit(const char* obj_name) // CORBA_String type_id = "IDL:Cubit:1.0"; IIOP_Object *data; - CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); + CORBA_BOA_ptr oa = TAO_OA_Parameters::instance()->oa(); if (oa == 0) { // We just have to assume that oa will be good, or we have to diff --git a/TAO/tests/Cubit/TAO/cubitS.h b/TAO/tests/Cubit/TAO/cubitS.h index 84c07b741b0..ad148237967 100644 --- a/TAO/tests/Cubit/TAO/cubitS.h +++ b/TAO/tests/Cubit/TAO/cubitS.h @@ -14,6 +14,8 @@ implementation #define _SKEL_CUBIT_HH #include "cubitC.h" +#include "tao/orbobj.h" +#include "tao/nvlist.h" class _skel_Cubit; typedef _skel_Cubit *_skel_Cubit_ptr; diff --git a/TAO/tests/Cubit/TAO/cubit_i.cpp b/TAO/tests/Cubit/TAO/cubit_i.cpp index ae22b7cd12c..2da1edf7e78 100644 --- a/TAO/tests/Cubit/TAO/cubit_i.cpp +++ b/TAO/tests/Cubit/TAO/cubit_i.cpp @@ -7,13 +7,14 @@ // Modified version of Cubit Example written by Sun Microsystems Inc. // Modified by: Brian Mendel -#include "cubit_i.h" +#include "tao/boa.h" // ... and skeletons +#include "tao/debug.h" // ... and debugging -#include <corba/boa.h> // ... and skeletons -#include <corba/debug.h> // ... and debugging +#include "tao/connect.h" +#include "tao/params.h" + +#include "cubit_i.h" -#include "connect.h" -#include "params.h" Cubit_i::Cubit_i(const char* obj_name) : _skel_Cubit(obj_name) @@ -83,7 +84,7 @@ Cubit_i::Cubit_cube_union (Cubit_oneof &values, void Cubit_i::Cubit_please_exit (CORBA_Environment &env) { - TAO_OA_Parameters* params = TAO_OA_PARAMS::instance(); + TAO_OA_Parameters* params = TAO_OA_Parameters::instance(); dmsg ("I've been asked to shut down..."); params->oa()->please_shutdown(env); diff --git a/TAO/tests/Cubit/TAO/svr.cpp b/TAO/tests/Cubit/TAO/svr.cpp index 0e537bc6206..fc1f6928c7d 100644 --- a/TAO/tests/Cubit/TAO/svr.cpp +++ b/TAO/tests/Cubit/TAO/svr.cpp @@ -13,9 +13,11 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -#include "corba/orb.h" -#include "corba/debug.h" -#include "connect.h" +#include "tao/orb.h" +#include "tao/orbobj.h" +#include "tao/boa.h" +#include "tao/debug.h" +#include "tao/connect.h" #include "cubit_i.h" diff --git a/TAO/tests/Cubit/TAO/test1.h b/TAO/tests/Cubit/TAO/test1.h index 7d3bd0e08a5..710e3a7c04f 100644 --- a/TAO/tests/Cubit/TAO/test1.h +++ b/TAO/tests/Cubit/TAO/test1.h @@ -8,9 +8,9 @@ #ifndef _TEST1_HH #define _TEST1_HH -#include <corba/orb.h> -#include <corba/stub.h> - +#include "tao/orb.h" +#include "tao/stub.h" +#include "tao/typecode.h" #ifdef _MSC_VER #pragma pack (push, 1) // VC++, known padding rules diff --git a/TAO/tests/Cubit/TAO/test1_clnt.cpp b/TAO/tests/Cubit/TAO/test1_clnt.cpp index 831a0189371..c65b2c98cad 100644 --- a/TAO/tests/Cubit/TAO/test1_clnt.cpp +++ b/TAO/tests/Cubit/TAO/test1_clnt.cpp @@ -21,8 +21,9 @@ #endif // unix #include "test1.h" -#include <corba/debug.h> - +#include "tao/debug.h" +#include "tao/request.h" +#include "tao/orbobj.h" #if !defined (_WIN32) extern char *optarg; // missing on some platforms diff --git a/TAO/tests/Cubit/TAO/test1_svr.cpp b/TAO/tests/Cubit/TAO/test1_svr.cpp index c4a51a036c7..8d662a37794 100644 --- a/TAO/tests/Cubit/TAO/test1_svr.cpp +++ b/TAO/tests/Cubit/TAO/test1_svr.cpp @@ -8,8 +8,8 @@ // messages, responds to them. // -#include <stdio.h> -#include <string.h> +#include <stdio.h> +#include <string.h> #include <ace/Get_Opt.h> #if unix @@ -19,11 +19,12 @@ #endif -#include "test1.h" -#include <corba/boa.h> -#include <roa.h> - -#include <corba/debug.h> +#include "test1.h" +#include "tao/boa.h" +#include "tao/roa.h" +#include "tao/orbobj.h" +#include "tao/nvlist.h" +#include "tao/debug.h" |