diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-17 15:34:28 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-17 15:34:28 +0000 |
| commit | 5a33445c472fb5088b4ef26bf31012fdf982d440 (patch) | |
| tree | 766c72a22788567b304a015cebbe1ef56f2b6e2a | |
| parent | d2cbc9afa811c9861d4a037f515fcdafffded284 (diff) | |
| download | ATCD-5a33445c472fb5088b4ef26bf31012fdf982d440.tar.gz | |
ChangeLogTag:Sun Nov 17 09:37:08 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency | 74 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosEvent | 682 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing | 903 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosNaming | 154 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosNotification | 6186 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosProperty | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosTime | 208 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosTrading | 624 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.DsEventLogAdmin | 418 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin | 470 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.DsNotifyLogAdmin | 546 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTEvent | 3890 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTEventLogAdmin | 746 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTSched | 444 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.av | 1114 |
16 files changed, 7445 insertions, 9044 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency index 8741af464e7..0b8503ca234 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosConcurrency @@ -116,7 +116,7 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -257,8 +257,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ Concurrency/concurrency_export.h .obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.h \ @@ -306,8 +306,8 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/Token.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlS.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -448,8 +448,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -466,17 +466,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h .obj/CC_LockSetFactory.o .obj/CC_LockSetFactory.so .shobj/CC_LockSetFactory.o .shobj/CC_LockSetFactory.so: Concurrency/CC_LockSetFactory.cpp \ Concurrency/CC_LockSetFactory.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlS.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -658,8 +658,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -676,10 +676,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h Concurrency/CC_LockSet.h \ $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/Token.i @@ -690,7 +690,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + CosConcurrencyControlC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -868,11 +868,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ $(TAO_ROOT)/tao/debug.h \ Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ + CosConcurrencyControlS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -889,10 +889,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ Concurrency/concurrency_export.h .obj/Concurrency_Loader.o .obj/Concurrency_Loader.so .shobj/Concurrency_Loader.o .shobj/Concurrency_Loader.so: Concurrency/Concurrency_Loader.cpp \ @@ -1012,7 +1012,7 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Object_Loader.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h \ + Concurrency/Concurrency_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -1088,11 +1088,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/concurrency_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ + CosConcurrencyControlC.h \ + Concurrency/concurrency_export.h \ + CosConcurrencyControlC.i \ + Concurrency/CC_LockSetFactory.h \ + CosConcurrencyControlS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1109,10 +1109,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + CosConcurrencyControlS_T.h \ + CosConcurrencyControlS_T.i \ + CosConcurrencyControlS_T.cpp \ + CosConcurrencyControlS.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent index 94c9ae3de20..0c963170e22 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent @@ -93,9 +93,8 @@ realclean: clean .obj/CEC_ConsumerAdmin.o .obj/CEC_ConsumerAdmin.so .shobj/CEC_ConsumerAdmin.o .shobj/CEC_ConsumerAdmin.so: CosEvent/CEC_ConsumerAdmin.cpp \ CosEvent/CEC_ConsumerAdmin.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -277,8 +276,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -295,28 +294,22 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/event_export.h \ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -342,7 +335,7 @@ realclean: clean .obj/CEC_ConsumerControl.o .obj/CEC_ConsumerControl.so .shobj/CEC_ConsumerControl.o .shobj/CEC_ConsumerControl.so: CosEvent/CEC_ConsumerControl.cpp \ CosEvent/CEC_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -529,7 +522,7 @@ realclean: clean .obj/CEC_Dispatching.o .obj/CEC_Dispatching.so .shobj/CEC_Dispatching.o .shobj/CEC_Dispatching.so: CosEvent/CEC_Dispatching.cpp \ CosEvent/CEC_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -711,12 +704,13 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -733,16 +727,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_ProxyPushSupplier.i .obj/CEC_EventChannel.o .obj/CEC_EventChannel.so .shobj/CEC_EventChannel.o .shobj/CEC_EventChannel.so: CosEvent/CEC_EventChannel.cpp \ @@ -937,11 +925,10 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -958,32 +945,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ - CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ - CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \ - CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + CosEvent/CEC_Dispatching.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEvent/CEC_Dispatching.i CosEvent/CEC_Pulling_Strategy.h \ + CosEvent/CEC_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1204,9 +1187,8 @@ realclean: clean .obj/CEC_ProxyPushConsumer.o .obj/CEC_ProxyPushConsumer.so .shobj/CEC_ProxyPushConsumer.o .shobj/CEC_ProxyPushConsumer.so: CosEvent/CEC_ProxyPushConsumer.cpp \ CosEvent/CEC_ProxyPushConsumer.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1388,8 +1370,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1406,20 +1388,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -1430,15 +1406,15 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1454,9 +1430,8 @@ realclean: clean .obj/CEC_ProxyPullConsumer.o .obj/CEC_ProxyPullConsumer.so .shobj/CEC_ProxyPullConsumer.o .shobj/CEC_ProxyPullConsumer.so: CosEvent/CEC_ProxyPullConsumer.cpp \ CosEvent/CEC_ProxyPullConsumer.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1638,8 +1613,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1656,19 +1631,13 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -1679,15 +1648,15 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -1704,9 +1673,8 @@ realclean: clean .obj/CEC_ProxyPushSupplier.o .obj/CEC_ProxyPushSupplier.so .shobj/CEC_ProxyPushSupplier.o .shobj/CEC_ProxyPushSupplier.so: CosEvent/CEC_ProxyPushSupplier.cpp \ CosEvent/CEC_ProxyPushSupplier.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1888,8 +1856,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1906,19 +1874,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \ - CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ - CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ + CosEvent/CEC_Dispatching.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEvent/CEC_Dispatching.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -1928,19 +1893,18 @@ realclean: clean CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_ConsumerControl.h \ CosEvent/CEC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Proxy_RefCount_Guard.h \ + ESF/ESF_Proxy_RefCount_Guard.i \ + ESF/ESF_Proxy_RefCount_Guard.cpp .obj/CEC_ProxyPullSupplier.o .obj/CEC_ProxyPullSupplier.so .shobj/CEC_ProxyPullSupplier.o .shobj/CEC_ProxyPullSupplier.so: CosEvent/CEC_ProxyPullSupplier.cpp \ CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2122,8 +2086,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2140,16 +2104,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -2159,8 +2117,11 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPullSupplier.i \ - CosEvent/CEC_Dispatching.h CosEvent/CEC_Dispatching.i \ - CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ + CosEvent/CEC_Dispatching.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEvent/CEC_Dispatching.i CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -2173,9 +2134,8 @@ realclean: clean .obj/CEC_SupplierAdmin.o .obj/CEC_SupplierAdmin.so .shobj/CEC_SupplierAdmin.o .shobj/CEC_SupplierAdmin.so: CosEvent/CEC_SupplierAdmin.cpp \ CosEvent/CEC_SupplierAdmin.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2357,8 +2317,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2375,28 +2335,22 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/event_export.h \ CosEvent/CEC_ProxyPushConsumer.i CosEvent/CEC_ProxyPullConsumer.h \ CosEvent/CEC_ProxyPullConsumer.i CosEvent/CEC_SupplierAdmin.i \ @@ -2413,7 +2367,7 @@ realclean: clean .obj/CEC_SupplierControl.o .obj/CEC_SupplierControl.so .shobj/CEC_SupplierControl.o .shobj/CEC_SupplierControl.so: CosEvent/CEC_SupplierControl.cpp \ CosEvent/CEC_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2722,11 +2676,10 @@ realclean: clean $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2836,7 +2789,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2853,16 +2806,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_Dispatching_Task.i @@ -2870,7 +2817,7 @@ realclean: clean CosEvent/CEC_MT_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -3052,8 +2999,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/event_export.h CosEvent/CEC_Dispatching.i \ CosEvent/CEC_Dispatching_Task.h \ $(ACE_ROOT)/ace/Task.h \ @@ -3107,8 +3054,9 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3125,16 +3073,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_Dispatching_Task.i \ CosEvent/CEC_MT_Dispatching.i @@ -3143,7 +3085,7 @@ realclean: clean CosEvent/CEC_Reactive_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3326,9 +3268,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ CosEvent/CEC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_ConsumerControl.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/event_export.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -3338,10 +3280,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3358,27 +3299,21 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -3500,7 +3435,7 @@ realclean: clean CosEvent/CEC_Reactive_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_SupplierControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3683,9 +3618,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ CosEvent/CEC_SupplierControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_SupplierControl.i CosEvent/CEC_EventChannel.h \ CosEvent/CEC_Factory.h CosEvent/event_export.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -3695,10 +3630,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3715,27 +3649,21 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ CosEvent/CEC_SupplierAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ CosEvent/CEC_ProxyPullConsumer.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_SupplierAdmin.i \ @@ -3847,7 +3775,7 @@ realclean: clean .obj/CEC_Pulling_Strategy.o .obj/CEC_Pulling_Strategy.so .shobj/CEC_Pulling_Strategy.o .shobj/CEC_Pulling_Strategy.so: CosEvent/CEC_Pulling_Strategy.cpp \ CosEvent/CEC_Pulling_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3858,12 +3786,12 @@ realclean: clean CosEvent/CEC_Reactive_Pulling_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ CosEvent/CEC_Pulling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ + CosEvent/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ CosEvent/CEC_Pulling_Strategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4042,14 +3970,13 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_Pulling_Strategy.i \ CosEvent/CEC_ProxyPullConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4066,16 +3993,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/event_export.h CosEvent/CEC_ProxyPullConsumer.i \ CosEvent/CEC_EventChannel.h CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -4086,15 +4007,15 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ CosEvent/CEC_Factory.i CosEvent/CEC_Defaults.h \ CosEvent/CEC_EventChannel.i CosEvent/CEC_SupplierAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ CosEvent/CEC_SupplierAdmin.i CosEvent/CEC_ConsumerAdmin.h \ CosEvent/CEC_ProxyPushSupplier.h CosEvent/CEC_ProxyPushSupplier.i \ @@ -4424,9 +4345,9 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ CosEvent/CEC_Default_Factory.i CosEvent/CEC_MT_Dispatching.h \ CosEvent/CEC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ CosEvent/CEC_Dispatching.i CosEvent/CEC_Dispatching_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ @@ -4473,8 +4394,9 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4491,33 +4413,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_ProxyPushSupplier.i CosEvent/CEC_Dispatching_Task.i \ CosEvent/CEC_MT_Dispatching.i \ CosEvent/CEC_Reactive_Pulling_Strategy.h \ CosEvent/CEC_Pulling_Strategy.h CosEvent/CEC_Pulling_Strategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ CosEvent/CEC_Reactive_Pulling_Strategy.i CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ CosEvent/CEC_ProxyPullSupplier.h CosEvent/CEC_ProxyPullSupplier.i \ CosEvent/CEC_ConsumerAdmin.i CosEvent/CEC_SupplierAdmin.h \ CosEvent/CEC_ProxyPushConsumer.h CosEvent/CEC_ProxyPushConsumer.i \ @@ -4529,39 +4445,39 @@ realclean: clean CosEvent/CEC_Reactive_SupplierControl.h \ CosEvent/CEC_SupplierControl.h CosEvent/CEC_SupplierControl.i \ CosEvent/CEC_Reactive_SupplierControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Delayed_Changes.h \ + ESF/ESF_Busy_Lock.h \ + ESF/ESF_Busy_Lock.i \ + ESF/ESF_Busy_Lock.cpp \ + ESF/ESF_Delayed_Changes.i \ + ESF/ESF_Delayed_Changes.cpp \ + ESF/ESF_Defaults.h \ + ESF/ESF_Delayed_Command.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h \ + ESF/ESF_Delayed_Command.i \ + ESF/ESF_Delayed_Command.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ + ESF/ESF_Copy_On_Read.h \ + ESF/ESF_Copy_On_Read.i \ + ESF/ESF_Copy_On_Read.cpp \ + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Proxy_RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp \ + ESF/ESF_Proxy_RB_Tree.i \ + ESF/ESF_Proxy_RB_Tree.cpp \ $(ACE_ROOT)/ace/Arg_Shifter.h \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i @@ -4761,11 +4677,10 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEvent/event_export.h \ + CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4782,20 +4697,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ CosEvent/CEC_Defaults.h CosEvent/CEC_EventChannel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ @@ -4817,11 +4726,11 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i \ + CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Default_Factory.h \ + CosEvent/CEC_Factory.h \ + CosEvent/CEC_Defaults.h \ + CosEvent/CEC_Default_Factory.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -5183,7 +5092,7 @@ realclean: clean .obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \ CosEventChannelAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - CosEventCommS.h CosEventCommC.h \ + CosEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -5365,7 +5274,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.i \ + CosEvent/event_export.h CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5382,8 +5291,6 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \ - CosEventCommS.i CosEventChannelAdminC.h CosEventChannelAdminC.i \ CosEventChannelAdminS_T.h CosEventChannelAdminS_T.i \ CosEventChannelAdminS_T.cpp CosEventChannelAdminS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ @@ -6015,8 +5922,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.h CosEventCommC.i \ - CosEventChannelAdminC.i \ + CosEvent/event_export.h CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing index be1ad40ad3a..063389b3189 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing @@ -109,7 +109,7 @@ realclean: clean LoadBalancing/LB_LeastLoaded.h \ $(ACE_ROOT)/ace/pre.h \ LoadBalancing/LB_LoadMap.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -291,7 +291,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -321,20 +321,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -367,13 +367,13 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_LeastLoaded.inl LoadBalancing/LB_Random.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_conf.h \ + PortableGroup/PG_conf.h \ $(TAO_ROOT)/tao/debug.h .obj/LB_LoadAlert.o .obj/LB_LoadAlert.so .shobj/LB_LoadAlert.o .shobj/LB_LoadAlert.so: LoadBalancing/LB_LoadAlert.cpp \ LoadBalancing/LB_LoadAlert.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -564,9 +564,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -608,38 +606,20 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + PortableGroupC.i \ LoadBalancing/LB_LoadAlert.inl .obj/LB_LoadAlertInfo.o .obj/LB_LoadAlertInfo.so .shobj/LB_LoadAlertInfo.o .shobj/LB_LoadAlertInfo.so: LoadBalancing/LB_LoadAlertInfo.cpp \ @@ -648,7 +628,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -827,7 +807,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -857,16 +837,12 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h + CosLoadBalancingC.i \ + PortableGroup/PG_Operators.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i .obj/LB_LoadAlertMap.o .obj/LB_LoadAlertMap.so .shobj/LB_LoadAlertMap.o .shobj/LB_LoadAlertMap.so: LoadBalancing/LB_LoadAlertMap.cpp \ LoadBalancing/LB_LoadAlertMap.h \ @@ -875,7 +851,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ LoadBalancing/LB_LoadAlertInfo.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1054,7 +1030,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -1084,20 +1060,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -1132,7 +1108,7 @@ realclean: clean .obj/LB_LoadAlert_Handler.o .obj/LB_LoadAlert_Handler.so .shobj/LB_LoadAlert_Handler.o .shobj/LB_LoadAlert_Handler.so: LoadBalancing/LB_LoadAlert_Handler.cpp \ LoadBalancing/LB_LoadAlert_Handler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ @@ -1324,9 +1300,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1368,44 +1342,18 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ $(TAO_ROOT)/tao/debug.h .obj/LB_LoadListMap.o .obj/LB_LoadListMap.so .shobj/LB_LoadListMap.o .shobj/LB_LoadListMap.so: LoadBalancing/LB_LoadListMap.cpp \ LoadBalancing/LB_LoadListMap.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1587,7 +1535,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -1617,20 +1565,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -1666,7 +1614,7 @@ realclean: clean .obj/LB_LoadManager.o .obj/LB_LoadManager.so .shobj/LB_LoadManager.o .shobj/LB_LoadManager.so: LoadBalancing/LB_LoadManager.cpp \ LoadBalancing/LB_LoadManager.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -1857,9 +1805,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1901,44 +1847,26 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ + PortableGroup/PG_Location_Hash.h \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ - LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -1972,17 +1900,37 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_MonitorMap.h LoadBalancing/LB_LoadListMap.h \ LoadBalancing/LB_Pull_Handler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h \ + PortableGroup/PG_PropertyManager.h \ + PortableGroup/PG_Default_Property_Validator.h \ + PortableGroupS.h \ + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/GIOPS.h \ + $(TAO_ROOT)/tao/GIOPS_T.h \ + $(TAO_ROOT)/tao/GIOPS_T.i \ + $(TAO_ROOT)/tao/GIOPS_T.cpp \ + $(TAO_ROOT)/tao/GIOPS.i \ + PortableGroupS_T.h \ + PortableGroupS_T.i \ + PortableGroupS_T.cpp \ + PortableGroupS.i \ + PortableGroup/PG_GenericFactory.h \ + PortableGroup/PG_Factory_Map.h \ + PortableGroup/PG_Factory_Set.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h \ + PortableGroup/PG_ObjectGroupManager.h \ + PortableGroup/PG_ObjectGroup_Map.h \ + PortableGroup/PG_MemberInfo.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -2000,20 +1948,20 @@ realclean: clean $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h \ + PortableGroup/PG_Location_Map.h \ LoadBalancing/LB_MemberLocator.h LoadBalancing/LB_LoadAlert_Handler.h \ LoadBalancing/LB_RoundRobin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h \ + LoadBalancing/LB_Location_Index_Map.h \ LoadBalancing/LB_Random.h LoadBalancing/LB_LeastLoaded.h \ LoadBalancing/LB_LoadMap.h LoadBalancing/LB_LeastLoaded.inl \ LoadBalancing/LB_conf.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_conf.h \ + PortableGroup/PG_Property_Utils.h \ + PortableGroup/PG_conf.h \ $(TAO_ROOT)/tao/debug.h .obj/LB_LoadMap.o .obj/LB_LoadMap.so .shobj/LB_LoadMap.o .shobj/LB_LoadMap.so: LoadBalancing/LB_LoadMap.cpp LoadBalancing/LB_LoadMap.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2195,7 +2143,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -2225,20 +2173,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -2274,7 +2222,7 @@ realclean: clean .obj/LB_Location_Index_Map.o .obj/LB_Location_Index_Map.so .shobj/LB_Location_Index_Map.o .shobj/LB_Location_Index_Map.so: LoadBalancing/LB_Location_Index_Map.cpp \ LoadBalancing/LB_Location_Index_Map.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2456,7 +2404,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -2486,15 +2434,15 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ + PortableGroupC.i \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ @@ -2666,7 +2614,7 @@ realclean: clean $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ LoadBalancing/LB_LoadManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -2724,9 +2672,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -2766,44 +2712,26 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ + PortableGroup/PG_Location_Hash.h \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ - LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -2837,17 +2765,37 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_MonitorMap.h LoadBalancing/LB_LoadListMap.h \ LoadBalancing/LB_Pull_Handler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h \ + PortableGroup/PG_PropertyManager.h \ + PortableGroup/PG_Default_Property_Validator.h \ + PortableGroupS.h \ + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/GIOPS.h \ + $(TAO_ROOT)/tao/GIOPS_T.h \ + $(TAO_ROOT)/tao/GIOPS_T.i \ + $(TAO_ROOT)/tao/GIOPS_T.cpp \ + $(TAO_ROOT)/tao/GIOPS.i \ + PortableGroupS_T.h \ + PortableGroupS_T.i \ + PortableGroupS_T.cpp \ + PortableGroupS.i \ + PortableGroup/PG_GenericFactory.h \ + PortableGroup/PG_Factory_Map.h \ + PortableGroup/PG_Factory_Set.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h \ + PortableGroup/PG_ObjectGroupManager.h \ + PortableGroup/PG_ObjectGroup_Map.h \ + PortableGroup/PG_MemberInfo.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -2865,13 +2813,13 @@ realclean: clean $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h \ + PortableGroup/PG_Location_Map.h \ $(TAO_ROOT)/tao/debug.h .obj/LB_MonitorMap.o .obj/LB_MonitorMap.so .shobj/LB_MonitorMap.o .shobj/LB_MonitorMap.so: LoadBalancing/LB_MonitorMap.cpp \ LoadBalancing/LB_LoadMap.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -3053,7 +3001,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -3083,20 +3031,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -3136,7 +3084,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ LoadBalancing/LB_MonitorMap.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3315,7 +3263,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -3345,20 +3293,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroup/PG_Location_Hash.h \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl \ + PortableGroupC.i \ + PortableGroup/PG_Location_Hash.inl \ + PortableGroup/PG_Location_Equal_To.h \ + PortableGroup/PG_Operators.h \ + PortableGroup/PG_Location_Equal_To.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -3391,7 +3339,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_LoadManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -3413,12 +3361,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ + LoadBalancing/LB_LoadListMap.h \ + PortableGroup/PG_PropertyManager.h \ + PortableGroup/PG_Default_Property_Validator.h \ + PortableGroupS.h \ + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ $(TAO_ROOT)/tao/IOPS.h \ $(TAO_ROOT)/tao/IOPS_T.h \ $(TAO_ROOT)/tao/IOPS_T.i \ @@ -3429,27 +3385,19 @@ realclean: clean $(TAO_ROOT)/tao/GIOPS_T.i \ $(TAO_ROOT)/tao/GIOPS_T.cpp \ $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ - LoadBalancing/LB_LoadAlertMap.h LoadBalancing/LB_LoadAlertInfo.h \ - LoadBalancing/LB_LoadListMap.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h \ + PortableGroupS_T.h \ + PortableGroupS_T.i \ + PortableGroupS_T.cpp \ + PortableGroupS.i \ + PortableGroup/PG_GenericFactory.h \ + PortableGroup/PG_Factory_Map.h \ + PortableGroup/PG_Factory_Set.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h \ + PortableGroup/PG_ObjectGroupManager.h \ + PortableGroup/PG_ObjectGroup_Map.h \ + PortableGroup/PG_MemberInfo.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -3467,12 +3415,12 @@ realclean: clean $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h \ + PortableGroup/PG_Location_Map.h \ $(TAO_ROOT)/tao/debug.h .obj/LB_Random.o .obj/LB_Random.so .shobj/LB_Random.o .shobj/LB_Random.so: LoadBalancing/LB_Random.cpp LoadBalancing/LB_Random.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -3654,7 +3602,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -3684,15 +3632,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i + CosLoadBalancingC.i .obj/LB_RoundRobin.o .obj/LB_RoundRobin.so .shobj/LB_RoundRobin.o .shobj/LB_RoundRobin.so: LoadBalancing/LB_RoundRobin.cpp \ LoadBalancing/LB_RoundRobin.h \ @@ -3738,8 +3678,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + LoadBalancing/LB_Location_Index_Map.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3880,7 +3820,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -3910,15 +3850,15 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosLoadBalancingC.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ + PortableGroupC.i \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ @@ -3950,17 +3890,17 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/PG_conf.h \ + PortableGroup/PG_conf.h \ $(TAO_ROOT)/tao/debug.h .obj/LB_ClientComponent.o .obj/LB_ClientComponent.so .shobj/LB_ClientComponent.o .shobj/LB_ClientComponent.so: LoadBalancing/LB_ClientComponent.cpp \ LoadBalancing/LB_ClientComponent.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.h \ + LB_ORTC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4168,7 +4108,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.i \ + LB_ORTC.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -4507,7 +4447,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -4537,7 +4477,7 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -4567,15 +4507,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i + CosLoadBalancingC.i .obj/LB_ServerRequestInterceptor.o .obj/LB_ServerRequestInterceptor.so .shobj/LB_ServerRequestInterceptor.o .shobj/LB_ServerRequestInterceptor.so: \ LoadBalancing/LB_ServerRequestInterceptor.cpp \ @@ -4734,7 +4666,7 @@ realclean: clean $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ LoadBalancing/LB_LoadAlert.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -4787,9 +4719,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -4817,38 +4747,20 @@ realclean: clean $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/ObjectIDList.h \ $(TAO_ROOT)/tao/ObjectIDList.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + PortableGroupC.i \ LoadBalancing/LB_LoadAlert.inl \ $(TAO_ROOT)/tao/debug.h @@ -4858,7 +4770,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5037,7 +4949,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -5067,18 +4979,10 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ + CosLoadBalancingC.i \ LoadBalancing/LB_ObjectReferenceFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.i \ + LB_ORTC.h \ + LB_ORTC.i \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ @@ -5114,7 +5018,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_LoadAlert.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -5136,30 +5040,18 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + PortableGroupC.i \ LoadBalancing/LB_LoadAlert.inl \ $(TAO_ROOT)/tao/debug.h @@ -5167,7 +5059,7 @@ realclean: clean LoadBalancing/LB_ObjectReferenceFactory.cpp \ LoadBalancing/LB_ObjectReferenceFactory.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.h \ + LB_ORTC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -5349,7 +5241,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ $(TAO_ROOT)/tao/Messaging/MessagingC.h \ @@ -5379,17 +5271,9 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ + LB_ORTC.i \ + CosLoadBalancingC.h \ + CosLoadBalancingC.i \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ @@ -5430,7 +5314,7 @@ realclean: clean LoadBalancing/LB_ORBInitializer.h \ $(ACE_ROOT)/ace/pre.h \ LoadBalancing/LB_LoadAlert.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -5621,9 +5505,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -5665,49 +5547,31 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + PortableGroupC.i \ LoadBalancing/LB_LoadAlert.inl LoadBalancing/LB_IORInterceptor.h \ LoadBalancing/LB_ServerRequestInterceptor.h .obj/LB_Component.o .obj/LB_Component.so .shobj/LB_Component.o .shobj/LB_Component.so: LoadBalancing/LB_Component.cpp \ LoadBalancing/LB_Component.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ + LoadBalancing/LoadBalancing_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.h \ + LB_ORTC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5915,7 +5779,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LB_ORTC.i \ + LB_ORTC.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -5940,7 +5804,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ LoadBalancing/LB_ORBInitializer.h LoadBalancing/LB_LoadAlert.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -5962,40 +5826,20 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ + CosLoadBalancingC.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i \ + PortableGroupC.h \ + PortableGroup/portablegroup_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i \ + PortableGroupC.i \ LoadBalancing/LB_LoadAlert.inl .obj/LB_CPU_Monitor.o .obj/LB_CPU_Monitor.so .shobj/LB_CPU_Monitor.o .shobj/LB_CPU_Monitor.so: LoadBalancing/LB_CPU_Monitor.cpp \ @@ -6005,7 +5849,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.h \ + CosLoadBalancingS.h \ $(TAO_ROOT)/tao/Messaging/MessagingS.h \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ $(TAO_ROOT)/tao/Messaging/messaging_export.h \ @@ -6193,9 +6037,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -6237,38 +6079,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/PortableGroupS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosLoadBalancingS.i + LoadBalancing/LoadBalancing_export.h \ + CosLoadBalancingC.i \ + CosLoadBalancingS_T.h \ + CosLoadBalancingS_T.i \ + CosLoadBalancingS_T.cpp \ + CosLoadBalancingS.i .obj/CosLoadBalancingC.o .obj/CosLoadBalancingC.so .shobj/CosLoadBalancingC.o .shobj/CosLoadBalancingC.so: CosLoadBalancingC.cpp CosLoadBalancingC.h \ $(ACE_ROOT)/ace/pre.h \ @@ -6483,11 +6299,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/TAO_ExtC.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ - PortableGroupC.h PortableGroup/portablegroup_export.h CosNamingC.h \ - Naming/naming_export.h CosNamingC.i \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - PortableGroupC.i CosLoadBalancingC.i \ + CosLoadBalancingC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -6818,7 +6630,7 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/MessagingS_T.i \ $(TAO_ROOT)/tao/Messaging/MessagingS_T.cpp \ $(TAO_ROOT)/tao/Messaging/MessagingS.i \ - PortableGroupS.h CosNamingS.h CosNamingC.h \ + CosLoadBalancingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -6860,23 +6672,6 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - Naming/naming_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \ - CosNamingS_T.cpp CosNamingS.i \ - $(TAO_ROOT)/tao/IOPS.h \ - $(TAO_ROOT)/tao/IOPS_T.h \ - $(TAO_ROOT)/tao/IOPS_T.i \ - $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - $(TAO_ROOT)/tao/GIOPS.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/GIOPS_T.h \ - $(TAO_ROOT)/tao/GIOPS_T.i \ - $(TAO_ROOT)/tao/GIOPS_T.cpp \ - $(TAO_ROOT)/tao/GIOPS.i \ - PortableGroupC.h PortableGroup/portablegroup_export.h \ - PortableGroupC.i PortableGroupS_T.h PortableGroupS_T.i \ - PortableGroupS_T.cpp PortableGroupS.i CosLoadBalancingC.h \ LoadBalancing/LoadBalancing_export.h CosLoadBalancingC.i \ CosLoadBalancingS_T.h CosLoadBalancingS_T.i CosLoadBalancingS_T.cpp \ CosLoadBalancingS.i \ @@ -6947,6 +6742,8 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Service_Context.inl \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming index 62684a31853..69f5ef6ddb1 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNaming +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNaming @@ -89,8 +89,8 @@ realclean: clean .obj/Naming_Context_Interface.o .obj/Naming_Context_Interface.so .shobj/Naming_Context_Interface.o .shobj/Naming_Context_Interface.so: Naming/Naming_Context_Interface.cpp \ Naming/Naming_Context_Interface.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -272,8 +272,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -290,18 +290,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h .obj/Hash_Naming_Context.o .obj/Hash_Naming_Context.so .shobj/Hash_Naming_Context.o .shobj/Hash_Naming_Context.so: Naming/Hash_Naming_Context.cpp \ Naming/Hash_Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -483,8 +483,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -501,18 +501,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/nsconf.h .obj/Persistent_Naming_Context.o .obj/Persistent_Naming_Context.so .shobj/Persistent_Naming_Context.o .shobj/Persistent_Naming_Context.so: Naming/Persistent_Naming_Context.cpp \ Naming/Persistent_Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ Naming/Hash_Naming_Context.h Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -694,8 +694,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -712,10 +712,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/Persistent_Entries.h \ $(ACE_ROOT)/ace/Hash_Map_With_Allocator_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -769,8 +769,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -942,8 +942,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -960,10 +960,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/Entries.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -1218,9 +1218,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h .obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \ @@ -1438,9 +1438,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h .obj/Persistent_Context_Index.o .obj/Persistent_Context_Index.so .shobj/Persistent_Context_Index.o .shobj/Persistent_Context_Index.so: Naming/Persistent_Context_Index.cpp \ @@ -1663,9 +1663,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ Naming/naming_export.h Naming/nsconf.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -1673,7 +1673,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ Naming/Persistent_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -1686,10 +1686,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ $(TAO_ROOT)/tao/debug.h .obj/Naming_Utils.o .obj/Naming_Utils.so .shobj/Naming_Utils.o .shobj/Naming_Utils.so: Naming/Naming_Utils.cpp Naming/Naming_Utils.h \ @@ -1875,11 +1875,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -1905,7 +1905,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1922,10 +1922,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h Naming/nsconf.h \ Naming/Transient_Naming_Context.h Naming/Hash_Naming_Context.h \ Naming/Entries.h \ @@ -2140,7 +2140,7 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Object_Loader.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2216,11 +2216,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -2245,8 +2245,8 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2263,11 +2263,11 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + Naming/nsconf.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -2464,8 +2464,8 @@ realclean: clean Naming/Storable_Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ Naming/Hash_Naming_Context.h Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingS.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2647,8 +2647,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + Naming/naming_export.h \ + CosNamingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2665,10 +2665,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ Naming/naming_export.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification index 05014355da0..b168603725e 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification @@ -533,17 +533,17 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/EventTypeSeq.h Notify/EventType.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/EventType.inl Notify/EventTypeSeq.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Event_Manager.inl Notify/ProxyConsumer.h Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -560,52 +560,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -622,8 +621,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -665,17 +664,17 @@ realclean: clean Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h Notify/ID_Factory.h Notify/ID_Factory.inl \ Notify/Proxy.inl Notify/Supplier.inl Notify/ProxyConsumer.inl \ Notify/ProxySupplier.h Notify/ProxySupplier.inl Notify/Event_Map_T.h \ Notify/Event_Map_Entry_T.h Notify/Event_Map_Entry_T.inl \ Notify/Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -693,9 +692,9 @@ realclean: clean Notify/Consumer.h Notify/Consumer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/POA_Helper.h Notify/POA_Helper.inl Notify/Admin.inl \ Notify/EventChannel.h Notify/AdminProperties.h \ Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ @@ -710,7 +709,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ Notify/Container_T.h Notify/Container.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ + NotifyExtC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -889,8 +888,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + Notify/notify_export.h \ + NotifyExtC.i \ Notify/Object.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -904,8 +903,8 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ Notify/Types.h Notify/QoSProperties.h Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -959,19 +958,19 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -987,59 +986,58 @@ realclean: clean $(ACE_ROOT)/ace/Copy_Disabled.h \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/POA_Helper.inl \ Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Admin.inl \ Notify/Proxy.h Notify/Proxy.inl Notify/EventChannel.h \ @@ -1240,9 +1238,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1292,8 +1290,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_Boolean.h Notify/Property_Boolean.inl \ Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ Notify/AdminProperties.inl @@ -1307,9 +1305,9 @@ realclean: clean Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1487,8 +1485,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1505,52 +1503,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -1567,8 +1564,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../Property_T.h Notify/Any/../Property_T.inl \ Notify/Any/../Property_T.cpp Notify/Any/../PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -1614,9 +1611,9 @@ realclean: clean Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../FilterAdmin.h Notify/Any/../ID_Factory.h \ Notify/Any/../ID_Factory.inl Notify/Any/../Proxy.inl \ Notify/Any/../Consumer.inl Notify/Any/../ProxySupplier.h \ @@ -1630,9 +1627,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1811,8 +1808,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + Notify/notify_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1829,23 +1826,22 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ Notify/Any/../ProxyConsumer_T.h Notify/Any/../Proxy_T.h \ Notify/Any/../Proxy.h Notify/Any/../Object_T.h Notify/Any/../Object.h \ Notify/Any/../Types.h Notify/Any/../QoSProperties.h \ Notify/Any/../PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1897,53 +1893,53 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../EventTypeSeq.h Notify/Any/../EventType.h \ Notify/Any/../EventType.inl Notify/Any/../EventTypeSeq.inl \ Notify/Any/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Any/../ID_Factory.h Notify/Any/../ID_Factory.inl \ Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Event.inl Notify/Any/../Proxy.inl \ Notify/Any/../Proxy_T.inl Notify/Any/../Proxy_T.cpp \ Notify/Any/../ProxyConsumer.h Notify/Any/../Supplier.h \ @@ -1951,16 +1947,16 @@ realclean: clean Notify/Any/../Peer.inl Notify/Any/../Supplier.inl \ Notify/Any/../ProxyConsumer.inl Notify/Any/../ProxyConsumer_T.inl \ Notify/Any/../ProxyConsumer_T.cpp Notify/Any/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Any/../Event_Manager.inl Notify/Any/../ProxySupplier.h \ Notify/Any/../ProxySupplier.inl Notify/Any/../Event_Map_T.h \ Notify/Any/../Event_Map_Entry_T.h Notify/Any/../Event_Map_Entry_T.inl \ Notify/Any/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Any/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1979,9 +1975,9 @@ realclean: clean Notify/Any/../Admin.h Notify/Any/../Container_T.h \ Notify/Any/../Container.h Notify/Any/../Container.inl \ Notify/Any/../Container_T.inl Notify/Any/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Any/../POA_Helper.h Notify/Any/../POA_Helper.inl \ Notify/Any/../Admin.inl Notify/Any/../AdminProperties.h \ Notify/Any/../Notify_Signal_Property_T.h \ @@ -1997,9 +1993,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2178,8 +2174,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + Notify/notify_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2196,23 +2192,22 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ Notify/Any/../ProxySupplier_T.h Notify/Any/../Proxy_T.h \ Notify/Any/../Proxy.h Notify/Any/../Object_T.h Notify/Any/../Object.h \ Notify/Any/../Types.h Notify/Any/../QoSProperties.h \ Notify/Any/../PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -2264,53 +2259,53 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../EventTypeSeq.h Notify/Any/../EventType.h \ Notify/Any/../EventType.inl Notify/Any/../EventTypeSeq.inl \ Notify/Any/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Any/../ID_Factory.h Notify/Any/../ID_Factory.inl \ Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Event.inl Notify/Any/../Proxy.inl \ Notify/Any/../Proxy_T.inl Notify/Any/../Proxy_T.cpp \ Notify/Any/../ProxySupplier.h Notify/Any/../ProxySupplier.inl \ @@ -2335,17 +2330,17 @@ realclean: clean Notify/Any/../Method_Request_Dispatch_No_Filtering.inl \ Notify/Any/../Worker_Task.h Notify/Any/../Worker_Task.inl \ Notify/Any/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Any/../Event_Manager.inl Notify/Any/../ProxyConsumer.h \ Notify/Any/../Supplier.h Notify/Any/../Supplier.inl \ Notify/Any/../ProxyConsumer.inl Notify/Any/../Event_Map_T.h \ Notify/Any/../Event_Map_Entry_T.h Notify/Any/../Event_Map_Entry_T.inl \ Notify/Any/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Any/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -2363,9 +2358,9 @@ realclean: clean Notify/Any/../Admin.h Notify/Any/../Container_T.h \ Notify/Any/../Container.h Notify/Any/../Container.inl \ Notify/Any/../Container_T.inl Notify/Any/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Any/../POA_Helper.h Notify/Any/../POA_Helper.inl \ Notify/Any/../Admin.inl Notify/Any/../EventChannel.h \ Notify/Any/../AdminProperties.h \ @@ -2383,9 +2378,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2564,8 +2559,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2582,45 +2577,44 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Any/../ProxyConsumer_T.h Notify/Any/../Proxy_T.h \ Notify/Any/../Proxy.h Notify/Any/../Object_T.h Notify/Any/../Object.h \ Notify/Any/../Types.h Notify/Any/../QoSProperties.h \ @@ -2676,26 +2670,26 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../EventTypeSeq.h Notify/Any/../EventType.h \ Notify/Any/../EventType.inl Notify/Any/../EventTypeSeq.inl \ Notify/Any/../FilterAdmin.h Notify/Any/../ID_Factory.h \ Notify/Any/../ID_Factory.inl Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Event.inl Notify/Any/../Proxy.inl \ Notify/Any/../Proxy_T.inl Notify/Any/../Proxy_T.cpp \ Notify/Any/../ProxyConsumer.h Notify/Any/../Supplier.h \ @@ -2703,16 +2697,16 @@ realclean: clean Notify/Any/../Peer.inl Notify/Any/../Supplier.inl \ Notify/Any/../ProxyConsumer.inl Notify/Any/../ProxyConsumer_T.inl \ Notify/Any/../ProxyConsumer_T.cpp Notify/Any/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Any/../Event_Manager.inl Notify/Any/../ProxySupplier.h \ Notify/Any/../ProxySupplier.inl Notify/Any/../Event_Map_T.h \ Notify/Any/../Event_Map_Entry_T.h Notify/Any/../Event_Map_Entry_T.inl \ Notify/Any/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Any/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -2731,9 +2725,9 @@ realclean: clean Notify/Any/../Admin.h Notify/Any/../Container_T.h \ Notify/Any/../Container.h Notify/Any/../Container.inl \ Notify/Any/../Container_T.inl Notify/Any/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Any/../POA_Helper.h Notify/Any/../POA_Helper.inl \ Notify/Any/../Admin.inl Notify/Any/../AdminProperties.h \ Notify/Any/../Notify_Signal_Property_T.h \ @@ -2749,9 +2743,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2930,8 +2924,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2948,52 +2942,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../ProxySupplier_T.h Notify/Any/../Proxy_T.h \ Notify/Any/../Proxy.h Notify/Any/../Object_T.h Notify/Any/../Object.h \ Notify/Any/../Types.h Notify/Any/../QoSProperties.h \ @@ -3049,14 +3042,14 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../EventTypeSeq.h Notify/Any/../EventType.h \ Notify/Any/../EventType.inl Notify/Any/../EventTypeSeq.inl \ Notify/Any/../FilterAdmin.h Notify/Any/../ID_Factory.h \ @@ -3086,17 +3079,17 @@ realclean: clean Notify/Any/../Method_Request_Dispatch_No_Filtering.inl \ Notify/Any/../Worker_Task.h Notify/Any/../Worker_Task.inl \ Notify/Any/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Any/../Event_Manager.inl Notify/Any/../ProxyConsumer.h \ Notify/Any/../Supplier.h Notify/Any/../Supplier.inl \ Notify/Any/../ProxyConsumer.inl Notify/Any/../Event_Map_T.h \ Notify/Any/../Event_Map_Entry_T.h Notify/Any/../Event_Map_Entry_T.inl \ Notify/Any/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Any/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -3114,9 +3107,9 @@ realclean: clean Notify/Any/../Admin.h Notify/Any/../Container_T.h \ Notify/Any/../Container.h Notify/Any/../Container.inl \ Notify/Any/../Container_T.inl Notify/Any/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Any/../POA_Helper.h Notify/Any/../POA_Helper.inl \ Notify/Any/../Admin.inl Notify/Any/../EventChannel.h \ Notify/Any/../AdminProperties.h \ @@ -3133,7 +3126,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3312,13 +3305,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Any/../Consumer.h Notify/Any/../Peer.h \ Notify/Any/../Destroy_Callback.h Notify/Any/../EventTypeSeq.h \ Notify/Any/../EventType.h Notify/Any/../EventType.inl \ @@ -3388,66 +3380,66 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Any/../ID_Factory.h Notify/Any/../ID_Factory.inl \ Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Event.inl Notify/Any/../Proxy.inl \ Notify/Any/../Consumer.inl Notify/Any/../ProxySupplier.h \ Notify/Any/../ProxySupplier.inl Notify/Any/PushConsumer.inl \ @@ -3460,7 +3452,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3639,13 +3631,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Any/../Supplier.h Notify/Any/../Peer.h \ Notify/Any/../Destroy_Callback.h Notify/Any/../EventTypeSeq.h \ Notify/Any/../EventType.h Notify/Any/../EventType.inl \ @@ -3715,66 +3706,66 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Any/../QoSProperties.inl Notify/Any/../Object.inl \ Notify/Any/../Refcountable.h Notify/Any/../Refcountable.inl \ Notify/Any/../Object_T.inl Notify/Any/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Any/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Any/../ID_Factory.h Notify/Any/../ID_Factory.inl \ Notify/Any/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Any/../Event.inl Notify/Any/../Proxy.inl \ Notify/Any/../Supplier.inl Notify/Any/PushSupplier.inl @@ -3785,7 +3776,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -3964,7 +3955,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -3980,14 +3971,14 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.i \ Notify/Property.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + Notify/notify_export.h \ + NotifyExtC.i \ Notify/Property_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + CosNotificationC.i \ Notify/Property_T.inl Notify/Property_T.cpp Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -4035,8 +4026,8 @@ realclean: clean $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -4053,52 +4044,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Types.h Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Method_Request.inl \ Notify/Notify_Extensions.h Notify/AdminProperties.h \ @@ -4245,7 +4235,7 @@ realclean: clean $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4297,21 +4287,20 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosNotifyFilterC.h \ + CosNotifyCommC.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosNotifyChannelAdminC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Builder.inl \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ @@ -4348,8 +4337,8 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op.i \ Notify/ID_Factory.inl Notify/POA_Helper.inl \ Notify/EventChannelFactory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ @@ -4357,34 +4346,34 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Container_T.h Notify/Container.h Notify/Object.h \ Notify/QoSProperties.h Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -4429,32 +4418,32 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Destroy_Callback.h Notify/EventChannelFactory.inl \ Notify/EventChannel.h Notify/AdminProperties.h \ Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ Notify/AdminProperties.inl Notify/EventChannel.inl \ Notify/SupplierAdmin.h Notify/Admin.h Notify/FilterAdmin.h \ Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Admin.inl \ Notify/SupplierAdmin.inl Notify/ConsumerAdmin.h \ @@ -4503,9 +4492,9 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ Notify/ThreadPool_Task.inl Notify/Buffering_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Buffering_Strategy.inl Notify/FilterFactory.h \ Notify/Notify_Service.h Notify/Service.h Notify/Notify_Service.inl \ Notify/Any/AnyEvent.h Notify/Any/../notify_export.h \ @@ -4559,7 +4548,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4738,13 +4727,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Peer.h Notify/Destroy_Callback.h Notify/EventTypeSeq.h \ Notify/EventType.h Notify/EventType.inl Notify/EventTypeSeq.inl \ Notify/Peer.inl Notify/Proxy.h Notify/Object_T.h Notify/Object.h \ @@ -4810,64 +4798,64 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl Notify/Consumer.inl \ Notify/ProxySupplier.h Notify/ProxySupplier.inl \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \ @@ -4875,16 +4863,16 @@ realclean: clean $(TAO_ROOT)/tao/debug.h \ Notify/Admin.h Notify/Container_T.h Notify/Container.h \ Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -4908,9 +4896,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5089,8 +5077,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5107,48 +5095,47 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Admin.h Notify/Container_T.h Notify/Container.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Object.h Notify/Types.h Notify/QoSProperties.h \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -5204,19 +5191,19 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -5231,13 +5218,13 @@ realclean: clean $(ACE_ROOT)/ace/Copy_Disabled.h \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/POA_Helper.inl \ Notify/FilterAdmin.h Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Admin.inl \ Notify/Destroy_Callback.h Notify/ConsumerAdmin.inl Notify/Builder.h \ @@ -5255,7 +5242,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ + NotifyExtC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5434,8 +5421,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + Notify/notify_export.h \ + NotifyExtC.i \ Notify/Object.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5449,8 +5436,8 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ Notify/Types.h Notify/QoSProperties.h Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -5547,65 +5534,64 @@ realclean: clean $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Method_Request.inl Notify/Worker_Task.inl \ Notify/ThreadPool_Task.inl Notify/Buffering_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Buffering_Strategy.inl Notify/POA_Helper.h Notify/ID_Factory.h \ Notify/ID_Factory.inl Notify/POA_Helper.inl @@ -5617,9 +5603,9 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/Copy_Disabled.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -5797,8 +5783,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5815,52 +5801,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -5877,8 +5862,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -5922,9 +5907,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6103,8 +6088,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6121,47 +6106,46 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Container_T.h Notify/Container.h Notify/Object.h \ Notify/Types.h Notify/QoSProperties.h Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -6217,19 +6201,19 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -6248,13 +6232,13 @@ realclean: clean Notify/AdminProperties.inl Notify/EventChannel.inl Notify/Proxy.h \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl Notify/Admin.h Notify/Admin.inl \ Notify/EventChannelFactory.h Notify/EventChannelFactory.inl \ Notify/Notify_Service.h Notify/Service.h Notify/Notify_Service.inl \ @@ -6302,9 +6286,9 @@ realclean: clean $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Method_Request.inl Notify/Worker_Task.inl \ Notify/ThreadPool_Task.inl Notify/Buffering_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Buffering_Strategy.inl .obj/EventChannelFactory.o .obj/EventChannelFactory.so .shobj/EventChannelFactory.o .shobj/EventChannelFactory.so: Notify/EventChannelFactory.cpp \ @@ -6314,9 +6298,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6495,8 +6479,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6513,48 +6497,47 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Container_T.h Notify/Container.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Object.h Notify/Types.h Notify/QoSProperties.h \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -6610,19 +6593,19 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -6640,13 +6623,13 @@ realclean: clean Notify/Builder.h Notify/Builder.inl Notify/Proxy.h \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl Notify/Admin.h Notify/Admin.inl \ Notify/EventChannel.h Notify/AdminProperties.h \ Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ @@ -6659,7 +6642,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6838,8 +6821,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/EventType.inl .obj/EventTypeSeq.o .obj/EventTypeSeq.so .shobj/EventTypeSeq.o .shobj/EventTypeSeq.so: Notify/EventTypeSeq.cpp Notify/EventTypeSeq.h \ @@ -6849,7 +6832,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ Notify/EventType.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -7028,8 +7011,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/EventType.inl Notify/EventTypeSeq.inl .obj/Factory.o .obj/Factory.so .shobj/Factory.o .shobj/Factory.so: Notify/Factory.cpp Notify/Factory.h \ @@ -7218,7 +7201,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/Factory.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -7227,17 +7210,17 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ Notify/Notify_Service.h Notify/Service.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -7262,11 +7245,11 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7283,49 +7266,48 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_Service.inl Notify/EventChannelFactory.h \ Notify/Container_T.h Notify/Container.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Object.h Notify/QoSProperties.h Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -7357,13 +7339,13 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -7381,13 +7363,13 @@ realclean: clean Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ Notify/AdminProperties.inl Notify/EventChannel.inl Notify/Admin.h \ Notify/FilterAdmin.h Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Admin.inl \ Notify/Proxy.h Notify/Proxy.inl Notify/SupplierAdmin.h \ @@ -7463,10 +7445,10 @@ realclean: clean .obj/FilterAdmin.o .obj/FilterAdmin.so .shobj/FilterAdmin.o .shobj/FilterAdmin.so: Notify/FilterAdmin.cpp Notify/FilterAdmin.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -7648,8 +7630,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7666,30 +7648,29 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -7725,27 +7706,27 @@ realclean: clean Notify/ID_Factory.h Notify/notify_export.h Notify/Types.h \ Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -7762,8 +7743,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h Notify/PropertySeq.inl Notify/Event.inl \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \ @@ -8017,9 +7998,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8152,8 +8133,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -8170,52 +8151,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -8232,8 +8212,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -8330,9 +8310,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8465,8 +8445,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -8483,52 +8463,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -8545,8 +8524,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -8589,25 +8568,25 @@ realclean: clean Notify/Object.h Notify/QoSProperties.h Notify/Property_Boolean.h \ Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h Notify/ID_Factory.h \ Notify/ID_Factory.inl Notify/Proxy.inl Notify/ProxySupplier.inl \ Notify/Consumer.h Notify/Peer.h Notify/Destroy_Callback.h \ Notify/Peer.inl Notify/Consumer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -8684,9 +8663,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8819,8 +8798,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -8837,52 +8816,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -8899,8 +8877,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -8944,25 +8922,25 @@ realclean: clean Notify/Object.h Notify/QoSProperties.h Notify/Property_Boolean.h \ Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h Notify/ID_Factory.h \ Notify/ID_Factory.inl Notify/Proxy.inl Notify/ProxySupplier.inl \ Notify/Consumer.h Notify/Peer.h Notify/Destroy_Callback.h \ Notify/Peer.inl Notify/Consumer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -9176,9 +9154,9 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ Notify/Types.h Notify/QoSProperties.h Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -9229,8 +9207,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/POA_Helper.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ @@ -9239,58 +9217,57 @@ realclean: clean $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Method_Request.inl Notify/Worker_Task.inl Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ @@ -9311,7 +9288,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -9490,18 +9467,18 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Method_Request.h \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -9518,52 +9495,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -9580,8 +9556,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -9620,9 +9596,9 @@ realclean: clean Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Method_Request.inl Notify/Method_Request_Lookup.inl \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Event_Map_T.h Notify/EventType.h Notify/EventType.inl \ Notify/Event_Map_Entry_T.h Notify/Event_Map_Entry_T.inl \ Notify/Event_Map_Entry_T.cpp Notify/Properties.h \ @@ -9635,24 +9611,24 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ Notify/Properties.inl Notify/Factory.h Notify/Factory.inl \ - Notify/EventTypeSeq.h Notify/EventTypeSeq.inl Notify/Event_Map_T.inl \ - Notify/Event_Map_T.cpp Notify/ProxySupplier.h Notify/Proxy.h \ - Notify/Object_T.h Notify/Object.h Notify/QoSProperties.h \ - Notify/Property_Boolean.h Notify/Property_Boolean.inl \ - Notify/QoSProperties.inl Notify/Object.inl Notify/Object_T.inl \ - Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - Notify/FilterAdmin.h Notify/ID_Factory.h Notify/ID_Factory.inl \ - Notify/Proxy.inl Notify/ProxySupplier.inl Notify/ProxyConsumer.h \ - Notify/Supplier.h Notify/Peer.h Notify/Destroy_Callback.h \ - Notify/Peer.inl Notify/Supplier.inl Notify/ProxyConsumer.inl \ - Notify/Admin.h Notify/Container_T.h Notify/Container.h \ - Notify/Container.inl Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + Notify/Event_Map_T.inl Notify/Event_Map_T.cpp Notify/ProxySupplier.h \ + Notify/Proxy.h Notify/Object_T.h Notify/Object.h \ + Notify/QoSProperties.h Notify/Property_Boolean.h \ + Notify/Property_Boolean.inl Notify/QoSProperties.inl \ + Notify/Object.inl Notify/Object_T.inl Notify/Object_T.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + Notify/EventTypeSeq.h Notify/EventTypeSeq.inl Notify/FilterAdmin.h \ + Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Proxy.inl \ + Notify/ProxySupplier.inl Notify/ProxyConsumer.h Notify/Supplier.h \ + Notify/Peer.h Notify/Destroy_Callback.h Notify/Peer.inl \ + Notify/Supplier.inl Notify/ProxyConsumer.inl Notify/Admin.h \ + Notify/Container_T.h Notify/Container.h Notify/Container.inl \ + Notify/Container_T.inl Notify/Container_T.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/POA_Helper.h Notify/POA_Helper.inl Notify/Admin.inl \ Notify/EventChannel.h Notify/AdminProperties.h \ Notify/Notify_Signal_Property_T.h Notify/Notify_Signal_Property_T.cpp \ @@ -9718,9 +9694,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -9853,8 +9829,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -9871,52 +9847,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -9933,8 +9908,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -10014,9 +9989,9 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.cpp \ Notify/Worker_Task.h Notify/Worker_Task.inl \ Notify/ThreadPool_Task.inl Notify/Buffering_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Buffering_Strategy.inl .obj/Notify_Service.o .obj/Notify_Service.so .shobj/Notify_Service.o .shobj/Notify_Service.so: Notify/Notify_Service.cpp Notify/Notify_Service.h \ @@ -10139,9 +10114,9 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10230,8 +10205,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -10248,48 +10223,47 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Notify_Service.inl Notify/Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Builder.inl Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -10375,7 +10349,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10554,8 +10528,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Destroy_Callback.h Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Peer.inl \ Notify/Proxy.h Notify/Object_T.h Notify/Object.h \ @@ -10621,83 +10595,82 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl \ $(TAO_ROOT)/tao/debug.h \ Notify/Admin.h Notify/Container_T.h Notify/Container.h \ Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -11070,7 +11043,7 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -11115,8 +11088,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Properties.inl \ $(TAO_ROOT)/tao/debug.h @@ -11126,7 +11099,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -11305,8 +11278,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -11348,7 +11321,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -11527,8 +11500,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Property_Boolean.inl Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -11761,9 +11734,9 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ Notify/Types.h Notify/QoSProperties.h Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -11814,83 +11787,82 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl Notify/Peer.h \ Notify/Destroy_Callback.h Notify/Peer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -11928,9 +11900,9 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -12102,8 +12074,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12120,52 +12092,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -12182,8 +12153,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -12226,9 +12197,9 @@ realclean: clean Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h Notify/ID_Factory.h Notify/ID_Factory.inl \ Notify/Proxy.inl Notify/Supplier.inl Notify/ProxyConsumer.inl \ $(TAO_ROOT)/tao/debug.h \ @@ -12236,16 +12207,16 @@ realclean: clean Notify/Notify_Signal_Property_T.cpp Notify/AdminProperties.inl \ Notify/Admin.h Notify/Container_T.h Notify/Container.h \ Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -12280,9 +12251,9 @@ realclean: clean Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -12460,8 +12431,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12478,52 +12449,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -12540,8 +12510,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -12582,9 +12552,9 @@ realclean: clean Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h Notify/ID_Factory.h \ Notify/ID_Factory.inl Notify/Proxy.inl Notify/ProxySupplier.inl \ @@ -12594,17 +12564,17 @@ realclean: clean Notify/Method_Request.inl \ Notify/Method_Request_Dispatch_No_Filtering.inl \ Notify/Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Event_Manager.inl Notify/ProxyConsumer.h Notify/Supplier.h \ Notify/Peer.h Notify/Destroy_Callback.h Notify/Peer.inl \ Notify/Supplier.inl Notify/ProxyConsumer.inl Notify/Event_Map_T.h \ Notify/Event_Map_Entry_T.h Notify/Event_Map_Entry_T.inl \ Notify/Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -12621,9 +12591,9 @@ realclean: clean Notify/Consumer.h Notify/Consumer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/POA_Helper.h Notify/POA_Helper.inl Notify/Admin.inl \ Notify/EventChannel.h Notify/EventChannel.inl \ Notify/EventChannelFactory.h Notify/EventChannelFactory.inl \ @@ -12638,7 +12608,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ Notify/PropertySeq.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -12817,8 +12787,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -12869,8 +12839,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl .obj/Reactive_Task.o .obj/Reactive_Task.so .shobj/Reactive_Task.o .shobj/Reactive_Task.so: Notify/Reactive_Task.cpp Notify/Reactive_Task.h \ @@ -12930,9 +12900,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -13065,8 +13035,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13083,52 +13053,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -13145,8 +13114,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -13287,7 +13256,7 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -13433,12 +13402,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13455,52 +13424,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -13517,8 +13485,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../Property_T.h Notify/Sequence/../Property_T.inl \ Notify/Sequence/../Property_T.cpp Notify/Sequence/../PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -13599,7 +13567,7 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -13745,15 +13713,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Sequence/../Method_Request.h \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.h \ $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13770,52 +13738,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -13832,8 +13799,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../Property_T.h Notify/Sequence/../Property_T.inl \ Notify/Sequence/../Property_T.cpp Notify/Sequence/../PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -13884,9 +13851,9 @@ realclean: clean Notify/Sequence/../Property_Boolean.inl \ Notify/Sequence/../QoSProperties.inl Notify/Sequence/../Object.inl \ Notify/Sequence/../Object_T.inl Notify/Sequence/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Sequence/../FilterAdmin.h Notify/Sequence/../ID_Factory.h \ Notify/Sequence/../ID_Factory.inl Notify/Sequence/../Proxy.inl \ Notify/Sequence/../Consumer.inl Notify/Sequence/../ProxySupplier.h \ @@ -13902,9 +13869,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -14083,8 +14050,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -14101,45 +14068,44 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Sequence/../ProxyConsumer_T.h Notify/Sequence/../Proxy_T.h \ Notify/Sequence/../Proxy.h Notify/Sequence/../Object_T.h \ Notify/Sequence/../Object.h Notify/Sequence/../Types.h \ @@ -14195,26 +14161,26 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../QoSProperties.inl Notify/Sequence/../Object.inl \ Notify/Sequence/../Refcountable.h Notify/Sequence/../Refcountable.inl \ Notify/Sequence/../Object_T.inl Notify/Sequence/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Sequence/../EventTypeSeq.h Notify/Sequence/../EventType.h \ Notify/Sequence/../EventType.inl Notify/Sequence/../EventTypeSeq.inl \ Notify/Sequence/../FilterAdmin.h Notify/Sequence/../ID_Factory.h \ Notify/Sequence/../ID_Factory.inl Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Event.inl Notify/Sequence/../Proxy.inl \ Notify/Sequence/../Proxy_T.inl Notify/Sequence/../Proxy_T.cpp \ Notify/Sequence/../ProxyConsumer.h Notify/Sequence/../Supplier.h \ @@ -14224,18 +14190,18 @@ realclean: clean Notify/Sequence/../ProxyConsumer_T.inl \ Notify/Sequence/../ProxyConsumer_T.cpp \ Notify/Sequence/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Sequence/../Event_Manager.inl \ Notify/Sequence/../ProxySupplier.h \ Notify/Sequence/../ProxySupplier.inl Notify/Sequence/../Event_Map_T.h \ Notify/Sequence/../Event_Map_Entry_T.h \ Notify/Sequence/../Event_Map_Entry_T.inl \ Notify/Sequence/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Sequence/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -14258,9 +14224,9 @@ realclean: clean Notify/Sequence/../Container_T.h Notify/Sequence/../Container.h \ Notify/Sequence/../Container.inl Notify/Sequence/../Container_T.inl \ Notify/Sequence/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Sequence/../POA_Helper.h Notify/Sequence/../POA_Helper.inl \ Notify/Sequence/../Admin.inl Notify/Sequence/../AdminProperties.h \ Notify/Sequence/../Notify_Signal_Property_T.h \ @@ -14280,9 +14246,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -14461,8 +14427,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -14479,45 +14445,44 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Sequence/../ProxySupplier_T.h Notify/Sequence/../Proxy_T.h \ Notify/Sequence/../Proxy.h Notify/Sequence/../Object_T.h \ Notify/Sequence/../Object.h Notify/Sequence/../Types.h \ @@ -14573,26 +14538,26 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../QoSProperties.inl Notify/Sequence/../Object.inl \ Notify/Sequence/../Refcountable.h Notify/Sequence/../Refcountable.inl \ Notify/Sequence/../Object_T.inl Notify/Sequence/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Sequence/../EventTypeSeq.h Notify/Sequence/../EventType.h \ Notify/Sequence/../EventType.inl Notify/Sequence/../EventTypeSeq.inl \ Notify/Sequence/../FilterAdmin.h Notify/Sequence/../ID_Factory.h \ Notify/Sequence/../ID_Factory.inl Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Event.inl Notify/Sequence/../Proxy.inl \ Notify/Sequence/../Proxy_T.inl Notify/Sequence/../Proxy_T.cpp \ Notify/Sequence/../ProxySupplier.h \ @@ -14621,9 +14586,9 @@ realclean: clean Notify/Sequence/../Method_Request_Dispatch_No_Filtering.inl \ Notify/Sequence/../Worker_Task.h Notify/Sequence/../Worker_Task.inl \ Notify/Sequence/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Sequence/../Event_Manager.inl \ Notify/Sequence/../ProxyConsumer.h Notify/Sequence/../Supplier.h \ Notify/Sequence/../Supplier.inl Notify/Sequence/../ProxyConsumer.inl \ @@ -14631,9 +14596,9 @@ realclean: clean Notify/Sequence/../Event_Map_Entry_T.h \ Notify/Sequence/../Event_Map_Entry_T.inl \ Notify/Sequence/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Sequence/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -14654,9 +14619,9 @@ realclean: clean Notify/Sequence/../Container_T.h Notify/Sequence/../Container.h \ Notify/Sequence/../Container.inl Notify/Sequence/../Container_T.inl \ Notify/Sequence/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Sequence/../POA_Helper.h Notify/Sequence/../POA_Helper.inl \ Notify/Sequence/../Admin.inl Notify/Sequence/../EventChannel.h \ Notify/Sequence/../AdminProperties.h \ @@ -14703,9 +14668,9 @@ realclean: clean $(ACE_ROOT)/ace/Event_Handler.i \ Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -14859,8 +14824,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -14877,52 +14842,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -14939,8 +14903,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../Property_T.h Notify/Sequence/../Property_T.inl \ Notify/Sequence/../Property_T.cpp Notify/Sequence/../PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -14988,9 +14952,9 @@ realclean: clean Notify/Sequence/../QoSProperties.inl Notify/Sequence/../Object.inl \ Notify/Sequence/../Refcountable.h Notify/Sequence/../Refcountable.inl \ Notify/Sequence/../Object_T.inl Notify/Sequence/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Sequence/../FilterAdmin.h Notify/Sequence/../ID_Factory.h \ Notify/Sequence/../ID_Factory.inl Notify/Sequence/../Proxy.inl \ Notify/Sequence/../Consumer.inl Notify/Sequence/../ProxySupplier.h \ @@ -15063,7 +15027,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -15242,13 +15206,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Sequence/../Supplier.h Notify/Sequence/../Peer.h \ Notify/Sequence/../Destroy_Callback.h \ Notify/Sequence/../EventTypeSeq.h Notify/Sequence/../EventType.h \ @@ -15319,66 +15282,66 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Sequence/../QoSProperties.inl Notify/Sequence/../Object.inl \ Notify/Sequence/../Refcountable.h Notify/Sequence/../Refcountable.inl \ Notify/Sequence/../Object_T.inl Notify/Sequence/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Sequence/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Sequence/../ID_Factory.h Notify/Sequence/../ID_Factory.inl \ Notify/Sequence/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Sequence/../Event.inl Notify/Sequence/../Proxy.inl \ Notify/Sequence/../Supplier.inl \ Notify/Sequence/SequencePushSupplier.inl @@ -15393,9 +15356,9 @@ realclean: clean Notify/Structured/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -15573,8 +15536,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -15591,52 +15554,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Structured/../Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -15653,8 +15615,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Structured/../Property_T.h Notify/Structured/../Property_T.inl \ Notify/Structured/../Property_T.cpp \ Notify/Structured/../PropertySeq.h \ @@ -15705,9 +15667,9 @@ realclean: clean Notify/Structured/../Object.inl Notify/Structured/../Refcountable.h \ Notify/Structured/../Refcountable.inl \ Notify/Structured/../Object_T.inl Notify/Structured/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Structured/../FilterAdmin.h Notify/Structured/../ID_Factory.h \ Notify/Structured/../ID_Factory.inl Notify/Structured/../Proxy.inl \ Notify/Structured/../Consumer.inl \ @@ -15723,9 +15685,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -15904,8 +15866,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -15922,45 +15884,44 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Structured/../ProxyConsumer_T.h Notify/Structured/../Proxy_T.h \ Notify/Structured/../Proxy.h Notify/Structured/../Object_T.h \ Notify/Structured/../Object.h Notify/Structured/../Types.h \ @@ -16019,28 +15980,28 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Structured/../QoSProperties.inl \ Notify/Structured/../Object.inl Notify/Structured/../Refcountable.h \ Notify/Structured/../Refcountable.inl \ Notify/Structured/../Object_T.inl Notify/Structured/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Structured/../EventTypeSeq.h Notify/Structured/../EventType.h \ Notify/Structured/../EventType.inl \ Notify/Structured/../EventTypeSeq.inl \ Notify/Structured/../FilterAdmin.h Notify/Structured/../ID_Factory.h \ Notify/Structured/../ID_Factory.inl Notify/Structured/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Structured/../Event.inl Notify/Structured/../Proxy.inl \ Notify/Structured/../Proxy_T.inl Notify/Structured/../Proxy_T.cpp \ Notify/Structured/../ProxyConsumer.h Notify/Structured/../Supplier.h \ @@ -16050,9 +16011,9 @@ realclean: clean Notify/Structured/../ProxyConsumer_T.inl \ Notify/Structured/../ProxyConsumer_T.cpp \ Notify/Structured/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Structured/../Event_Manager.inl \ Notify/Structured/../ProxySupplier.h \ Notify/Structured/../ProxySupplier.inl \ @@ -16060,9 +16021,9 @@ realclean: clean Notify/Structured/../Event_Map_Entry_T.h \ Notify/Structured/../Event_Map_Entry_T.inl \ Notify/Structured/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Structured/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -16091,9 +16052,9 @@ realclean: clean Notify/Structured/../Container.inl \ Notify/Structured/../Container_T.inl \ Notify/Structured/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Structured/../POA_Helper.h Notify/Structured/../POA_Helper.inl \ Notify/Structured/../Admin.inl Notify/Structured/../EventChannel.h \ Notify/Structured/../EventChannel.inl \ @@ -16110,9 +16071,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -16291,8 +16252,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -16309,52 +16270,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Structured/../ProxySupplier_T.h Notify/Structured/../Proxy_T.h \ Notify/Structured/../Proxy.h Notify/Structured/../Object_T.h \ Notify/Structured/../Object.h Notify/Structured/../Types.h \ @@ -16413,15 +16373,15 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Structured/../QoSProperties.inl \ Notify/Structured/../Object.inl Notify/Structured/../Refcountable.h \ Notify/Structured/../Refcountable.inl \ Notify/Structured/../Object_T.inl Notify/Structured/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Structured/../EventTypeSeq.h Notify/Structured/../EventType.h \ Notify/Structured/../EventType.inl \ Notify/Structured/../EventTypeSeq.inl \ @@ -16458,9 +16418,9 @@ realclean: clean Notify/Structured/../Worker_Task.h \ Notify/Structured/../Worker_Task.inl \ Notify/Structured/../Event_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Structured/../Event_Manager.inl \ Notify/Structured/../ProxyConsumer.h Notify/Structured/../Supplier.h \ Notify/Structured/../Supplier.inl \ @@ -16469,9 +16429,9 @@ realclean: clean Notify/Structured/../Event_Map_Entry_T.h \ Notify/Structured/../Event_Map_Entry_T.inl \ Notify/Structured/../Event_Map_Entry_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ Notify/Structured/../Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -16492,9 +16452,9 @@ realclean: clean Notify/Structured/../Container.h Notify/Structured/../Container.inl \ Notify/Structured/../Container_T.inl \ Notify/Structured/../Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Structured/../POA_Helper.h Notify/Structured/../POA_Helper.inl \ Notify/Structured/../Admin.inl Notify/Structured/../EventChannel.h \ Notify/Structured/../AdminProperties.h \ @@ -16514,7 +16474,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -16693,13 +16653,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Structured/../Consumer.h Notify/Structured/../Peer.h \ Notify/Structured/../Destroy_Callback.h \ Notify/Structured/../EventTypeSeq.h Notify/Structured/../EventType.h \ @@ -16773,67 +16732,67 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Structured/../QoSProperties.inl \ Notify/Structured/../Object.inl Notify/Structured/../Refcountable.h \ Notify/Structured/../Refcountable.inl \ Notify/Structured/../Object_T.inl Notify/Structured/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Structured/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Structured/../ID_Factory.h Notify/Structured/../ID_Factory.inl \ Notify/Structured/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Structured/../Event.inl Notify/Structured/../Proxy.inl \ Notify/Structured/../Consumer.inl \ Notify/Structured/../ProxySupplier.h \ @@ -16849,7 +16808,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ + CosNotifyCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -17028,13 +16987,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ + Notify/notify_export.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ Notify/Structured/../Supplier.h Notify/Structured/../Peer.h \ Notify/Structured/../Destroy_Callback.h \ Notify/Structured/../EventTypeSeq.h Notify/Structured/../EventType.h \ @@ -17108,67 +17066,67 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Structured/../QoSProperties.inl \ Notify/Structured/../Object.inl Notify/Structured/../Refcountable.h \ Notify/Structured/../Refcountable.inl \ Notify/Structured/../Object_T.inl Notify/Structured/../Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/Structured/../FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Structured/../ID_Factory.h Notify/Structured/../ID_Factory.inl \ Notify/Structured/../Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Structured/../Event.inl Notify/Structured/../Proxy.inl \ Notify/Structured/../Supplier.inl \ Notify/Structured/StructuredPushSupplier.inl @@ -17180,7 +17138,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ Notify/Peer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -17359,8 +17317,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ Notify/Destroy_Callback.h Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Peer.inl \ Notify/Proxy.h Notify/Object_T.h Notify/Object.h \ @@ -17426,82 +17384,81 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl Notify/Supplier.inl \ Notify/ProxyConsumer.h Notify/ProxyConsumer.inl Notify/Admin.h \ Notify/Container_T.h Notify/Container.h Notify/Container.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -17526,7 +17483,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -17705,11 +17662,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Notify/notify_export.h \ + CosNotificationC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Subscription_Change_Worker.inl Notify/Proxy.h \ Notify/Object_T.h Notify/Object.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ @@ -17774,70 +17731,69 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/QoSProperties.inl Notify/Object.inl Notify/Refcountable.h \ Notify/Refcountable.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/EventTypeSeq.h Notify/EventType.h Notify/EventType.inl \ Notify/EventTypeSeq.inl Notify/FilterAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + CosNotifyChannelAdminS.h \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/Proxy.inl .obj/SupplierAdmin.o .obj/SupplierAdmin.so .shobj/SupplierAdmin.o .shobj/SupplierAdmin.so: Notify/SupplierAdmin.cpp Notify/SupplierAdmin.h \ @@ -17846,9 +17802,9 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -18027,8 +17983,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -18045,48 +18001,47 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/Admin.h Notify/Container_T.h Notify/Container.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Object.h Notify/Types.h Notify/QoSProperties.h \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -18142,19 +18097,19 @@ realclean: clean Notify/QoSProperties.inl Notify/Object.inl Notify/Container.inl \ Notify/Object_T.h Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Notify/Container_T.inl Notify/Container_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ Notify/Properties.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -18169,13 +18124,13 @@ realclean: clean $(ACE_ROOT)/ace/Copy_Disabled.h \ Notify/ID_Factory.h Notify/ID_Factory.inl Notify/POA_Helper.inl \ Notify/FilterAdmin.h Notify/Event.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + Event_ForwarderS.h \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Event.inl Notify/EventTypeSeq.h Notify/EventType.h \ Notify/EventType.inl Notify/EventTypeSeq.inl Notify/Admin.inl \ Notify/Destroy_Callback.h Notify/SupplierAdmin.inl Notify/Builder.h \ @@ -18236,8 +18191,6 @@ realclean: clean $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -18245,6 +18198,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Thread_Control.h \ + $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -18321,9 +18276,9 @@ realclean: clean $(ACE_ROOT)/ace/Refcounted_Auto_Ptr.i \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -18430,8 +18385,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -18448,52 +18403,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -18505,8 +18459,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -18539,9 +18493,9 @@ realclean: clean Notify/Refcountable.h Notify/Refcountable.inl \ Notify/Method_Request.inl Notify/Worker_Task.inl \ Notify/ThreadPool_Task.inl Notify/Buffering_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ Notify/Buffering_Strategy.inl \ $(TAO_ROOT)/tao/debug.h \ Notify/Properties.h Notify/Properties.inl \ @@ -18734,12 +18688,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp + NotifyExtC.h \ + Notify/notify_export.h \ + NotifyExtC.i \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp .obj/Worker_Task.o .obj/Worker_Task.so .shobj/Worker_Task.o .shobj/Worker_Task.so: Notify/Worker_Task.cpp Notify/Worker_Task.h \ $(ACE_ROOT)/ace/pre.h \ @@ -18798,9 +18752,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -18933,8 +18887,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -18951,52 +18905,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -19013,8 +18966,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -19090,9 +19043,9 @@ realclean: clean Notify/Notify_EventChannelFactory_i.cpp \ Notify/Notify_EventChannelFactory_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -19274,8 +19227,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -19292,45 +19245,44 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ Notify/notify_export.h Notify/Service.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -19418,9 +19370,9 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ Notify/Event.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + Event_ForwarderS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -19553,8 +19505,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -19571,52 +19523,51 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_ForwarderS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyChannelAdminS.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosEventChannelAdminS.h \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + Event_ForwarderC.h \ + Event_ForwarderC.i \ + Event_ForwarderS_T.h \ + Event_ForwarderS_T.i \ + Event_ForwarderS_T.cpp \ + Event_ForwarderS.i \ Notify/Property.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -19633,8 +19584,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/NotifyExtC.i \ + NotifyExtC.h \ + NotifyExtC.i \ Notify/Property_T.h Notify/Property_T.inl Notify/Property_T.cpp \ Notify/PropertySeq.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -19679,9 +19630,9 @@ realclean: clean Notify/QoSProperties.h Notify/Property_Boolean.h \ Notify/Property_Boolean.inl Notify/QoSProperties.inl \ Notify/Object.inl Notify/Object_T.inl Notify/Object_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ Notify/FilterAdmin.h Notify/ID_Factory.h Notify/ID_Factory.inl \ Notify/Proxy.inl Notify/Peer.h Notify/Destroy_Callback.h \ Notify/Peer.inl @@ -19827,10 +19778,10 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op_T.i \ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -19919,8 +19870,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -19932,39 +19883,38 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ Notify/ETCL_Filter.inl \ $(TAO_ROOT)/tao/debug.h \ Notify/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h + ETCL/ETCL_Constraint_Visitor.h .obj/ETCL_FilterFactory.o .obj/ETCL_FilterFactory.so .shobj/ETCL_FilterFactory.o .shobj/ETCL_FilterFactory.so: Notify/ETCL_FilterFactory.cpp \ Notify/ETCL_FilterFactory.h \ @@ -19973,10 +19923,10 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotificationS.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -20155,8 +20105,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ + Notify/notify_export.h \ + CosNotificationC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -20173,30 +20123,29 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ Notify/FilterFactory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -20240,17 +20189,17 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ Notify/Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ Notify/ETCL_Filter.inl .obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Notify/Constraint_Interpreter.cpp \ Notify/Constraint_Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -20293,7 +20242,7 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -20356,8 +20305,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ + ETCL/ETCL_Constraint.inl \ + CosNotifyFilterC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -20435,15 +20384,14 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ + Notify/notify_export.h \ + CosNotifyCommC.h \ + CosNotificationC.h \ + CosNotificationC.i \ + CosEventCommC.h \ + CosEventCommC.i \ + CosNotifyCommC.i \ + CosNotifyFilterC.i \ Notify/notify_export.h Notify/Constraint_Visitors.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -20477,7 +20425,7 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h + ETCL/ETCL_Constraint_Visitor.h .obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Notify/Constraint_Visitors.cpp \ Notify/Constraint_Visitors.h \ @@ -20607,9 +20555,9 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ + ETCL/ETCL_Constraint_Visitor.h \ + ETCL/etcl_export.h \ + CosNotificationC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -20698,12 +20646,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_y.h \ + CosNotificationC.i \ + Notify/notify_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ + ETCL/ETCL_y.h \ $(TAO_ROOT)/tao/DynamicAny/DynArray_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -21275,13 +21223,13 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ CosNotificationS_T.h CosNotificationS_T.i CosNotificationS_T.cpp \ CosNotificationS.i CosNotifyFilterS.h CosNotifyCommS.h \ - CosEventCommS.h CosEventCommC.h CosEvent/event_export.h \ - CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \ - CosEventCommS_T.cpp CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i \ - CosNotifyCommS_T.h CosNotifyCommS_T.i CosNotifyCommS_T.cpp \ - CosNotifyCommS.i CosNotifyFilterC.h CosNotifyFilterC.i \ - CosNotifyFilterS_T.h CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp \ - CosNotifyFilterS.i CosEventChannelAdminS.h CosEventChannelAdminC.h \ + CosEventCommS.h CosEventCommC.h CosEventCommC.i CosEventCommS_T.h \ + CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ + CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ + CosNotifyFilterC.h CosNotifyFilterC.i CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp CosNotifyFilterS.i \ + CosEventChannelAdminS.h CosEventChannelAdminC.h \ CosEventChannelAdminC.i CosEventChannelAdminS_T.h \ CosEventChannelAdminS_T.i CosEventChannelAdminS_T.cpp \ CosEventChannelAdminS.i CosNotifyChannelAdminC.h \ @@ -21632,10 +21580,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ CosNotificationS_T.h CosNotificationS_T.i CosNotificationS_T.cpp \ - CosNotificationS.i CosEventCommS.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ - CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ - CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotificationS.i CosEventCommS.h CosEventCommC.h CosEventCommC.i \ + CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \ + CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ @@ -21981,10 +21928,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ CosNotificationS_T.h CosNotificationS_T.i CosNotificationS_T.cpp \ - CosNotificationS.i CosEventCommS.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ - CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ - CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotificationS.i CosEventCommS.h CosEventCommC.h CosEventCommC.i \ + CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \ + CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ CosNotifyFilterC.h CosNotifyFilterC.i CosNotifyFilterS_T.h \ CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp CosNotifyFilterS.i \ @@ -22314,7 +22260,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.i \ + Notify/notify_export.h CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -22660,7 +22606,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.i \ + Notify/notify_export.h CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -22824,7 +22770,8 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/NotifyExtS.o .obj/NotifyExtS.so .shobj/NotifyExtS.o .shobj/NotifyExtS.so: NotifyExtS.cpp NotifyExtS.h \ - $(ACE_ROOT)/ace/pre.h NotifyExtC.h \ + $(ACE_ROOT)/ace/pre.h \ + NotifyExtC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -23449,10 +23396,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -23654,10 +23599,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/notify_export.h CosNotificationC.h CosNotificationC.i \ - CosNotifyFilterC.h CosNotifyCommC.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosNotifyCommC.i \ - CosNotifyFilterC.i CosEventChannelAdminC.h CosEventChannelAdminC.i \ - CosNotifyChannelAdminC.i \ + CosNotifyFilterC.h CosNotifyCommC.h CosEventCommC.h CosEventCommC.i \ + CosNotifyCommC.i CosNotifyFilterC.i CosEventChannelAdminC.h \ + CosEventChannelAdminC.i CosNotifyChannelAdminC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -23757,10 +23701,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -23961,8 +23903,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/notify_export.h CosNotificationC.h CosNotificationC.i \ - CosEventCommC.h CosEvent/event_export.h CosEventCommC.i \ - CosNotifyCommC.i \ + CosEventCommC.h CosEventCommC.i CosNotifyCommC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -24062,10 +24003,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -24266,8 +24205,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/notify_export.h CosNotifyCommC.h CosNotificationC.h \ - CosNotificationC.i CosEventCommC.h CosEvent/event_export.h \ - CosEventCommC.i CosNotifyCommC.i CosNotifyFilterC.i \ + CosNotificationC.i CosEventCommC.h CosEventCommC.i CosNotifyCommC.i \ + CosNotifyFilterC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -24367,10 +24306,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -24570,7 +24507,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.i \ + Notify/notify_export.h CosEventCommC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -24670,10 +24607,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -24874,7 +24809,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - CosEvent/event_export.h CosEventCommC.h CosEventCommC.i \ + Notify/notify_export.h CosEventCommC.h CosEventCommC.i \ CosEventChannelAdminC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -24975,10 +24910,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -25278,10 +25211,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ @@ -25501,10 +25432,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ CosNotificationS_T.h CosNotificationS_T.i CosNotificationS_T.cpp \ CosNotificationS.i CosNotifyChannelAdminS.h CosNotifyFilterS.h \ - CosNotifyCommS.h CosEventCommS.h CosEventCommC.h \ - CosEvent/event_export.h CosEventCommC.i CosEventCommS_T.h \ - CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i \ - CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ + CosNotifyCommS.h CosEventCommS.h CosEventCommC.h CosEventCommC.i \ + CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \ + CosEventCommS.i CosNotifyCommC.h CosNotifyCommC.i CosNotifyCommS_T.h \ CosNotifyCommS_T.i CosNotifyCommS_T.cpp CosNotifyCommS.i \ CosNotifyFilterC.h CosNotifyFilterC.i CosNotifyFilterS_T.h \ CosNotifyFilterS_T.i CosNotifyFilterS_T.cpp CosNotifyFilterS.i \ @@ -25844,9 +25774,9 @@ realclean: clean $(TAO_ROOT)/tao/PortableInterceptorC.i \ Notify/notify_export.h CosNotificationC.h CosNotificationC.i \ CosNotifyChannelAdminC.h CosNotifyFilterC.h CosNotifyCommC.h \ - CosEventCommC.h CosEvent/event_export.h CosEventCommC.i \ - CosNotifyCommC.i CosNotifyFilterC.i CosEventChannelAdminC.h \ - CosEventChannelAdminC.i CosNotifyChannelAdminC.i Event_ForwarderC.i \ + CosEventCommC.h CosEventCommC.i CosNotifyCommC.i CosNotifyFilterC.i \ + CosEventChannelAdminC.h CosEventChannelAdminC.i \ + CosNotifyChannelAdminC.i Event_ForwarderC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -25946,10 +25876,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/LF_Invocation_Event.h \ $(TAO_ROOT)/tao/LF_Event.h \ $(TAO_ROOT)/tao/LF_Event.inl \ - $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/operation_details.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty index e8af7a45a8d..100f480800b 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosProperty +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosProperty @@ -70,7 +70,7 @@ realclean: clean .obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -98,9 +98,9 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -256,7 +256,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -273,10 +273,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTime b/TAO/orbsvcs/orbsvcs/Makefile.CosTime index 3024bf04185..f53787a02bd 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosTime +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTime @@ -76,8 +76,8 @@ realclean: clean .obj/TAO_Time_Service_Server.o .obj/TAO_Time_Service_Server.so .shobj/TAO_Time_Service_Server.o .shobj/TAO_Time_Service_Server.so: Time/TAO_Time_Service_Server.cpp \ Time/TAO_UTO.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -225,7 +225,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -280,8 +280,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -298,17 +298,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/time_export.h Time/TAO_TIO.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ Time/TAO_Time_Service_Server.h \ @@ -377,7 +377,7 @@ realclean: clean $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -511,11 +511,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -528,8 +528,8 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -546,13 +546,13 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + Naming/nsconf.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -573,19 +573,19 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseC.h \ + TimeBaseC.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/Timer_Helper.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -662,8 +662,8 @@ realclean: clean .obj/TAO_UTO.o .obj/TAO_UTO.so .shobj/TAO_UTO.o .shobj/TAO_UTO.so: Time/TAO_UTO.cpp Time/TAO_UTO.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -811,7 +811,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -866,8 +866,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -884,17 +884,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/time_export.h Time/TAO_TIO.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h @@ -1042,8 +1042,8 @@ realclean: clean $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1068,7 +1068,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1109,8 +1109,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -1123,17 +1123,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/TAO_UTO.h Time/time_export.h .obj/Timer_Helper.o .obj/Timer_Helper.so .shobj/Timer_Helper.o .shobj/Timer_Helper.so: Time/Timer_Helper.cpp Time/Timer_Helper.h \ @@ -1188,8 +1188,8 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeServiceS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1299,7 +1299,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ @@ -1351,8 +1351,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1369,17 +1369,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time/time_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + TimeServiceC.h \ + Time/time_export.h \ + TimeServiceC.i \ + TimeServiceS_T.h \ + TimeServiceS_T.i \ + TimeServiceS_T.cpp \ + TimeServiceS.i \ Time/TAO_Time_Service_Clerk.h \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -1393,11 +1393,11 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + Naming/Naming_Utils.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + IOR_Multicast.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -1410,13 +1410,13 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h \ + Naming/Naming_Context_Interface.h \ + CosNamingS.h \ + CosNamingS_T.h \ + CosNamingS_T.i \ + CosNamingS_T.cpp \ + CosNamingS.i \ + Naming/nsconf.h \ $(TAO_ROOT)/tao/debug.h .obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading index afb517bf0cf..5ac3006aaca 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosTrading +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTrading @@ -272,9 +272,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -315,11 +315,11 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -336,26 +336,26 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ Trader/Trader_Constraint_Visitors.h Trader/Trader.h \ Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Trader_Utils.h .obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \ @@ -543,9 +543,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -586,12 +586,12 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Constraint_Nodes.h .obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \ Trader/Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -805,7 +805,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -814,12 +814,12 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ Trader/Constraint_Nodes.h Trader/Interpreter_Utils_T.h \ Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils_T.h \ + Trader/Constraint_Visitors.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -1014,9 +1014,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1057,11 +1057,11 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1078,17 +1078,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -1275,9 +1275,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1318,11 +1318,11 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1339,17 +1339,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i .obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1567,7 +1567,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1576,9 +1576,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1595,24 +1595,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Iterators.h Trader/Trader_Utils.h \ Trader/Offer_Database.cpp @@ -1832,7 +1832,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1841,9 +1841,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1860,24 +1860,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \ Trader/Offer_Iterators_T.h \ @@ -2097,7 +2097,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2106,9 +2106,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2125,24 +2125,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Database.h Trader/Offer_Database.cpp \ Trader/Offer_Iterators_T.cpp @@ -2363,7 +2363,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2372,9 +2372,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2391,24 +2391,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \ $(ACE_ROOT)/ace/pre.h \ @@ -2626,7 +2626,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2635,9 +2635,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2654,32 +2654,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \ Trader/Trader_Utils.h Trader/Offer_Database.h \ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Trader_T.h Trader/Trader_T.cpp \ Trader/Trader_Interfaces.cpp \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -2906,7 +2906,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2915,9 +2915,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2934,28 +2934,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Offer_Iterators_T.h \ Trader/Offer_Iterators.h Trader/Offer_Database.h \ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \ @@ -2970,7 +2970,7 @@ realclean: clean Trader/Trader_Constraint_Visitors.h \ $(ACE_ROOT)/ace/pre.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -3184,7 +3184,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -3193,12 +3193,12 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ Trader/Trader.h Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3215,24 +3215,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Trader_Utils.h .obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h \ @@ -3451,7 +3451,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -3460,9 +3460,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3479,31 +3479,31 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ Trader/Offer_Database.h Trader/Offer_Iterators.h \ Trader/Trader_Utils.h Trader/Offer_Database.cpp Trader/Trader_T.cpp \ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ + Trader/Interpreter_Utils.h \ + Trader/Constraint_Nodes.h \ Trader/Interpreter.h Trader/Offer_Iterators_T.h \ Trader/Offer_Iterators_T.cpp Trader/Trader_Interfaces.cpp \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -3728,7 +3728,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -3737,9 +3737,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3756,24 +3756,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i .obj/Interpreter.o .obj/Interpreter.so .shobj/Interpreter.o .shobj/Interpreter.so: Trader/Interpreter.cpp Trader/Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ @@ -3959,9 +3959,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4002,10 +4002,10 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h + Trader/Constraint_Nodes.h .obj/Interpreter_Utils_T.o .obj/Interpreter_Utils_T.so .shobj/Interpreter_Utils_T.o .shobj/Interpreter_Utils_T.so: Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h \ + Trader/Interpreter_Utils_T.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ @@ -4188,9 +4188,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Interpreter_Utils_T.cpp \ + Trader/Constraint_Visitors.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4223,7 +4223,7 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -4232,8 +4232,8 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \ + Trader/Constraint_Nodes.h \ + Trader/Constraint_Tokens.h \ $(TAO_ROOT)/tao/DynamicAny/DynSequence_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -4459,7 +4459,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h + Trader/trading_export.h .obj/Trading_Loader.o .obj/Trading_Loader.so .shobj/Trading_Loader.o .shobj/Trading_Loader.so: Trader/Trading_Loader.cpp Trader/Trading_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.h \ @@ -4613,8 +4613,8 @@ realclean: clean $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + IOR_Multicast.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4683,8 +4683,8 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \ + Trader/Trader.h \ + Trader/Interpreter_Utils.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4699,7 +4699,7 @@ realclean: clean $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/XML_Svc_Conf.h \ $(ACE_ROOT)/ace/Service_Config.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \ + Trader/trading_export.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -4708,9 +4708,9 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + CosTradingS.h \ + CosTradingC.h \ + CosTradingC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -4723,25 +4723,25 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \ + CosTradingS_T.h \ + CosTradingS_T.i \ + CosTradingS_T.cpp \ + CosTradingS.i \ + CosTradingReposS.h \ + CosTradingReposC.h \ + CosTradingReposC.i \ + CosTradingReposS_T.h \ + CosTradingReposS_T.i \ + CosTradingReposS_T.cpp \ + CosTradingReposS.i \ + CosTradingDynamicS.h \ + CosTradingDynamicC.h \ + CosTradingDynamicC.i \ + CosTradingDynamicS_T.h \ + CosTradingDynamicS_T.i \ + CosTradingDynamicS_T.cpp \ + CosTradingDynamicS.i \ + Trader/Service_Type_Repository.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsEventLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsEventLogAdmin index bb053590e29..27d13e04819 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.DsEventLogAdmin +++ b/TAO/orbsvcs/orbsvcs/Makefile.DsEventLogAdmin @@ -72,12 +72,12 @@ realclean: clean .obj/EventLogFactory_i.o .obj/EventLogFactory_i.so .shobj/EventLogFactory_i.o .shobj/EventLogFactory_i.so: Log/EventLogFactory_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/EventLogFactory_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ + Log/EventLogFactory_i.h \ + DsEventLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -259,8 +259,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -277,18 +277,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -309,30 +309,30 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsEventLogAdminC.h \ + Log/eventlog_export.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + Log/LogMgr_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -373,30 +373,30 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h \ + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + CosEvent/CEC_ConsumerAdmin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + CosEvent/CEC_ProxyPushSupplier.h \ + CosEvent/CEC_ProxyPushSupplier.i \ + CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -405,27 +405,27 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/EventLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/EventLogNotification.h + CosEvent/CEC_ProxyPullSupplier.i \ + CosEvent/CEC_ConsumerAdmin.i \ + CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h \ + CosEvent/CEC_Factory.i \ + CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i \ + CosEvent/CEC_Default_Factory.h \ + CosEvent/CEC_Default_Factory.i \ + Log/EventLog_i.h \ + Log/EventLogNotification.h .obj/EventLog_i.o .obj/EventLog_i.so .shobj/EventLog_i.o .shobj/EventLog_i.so: Log/EventLog_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/EventLog_i.h \ + Log/EventLog_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ + Log/eventlog_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -570,7 +570,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -625,8 +625,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -643,41 +643,41 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsEventLogAdminS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + DsEventLogAdminC.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -718,26 +718,26 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h \ + CosEvent/CEC_Factory.i \ + CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i \ + Log/LogMgr_i.h .obj/EventLogNotification.o .obj/EventLogNotification.so .shobj/EventLogNotification.o .shobj/EventLogNotification.so: Log/EventLogNotification.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ + Log/LogNotification.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -885,7 +885,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -940,8 +940,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -958,56 +958,56 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/EventLogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/EventLogNotification.h \ + CosEvent/CEC_ConsumerAdmin.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + CosEvent/CEC_ProxyPushSupplier.h \ + CosEvent/CEC_ProxyPushSupplier.i \ + CosEvent/CEC_ProxyPullSupplier.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -1016,28 +1016,28 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h \ + CosEvent/CEC_ProxyPullSupplier.i \ + CosEvent/CEC_ConsumerAdmin.i \ + CosEvent/CEC_EventChannel.h \ + CosEvent/CEC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h \ + CosEvent/CEC_Factory.i \ + CosEvent/CEC_Defaults.h \ + CosEvent/CEC_EventChannel.i \ + DsEventLogAdminS.h \ + DsEventLogAdminC.h \ + Log/eventlog_export.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + CosEvent/CEC_Default_Factory.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ @@ -1055,9 +1055,9 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + CosEvent/CEC_Default_Factory.i \ + Time_Utilities.h \ + Time_Utilities.i \ $(TAO_ROOT)/tao/debug.h .obj/DsEventLogAdminS.o .obj/DsEventLogAdminS.so .shobj/DsEventLogAdminS.o .shobj/DsEventLogAdminS.so: DsEventLogAdminS.cpp DsEventLogAdminS.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin index 50d9f262730..f92e8c4fe41 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin +++ b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin @@ -79,9 +79,9 @@ realclean: clean .obj/PersistStore.o .obj/PersistStore.so .shobj/PersistStore.o .shobj/PersistStore.so: Log/PersistStore.cpp Log/PersistStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ + DsLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -229,7 +229,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -284,8 +284,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -302,24 +302,24 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Time_Utilities.h \ + Time_Utilities.i .obj/LogRecordStore.o .obj/LogRecordStore.so .shobj/LogRecordStore.o .shobj/LogRecordStore.so: Log/LogRecordStore.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -501,7 +501,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -517,11 +517,11 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseC.i \ + Time_Utilities.i \ + Log/LogRecordStore.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -543,17 +543,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -594,19 +594,19 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h + Log/Log_Constraint_Interpreter.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ + Log/Log_Constraint_Visitors.h \ + ETCL/ETCL_Constraint_Visitor.h .obj/BasicLogFactory_i.o .obj/BasicLogFactory_i.so .shobj/BasicLogFactory_i.o .shobj/BasicLogFactory_i.so: Log/BasicLogFactory_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h \ + Log/BasicLogFactory_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -754,7 +754,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -809,8 +809,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -827,20 +827,20 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/LogMgr_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -881,20 +881,20 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/BasicLog_i.h .obj/Iterator_i.o .obj/Iterator_i.so .shobj/Iterator_i.o .shobj/Iterator_i.so: Log/Iterator_i.cpp Log/Iterator_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1042,7 +1042,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1097,8 +1097,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1115,18 +1115,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1167,19 +1167,19 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h + Log/Log_Constraint_Interpreter.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ + Log/Log_Constraint_Visitors.h \ + ETCL/ETCL_Constraint_Visitor.h .obj/BasicLog_i.o .obj/BasicLog_i.so .shobj/BasicLog_i.o .shobj/BasicLog_i.so: Log/BasicLog_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h \ + Log/BasicLog_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1327,7 +1327,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1382,8 +1382,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1400,19 +1400,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1453,22 +1453,22 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/LogMgr_i.h .obj/Log_i.o .obj/Log_i.so .shobj/Log_i.o .shobj/Log_i.so: Log/Log_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ + Log/Log_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + Log/LogRecordStore.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1616,7 +1616,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1671,8 +1671,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1689,17 +1689,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1740,30 +1740,30 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Iterator_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/Iterator_i.h \ + Log/Log_Constraint_Interpreter.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ + Log/Log_Constraint_Visitors.h \ + ETCL/ETCL_Constraint_Visitor.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(TAO_ROOT)/tao/debug.h .obj/LogMgr_i.o .obj/LogMgr_i.so .shobj/LogMgr_i.o .shobj/LogMgr_i.so: Log/LogMgr_i.cpp Log/LogMgr_i.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1911,7 +1911,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1966,8 +1966,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1984,19 +1984,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2037,14 +2037,14 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ Log/log_export.h .obj/Log_Constraint_Visitors.o .obj/Log_Constraint_Visitors.so .shobj/Log_Constraint_Visitors.o .shobj/Log_Constraint_Visitors.so: Log/Log_Constraint_Visitors.cpp \ @@ -2175,9 +2175,9 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ + ETCL/ETCL_Constraint_Visitor.h \ + ETCL/etcl_export.h \ + DsLogAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2266,9 +2266,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Log/log_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2284,12 +2284,12 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ + TimeBaseC.i \ + DsLogAdminC.i \ Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_y.h \ + ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.inl \ + ETCL/ETCL_y.h \ $(TAO_ROOT)/tao/DynamicAny/DynArray_i.h \ $(TAO_ROOT)/tao/DynamicAny/DynamicAny.h \ $(TAO_ROOT)/tao/DynamicAny/dynamicany_export.h \ @@ -2315,8 +2315,8 @@ realclean: clean .obj/Log_Constraint_Interpreter.o .obj/Log_Constraint_Interpreter.so .shobj/Log_Constraint_Interpreter.o .shobj/Log_Constraint_Interpreter.so: Log/Log_Constraint_Interpreter.cpp \ Log/Log_Constraint_Interpreter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/etcl_export.h \ + ETCL/ETCL_Interpreter.h \ + ETCL/etcl_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2359,7 +2359,7 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h \ + ETCL/ETCL_Constraint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2422,8 +2422,8 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ + ETCL/ETCL_Constraint.inl \ + DsLogAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ @@ -2501,9 +2501,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Log/log_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2519,8 +2519,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ + TimeBaseC.i \ + DsLogAdminC.i \ Log/log_export.h Log/Log_Constraint_Visitors.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -2554,13 +2554,13 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h + ETCL/ETCL_Constraint_Visitor.h .obj/LogNotification.o .obj/LogNotification.so .shobj/LogNotification.o .shobj/LogNotification.so: Log/LogNotification.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ + Log/LogNotification.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -2708,7 +2708,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -2763,8 +2763,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2781,26 +2781,26 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Time_Utilities.h \ + Time_Utilities.i \ $(TAO_ROOT)/tao/debug.h .obj/DsLogNotificationS.o .obj/DsLogNotificationS.so .shobj/DsLogNotificationS.o .shobj/DsLogNotificationS.so: DsLogNotificationS.cpp DsLogNotificationS.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsNotifyLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsNotifyLogAdmin index 62e04ed9b83..c189492d93a 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.DsNotifyLogAdmin +++ b/TAO/orbsvcs/orbsvcs/Makefile.DsNotifyLogAdmin @@ -72,13 +72,13 @@ realclean: clean .obj/NotifyLogFactory_i.o .obj/NotifyLogFactory_i.so .shobj/NotifyLogFactory_i.o .shobj/NotifyLogFactory_i.so: Log/NotifyLogFactory_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.h \ + Log/NotifyLogFactory_i.h \ + DsNotifyLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ + DsEventLogAdminS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -260,8 +260,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ + CosEvent/event_export.h \ + CosEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -278,18 +278,18 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -310,66 +310,66 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/notifylog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseC.h \ + svc_utils_export.h \ + TimeBaseC.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsEventLogAdminC.h \ + Log/eventlog_export.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + DsNotifyLogAdminC.h \ + Log/notifylog_export.h \ + DsNotifyLogAdminC.i \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.i \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS.i \ + Log/LogMgr_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -410,26 +410,26 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/NotifyLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/NotifyLogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Notify/Notify_EventChannelFactory_i.h \ + Log/NotifyLog_i.h \ + Log/NotifyLogNotification.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i .obj/NotifyLog_i.o .obj/NotifyLog_i.so .shobj/NotifyLog_i.o .shobj/NotifyLog_i.so: Log/NotifyLog_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/NotifyLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ + Log/NotifyLog_i.h \ + DsLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -577,7 +577,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -632,8 +632,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -650,79 +650,79 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/notifylog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsNotifyLogAdminS.h \ + DsEventLogAdminS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + DsEventLogAdminC.h \ + Log/eventlog_export.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + DsNotifyLogAdminC.h \ + Log/notifylog_export.h \ + DsNotifyLogAdminC.i \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.i \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -763,21 +763,21 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/LogMgr_i.h .obj/NotifyLogNotification.o .obj/NotifyLogNotification.so .shobj/NotifyLogNotification.o .shobj/NotifyLogNotification.so: Log/NotifyLogNotification.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ + Log/LogNotification.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -925,7 +925,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -980,8 +980,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -998,91 +998,91 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/NotifyLogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/eventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/notifylog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsNotifyLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/NotifyLogNotification.h \ + DsNotifyLogAdminS.h \ + DsEventLogAdminS.h \ + CosEventChannelAdminS.h \ + CosEventCommS.h \ + CosEventCommC.h \ + CosEvent/event_export.h \ + CosEventCommC.i \ + CosEventCommS_T.h \ + CosEventCommS_T.i \ + CosEventCommS_T.cpp \ + CosEventCommS.i \ + CosEventChannelAdminC.h \ + CosEventChannelAdminC.i \ + CosEventChannelAdminS_T.h \ + CosEventChannelAdminS_T.i \ + CosEventChannelAdminS_T.cpp \ + CosEventChannelAdminS.i \ + DsEventLogAdminC.h \ + Log/eventlog_export.h \ + DsEventLogAdminC.i \ + DsEventLogAdminS_T.h \ + DsEventLogAdminS_T.i \ + DsEventLogAdminS_T.cpp \ + DsEventLogAdminS.i \ + CosNotifyChannelAdminS.h \ + CosNotificationS.h \ + CosNotificationC.h \ + Notify/notify_export.h \ + CosNotificationC.i \ + CosNotificationS_T.h \ + CosNotificationS_T.i \ + CosNotificationS_T.cpp \ + CosNotificationS.i \ + CosNotifyFilterS.h \ + CosNotifyCommS.h \ + CosNotifyCommC.h \ + CosNotifyCommC.i \ + CosNotifyCommS_T.h \ + CosNotifyCommS_T.i \ + CosNotifyCommS_T.cpp \ + CosNotifyCommS.i \ + CosNotifyFilterC.h \ + CosNotifyFilterC.i \ + CosNotifyFilterS_T.h \ + CosNotifyFilterS_T.i \ + CosNotifyFilterS_T.cpp \ + CosNotifyFilterS.i \ + CosNotifyChannelAdminC.h \ + CosNotifyChannelAdminC.i \ + CosNotifyChannelAdminS_T.h \ + CosNotifyChannelAdminS_T.i \ + CosNotifyChannelAdminS_T.cpp \ + CosNotifyChannelAdminS.i \ + DsNotifyLogAdminC.h \ + Log/notifylog_export.h \ + DsNotifyLogAdminC.i \ + DsNotifyLogAdminS_T.h \ + DsNotifyLogAdminS_T.i \ + DsNotifyLogAdminS_T.cpp \ + DsNotifyLogAdminS.i \ + Notify/Notify_EventChannelFactory_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + Time_Utilities.h \ + Time_Utilities.i \ $(TAO_ROOT)/tao/debug.h .obj/DsNotifyLogAdminS.o .obj/DsNotifyLogAdminS.so .shobj/DsNotifyLogAdminS.o .shobj/DsNotifyLogAdminS.so: DsNotifyLogAdminS.cpp DsNotifyLogAdminS.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent index a88d6e0bba6..a1187630461 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent @@ -138,7 +138,7 @@ realclean: clean Event/EC_Event_Channel.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -327,32 +327,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -369,36 +346,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_Default_Factory.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -418,33 +369,38 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ Event/EC_Default_Factory.i Event/EC_Dispatching.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_Timeout_Generator.h \ Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.i Event/EC_ObserverStrategy.h \ $(ACE_ROOT)/ace/RB_Tree.h \ @@ -470,16 +426,14 @@ realclean: clean Event/EC_ConsumerAdmin.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -515,8 +469,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -536,23 +505,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -581,9 +535,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -597,31 +555,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -675,8 +609,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -693,58 +627,33 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_ConsumerAdmin.i \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_Event_Channel.h Event/EC_Factory.h \ @@ -760,16 +669,14 @@ realclean: clean Event/EC_SupplierAdmin.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -805,8 +712,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -826,23 +748,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -871,9 +778,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -887,31 +798,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -965,8 +852,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -983,58 +870,33 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_SupplierAdmin.i \ Event/EC_ProxySupplier.h Event/EC_ProxySupplier.i \ Event/EC_Event_Channel.h Event/EC_Factory.h \ @@ -1049,16 +911,14 @@ realclean: clean .obj/EC_ProxyConsumer.o .obj/EC_ProxyConsumer.so .shobj/EC_ProxyConsumer.o .shobj/EC_ProxyConsumer.so: Event/EC_ProxyConsumer.cpp \ Event/EC_ProxyConsumer.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1094,8 +954,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -1115,23 +990,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -1160,9 +1020,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -1176,31 +1040,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -1254,8 +1094,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1272,39 +1112,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -1314,25 +1129,23 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i .obj/EC_ProxySupplier.o .obj/EC_ProxySupplier.so .shobj/EC_ProxySupplier.o .shobj/EC_ProxySupplier.so: Event/EC_ProxySupplier.cpp \ Event/EC_ProxySupplier.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1368,8 +1181,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -1389,23 +1217,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -1434,9 +1247,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -1450,31 +1267,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -1528,8 +1321,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1546,43 +1339,21 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_Dispatching.h Event/event_export.h \ Event/EC_Dispatching.i Event/EC_Filter_Builder.h \ - Event/EC_Filter_Builder.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Event_Channel.h Event/EC_Factory.h \ + Event/EC_Filter_Builder.i Event/EC_QOS_Info.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i Event/EC_Event_Channel.h Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -1592,17 +1363,17 @@ realclean: clean Event/EC_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \ Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ Event/EC_ConsumerControl.h Event/EC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Proxy_RefCount_Guard.h \ + ESF/ESF_Proxy_RefCount_Guard.i \ + ESF/ESF_Proxy_RefCount_Guard.cpp .obj/EC_Supplier_Filter.o .obj/EC_Supplier_Filter.so .shobj/EC_Supplier_Filter.o .shobj/EC_Supplier_Filter.so: Event/EC_Supplier_Filter.cpp \ Event/EC_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1784,41 +1555,16 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Event/event_export.h \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1835,40 +1581,22 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ - Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ + Event/EC_ProxySupplier.i Event/EC_QOS_Info.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i .obj/EC_Supplier_Filter_Builder.o .obj/EC_Supplier_Filter_Builder.so .shobj/EC_Supplier_Filter_Builder.o .shobj/EC_Supplier_Filter_Builder.so: Event/EC_Supplier_Filter_Builder.cpp \ Event/EC_Supplier_Filter_Builder.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2050,39 +1778,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Supplier_Filter_Builder.i .obj/EC_Trivial_Supplier_Filter.o .obj/EC_Trivial_Supplier_Filter.so .shobj/EC_Trivial_Supplier_Filter.o .shobj/EC_Trivial_Supplier_Filter.so: Event/EC_Trivial_Supplier_Filter.cpp \ Event/EC_Trivial_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2264,37 +1968,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Event/event_export.h \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_Event_Channel.h Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -2304,14 +1986,7 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -2328,55 +2003,41 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ - Event/EC_ConsumerAdmin.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ - Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ + Event/EC_ConsumerAdmin.i Event/EC_QOS_Info.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i Event/EC_Scheduling_Strategy.h \ + Event/EC_Scheduling_Strategy.i Event/EC_ProxyConsumer.h \ + Event/EC_ProxyConsumer.i .obj/EC_Filter.o .obj/EC_Filter.so .shobj/EC_Filter.o .shobj/EC_Filter.so: Event/EC_Filter.cpp Event/EC_Filter.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2558,34 +2219,14 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i .obj/EC_Filter_Builder.o .obj/EC_Filter_Builder.so .shobj/EC_Filter_Builder.o .shobj/EC_Filter_Builder.so: Event/EC_Filter_Builder.cpp \ Event/EC_Filter_Builder.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2767,38 +2408,16 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ Event/EC_Filter.i .obj/EC_Dispatching.o .obj/EC_Dispatching.so .shobj/EC_Dispatching.o .shobj/EC_Dispatching.so: Event/EC_Dispatching.cpp Event/EC_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -2980,37 +2599,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3027,39 +2621,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i .obj/EC_Factory.o .obj/EC_Factory.so .shobj/EC_Factory.o .shobj/EC_Factory.so: Event/EC_Factory.cpp Event/EC_Factory.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3255,7 +2827,7 @@ realclean: clean .obj/EC_QOS_Info.o .obj/EC_QOS_Info.so .shobj/EC_QOS_Info.o .shobj/EC_QOS_Info.so: Event/EC_QOS_Info.cpp Event/EC_QOS_Info.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -3437,14 +3009,14 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + svc_utils_export.h \ + RtecBaseC.i \ Event/event_export.h Event/EC_QOS_Info.i .obj/EC_Null_Factory.o .obj/EC_Null_Factory.so .shobj/EC_Null_Factory.o .shobj/EC_Null_Factory.so: Event/EC_Null_Factory.cpp Event/EC_Null_Factory.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3633,49 +3205,20 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -3692,46 +3235,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \ @@ -3764,16 +3289,19 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \ - Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ - Event/EC_Null_Scheduling.i Event/EC_Reactive_Timeout_Generator.h \ - Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \ - Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \ - Event/EC_Reactive_Timeout_Generator.i Event/EC_ConsumerControl.h \ - Event/EC_ConsumerControl.i Event/EC_SupplierControl.h \ - Event/EC_SupplierControl.i Event/EC_Event_Channel.h \ - Event/EC_Defaults.h Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ + Event/EC_Scheduling_Strategy.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_Scheduling_Strategy.i Event/EC_Null_Scheduling.i \ + Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \ + Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ + Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \ + Event/EC_ConsumerControl.h Event/EC_ConsumerControl.i \ + Event/EC_SupplierControl.h Event/EC_SupplierControl.i \ + Event/EC_Event_Channel.h Event/EC_Defaults.h Event/EC_Event_Channel.i \ + ESF/ESF_Proxy_List.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -3782,11 +3310,11 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ @@ -3796,6 +3324,16 @@ realclean: clean $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -3834,7 +3372,7 @@ realclean: clean Event/EC_Disjunction_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4016,35 +3554,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Disjunction_Filter.i .obj/EC_Conjunction_Filter.o .obj/EC_Conjunction_Filter.so .shobj/EC_Conjunction_Filter.o .shobj/EC_Conjunction_Filter.so: Event/EC_Conjunction_Filter.cpp \ Event/EC_Conjunction_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4226,35 +3744,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Conjunction_Filter.i .obj/EC_Negation_Filter.o .obj/EC_Negation_Filter.so .shobj/EC_Negation_Filter.o .shobj/EC_Negation_Filter.so: Event/EC_Negation_Filter.cpp \ Event/EC_Negation_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4436,34 +3934,14 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Negation_Filter.i .obj/EC_Type_Filter.o .obj/EC_Type_Filter.so .shobj/EC_Type_Filter.o .shobj/EC_Type_Filter.so: Event/EC_Type_Filter.cpp Event/EC_Type_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4645,32 +4123,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Type_Filter.i .obj/EC_Basic_Filter_Builder.o .obj/EC_Basic_Filter_Builder.so .shobj/EC_Basic_Filter_Builder.o .shobj/EC_Basic_Filter_Builder.so: Event/EC_Basic_Filter_Builder.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + Event_Service_Constants.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -4718,8 +4176,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4855,7 +4313,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -4871,35 +4329,34 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + Time_Utilities.i \ Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i \ Event/EC_Basic_Filter_Builder.i Event/EC_Type_Filter.h \ - Event/EC_Filter.h Event/EC_Filter.i Event/EC_Type_Filter.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i Event/EC_Type_Filter.i \ Event/EC_Conjunction_Filter.h Event/EC_Conjunction_Filter.i \ Event/EC_Disjunction_Filter.h Event/EC_Disjunction_Filter.i \ Event/EC_And_Filter.h Event/EC_And_Filter.i \ Event/EC_Negation_Filter.h Event/EC_Negation_Filter.i \ Event/EC_Bitmask_Filter.h Event/EC_Bitmask_Filter.i \ Event/EC_Masked_Type_Filter.h Event/EC_Masked_Type_Filter.i \ - Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Timeout_Filter.i + Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h \ + RtecBaseC.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i .obj/EC_Basic_Factory.o .obj/EC_Basic_Factory.so .shobj/EC_Basic_Factory.o .shobj/EC_Basic_Factory.so: Event/EC_Basic_Factory.cpp \ Event/EC_Basic_Factory.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -5088,50 +4545,21 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \ Event/EC_Trivial_Supplier_Filter.h Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i Event/EC_Supplier_Filter_Builder.h \ Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \ Event/EC_ConsumerAdmin.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5148,46 +4576,28 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_ObserverStrategy.h \ @@ -5220,18 +4630,21 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \ - Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ - Event/EC_Null_Scheduling.i Event/EC_Reactive_Timeout_Generator.h \ - Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \ - Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \ - Event/EC_Reactive_Timeout_Generator.i \ + Event/EC_Scheduling_Strategy.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_Scheduling_Strategy.i Event/EC_Null_Scheduling.i \ + Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \ + Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ + Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \ Event/EC_Reactive_ConsumerControl.h Event/EC_ConsumerControl.h \ Event/EC_ConsumerControl.i Event/EC_Reactive_ConsumerControl.i \ Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \ Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \ Event/EC_Event_Channel.h Event/EC_Defaults.h Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -5240,18 +4653,18 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Delayed_Changes.h \ + ESF/ESF_Busy_Lock.h \ + ESF/ESF_Busy_Lock.i \ + ESF/ESF_Busy_Lock.cpp \ + ESF/ESF_Delayed_Changes.i \ + ESF/ESF_Delayed_Changes.cpp \ + ESF/ESF_Defaults.h \ + ESF/ESF_Delayed_Command.h \ + ESF/ESF_Delayed_Command.i \ + ESF/ESF_Delayed_Command.cpp \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ @@ -5261,6 +4674,16 @@ realclean: clean $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -5299,7 +4722,7 @@ realclean: clean Event/EC_Default_Factory.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -5507,38 +4930,13 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ Event/EC_Default_Factory.i Event/EC_MT_Dispatching.h \ Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Dispatching_Task.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -5555,34 +4953,12 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ @@ -5600,6 +4976,11 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ @@ -5628,24 +5009,24 @@ realclean: clean Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \ Event/EC_Prefix_Filter_Builder.h Event/EC_Prefix_Filter_Builder.i \ Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ Event/EC_SupplierAdmin.i Event/EC_Trivial_Supplier_Filter.h \ @@ -5665,43 +5046,46 @@ realclean: clean $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \ - Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \ - Event/EC_Null_Scheduling.i Event/EC_Group_Scheduling.h \ - Event/EC_Group_Scheduling.inl Event/EC_Reactive_Timeout_Generator.h \ - Event/EC_Timeout_Generator.h Event/EC_Timeout_Filter.h \ - Event/EC_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Timeout_Filter.i Event/EC_Timeout_Generator.i \ - Event/EC_Reactive_Timeout_Generator.i Event/EC_Event_Channel.h \ - Event/EC_Event_Channel.i Event/EC_Reactive_ConsumerControl.h \ - Event/EC_ConsumerControl.h Event/EC_ConsumerControl.i \ - Event/EC_Reactive_ConsumerControl.i \ + Event/EC_Scheduling_Strategy.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_Scheduling_Strategy.i Event/EC_Null_Scheduling.i \ + Event/EC_Group_Scheduling.h Event/EC_Group_Scheduling.inl \ + Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \ + Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ + Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \ + Event/EC_Event_Channel.h Event/EC_Event_Channel.i \ + Event/EC_Reactive_ConsumerControl.h Event/EC_ConsumerControl.h \ + Event/EC_ConsumerControl.i Event/EC_Reactive_ConsumerControl.i \ Event/EC_Reactive_SupplierControl.h Event/EC_SupplierControl.h \ Event/EC_SupplierControl.i Event/EC_Reactive_SupplierControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp \ + ESF/ESF_Proxy_List.h \ + ESF/ESF_Proxy_List.i \ + ESF/ESF_Proxy_List.cpp \ + ESF/ESF_Proxy_RB_Tree.h \ + ESF/ESF_Proxy_RB_Tree.i \ + ESF/ESF_Proxy_RB_Tree.cpp \ + ESF/ESF_Immediate_Changes.h \ + ESF/ESF_Immediate_Changes.i \ + ESF/ESF_Immediate_Changes.cpp \ + ESF/ESF_Copy_On_Read.h \ + ESF/ESF_Copy_On_Read.i \ + ESF/ESF_Copy_On_Read.cpp \ + ESF/ESF_Copy_On_Write.h \ + ESF/ESF_Copy_On_Write.i \ + ESF/ESF_Copy_On_Write.cpp \ + ESF/ESF_Delayed_Changes.h \ + ESF/ESF_Busy_Lock.h \ + ESF/ESF_Busy_Lock.i \ + ESF/ESF_Busy_Lock.cpp \ + ESF/ESF_Delayed_Changes.i \ + ESF/ESF_Delayed_Changes.cpp \ + ESF/ESF_Defaults.h \ + ESF/ESF_Delayed_Command.h \ + ESF/ESF_Delayed_Command.i \ + ESF/ESF_Delayed_Command.cpp \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ @@ -5711,6 +5095,11 @@ realclean: clean $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -5738,7 +5127,7 @@ realclean: clean .obj/EC_ObserverStrategy.o .obj/EC_ObserverStrategy.so .shobj/EC_ObserverStrategy.o .shobj/EC_ObserverStrategy.so: Event/EC_ObserverStrategy.cpp \ Event/EC_ObserverStrategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ + ESF/ESF_Worker.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -5920,8 +5309,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -5956,44 +5345,13 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_ObserverStrategy.i \ Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \ Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6010,59 +5368,61 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \ Event/EC_ProxyConsumer.i Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \ Event/EC_SupplierAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i .obj/EC_Per_Supplier_Filter.o .obj/EC_Per_Supplier_Filter.so .shobj/EC_Per_Supplier_Filter.o .shobj/EC_Per_Supplier_Filter.so: Event/EC_Per_Supplier_Filter.cpp \ Event/EC_Per_Supplier_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -6244,37 +5604,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + Event/event_export.h \ + RtecEventCommC.i \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/event_export.h Event/EC_Supplier_Filter.i \ Event/EC_Supplier_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ Event/EC_Supplier_Filter_Builder.i Event/EC_Per_Supplier_Filter.i \ Event/EC_Event_Channel.h Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -6284,14 +5622,7 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6308,47 +5639,49 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \ Event/EC_ProxyConsumer.i Event/EC_Scheduling_Strategy.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \ Event/EC_QOS_Info.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i .obj/EC_Timeout_Filter.o .obj/EC_Timeout_Filter.so .shobj/EC_Timeout_Filter.o .shobj/EC_Timeout_Filter.so: Event/EC_Timeout_Filter.cpp \ Event/EC_Timeout_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -6530,31 +5863,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.h Event/EC_Timeout_Generator.i \ Event/EC_Event_Channel.h Event/EC_Factory.h \ @@ -6565,14 +5879,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -6589,41 +5898,38 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ + Event/EC_Filter.h \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h + Time_Utilities.h \ + TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i \ + Event_Service_Constants.h .obj/EC_Timeout_Generator.o .obj/EC_Timeout_Generator.so .shobj/EC_Timeout_Generator.o .shobj/EC_Timeout_Generator.so: Event/EC_Timeout_Generator.cpp \ Event/EC_Timeout_Generator.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -6653,7 +5959,7 @@ realclean: clean $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Event_Handler.i \ Event/EC_Timeout_Filter.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -6807,8 +6113,16 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + RtecEventCommC.i \ + Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ + Event/EC_Timeout_Generator.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -6824,25 +6138,15 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ - Event/EC_Timeout_Generator.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + TimeBaseC.i \ + Time_Utilities.i .obj/EC_Reactive_Timeout_Generator.o .obj/EC_Reactive_Timeout_Generator.so .shobj/EC_Reactive_Timeout_Generator.o .shobj/EC_Reactive_Timeout_Generator.so: \ Event/EC_Reactive_Timeout_Generator.cpp \ Event/EC_Reactive_Timeout_Generator.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Timeout_Generator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -6872,7 +6176,7 @@ realclean: clean $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Event_Handler.i \ Event/EC_Timeout_Filter.h Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -7026,30 +6330,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ + RtecBaseC.h \ + svc_utils_export.h \ + RtecBaseC.i \ Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \ Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \ $(ACE_ROOT)/ace/Reactor.h \ @@ -7069,7 +6354,7 @@ realclean: clean Event/EC_MT_Dispatching.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -7251,38 +6536,13 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Dispatching.i \ Event/EC_Dispatching_Task.h Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7299,34 +6559,12 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -7350,6 +6588,11 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ @@ -7379,16 +6622,14 @@ realclean: clean Event/EC_Dispatching_Task.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -7424,8 +6665,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -7445,23 +6701,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7490,9 +6731,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -7506,31 +6751,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -7584,8 +6805,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -7602,39 +6823,14 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i Event/event_export.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -7658,6 +6854,11 @@ realclean: clean $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ @@ -7686,7 +6887,7 @@ realclean: clean .obj/EC_Scheduling_Strategy.o .obj/EC_Scheduling_Strategy.so .shobj/EC_Scheduling_Strategy.o .shobj/EC_Scheduling_Strategy.so: Event/EC_Scheduling_Strategy.cpp \ Event/EC_Scheduling_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -7868,30 +7069,11 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \ Event/event_export.h Event/EC_QOS_Info.i @@ -7899,7 +7081,7 @@ realclean: clean Event/EC_Null_Scheduling.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Scheduling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -8081,43 +7263,24 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i Event/EC_Null_Scheduling.i \ Event/EC_QOS_Info.h Event/event_export.h Event/EC_QOS_Info.i \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i .obj/EC_Group_Scheduling.o .obj/EC_Group_Scheduling.so .shobj/EC_Group_Scheduling.o .shobj/EC_Group_Scheduling.so: Event/EC_Group_Scheduling.cpp \ Event/EC_Group_Scheduling.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Scheduling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ + RtecBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -8299,42 +7462,23 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + svc_utils_export.h \ + RtecBaseC.i \ + RtecEventCommC.h \ + Event/event_export.h \ + RtecEventCommC.i \ Event/EC_Scheduling_Strategy.i Event/EC_Group_Scheduling.inl \ Event/EC_QOS_Info.h Event/event_export.h Event/EC_QOS_Info.i \ Event/EC_Supplier_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Supplier_Filter.i .obj/EC_ConsumerControl.o .obj/EC_ConsumerControl.so .shobj/EC_ConsumerControl.o .shobj/EC_ConsumerControl.so: Event/EC_ConsumerControl.cpp \ Event/EC_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -8521,7 +7665,7 @@ realclean: clean .obj/EC_SupplierControl.o .obj/EC_SupplierControl.so .shobj/EC_SupplierControl.o .shobj/EC_SupplierControl.so: Event/EC_SupplierControl.cpp \ Event/EC_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -8709,7 +7853,7 @@ realclean: clean Event/EC_Reactive_ConsumerControl.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -8892,9 +8036,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Event/EC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Reactive_ConsumerControl.i Event/EC_Event_Channel.h \ Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -8904,32 +8048,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -8946,56 +8067,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_ConsumerAdmin.h \ Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_ConsumerAdmin.i \ Event/EC_ProxyConsumer.h Event/EC_ProxyConsumer.i \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ @@ -9004,6 +8101,21 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \ @@ -9092,7 +8204,7 @@ realclean: clean Event/EC_Reactive_SupplierControl.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_SupplierControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -9275,9 +8387,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ Event/EC_SupplierControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ Event/EC_Reactive_SupplierControl.i Event/EC_Event_Channel.h \ Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -9287,32 +8399,9 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ Event/EC_Factory.i Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -9329,56 +8418,32 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ Event/EC_Event_Channel.i Event/EC_SupplierAdmin.h \ Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i \ Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ Event/event_export.h Event/EC_SupplierAdmin.i \ Event/EC_ProxySupplier.h Event/EC_ProxySupplier.i \ $(TAO_ROOT)/tao/Messaging/Messaging.h \ @@ -9387,6 +8452,21 @@ realclean: clean $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.h \ $(TAO_ROOT)/tao/Messaging/Messaging_SyncScope_PolicyC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_RT_PolicyC.i \ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.h \ $(TAO_ROOT)/tao/Messaging/Messaging_No_ImplC.i \ @@ -9475,7 +8555,7 @@ realclean: clean Event/EC_Bitmask_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -9657,35 +8737,15 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Bitmask_Filter.i .obj/EC_Masked_Type_Filter.o .obj/EC_Masked_Type_Filter.so .shobj/EC_Masked_Type_Filter.o .shobj/EC_Masked_Type_Filter.so: Event/EC_Masked_Type_Filter.cpp \ Event/EC_Masked_Type_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -9867,32 +8927,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_Masked_Type_Filter.i .obj/EC_Prefix_Filter_Builder.o .obj/EC_Prefix_Filter_Builder.so .shobj/EC_Prefix_Filter_Builder.o .shobj/EC_Prefix_Filter_Builder.so: Event/EC_Prefix_Filter_Builder.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + Event_Service_Constants.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -9940,8 +8980,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10077,7 +9117,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -10093,34 +9133,33 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + Time_Utilities.i \ Event/EC_Prefix_Filter_Builder.h Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ + RtecEventChannelAdminC.h \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ Event/event_export.h Event/EC_Filter_Builder.i \ Event/EC_Prefix_Filter_Builder.i Event/EC_Type_Filter.h \ - Event/EC_Filter.h Event/EC_Filter.i Event/EC_Type_Filter.i \ + Event/EC_Filter.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + Event/EC_Filter.i Event/EC_Type_Filter.i \ Event/EC_Conjunction_Filter.h Event/EC_Conjunction_Filter.i \ Event/EC_Disjunction_Filter.h Event/EC_Disjunction_Filter.i \ Event/EC_And_Filter.h Event/EC_And_Filter.i \ Event/EC_Negation_Filter.h Event/EC_Negation_Filter.i \ Event/EC_Bitmask_Filter.h Event/EC_Bitmask_Filter.i \ Event/EC_Masked_Type_Filter.h Event/EC_Masked_Type_Filter.i \ - Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \ - Event/EC_Timeout_Filter.i + Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h \ + RtecBaseC.h \ + RtecBaseC.i \ + Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i .obj/EC_And_Filter.o .obj/EC_And_Filter.so .shobj/EC_And_Filter.o .shobj/EC_And_Filter.so: Event/EC_And_Filter.cpp Event/EC_And_Filter.h \ $(ACE_ROOT)/ace/pre.h \ Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -10302,34 +9341,14 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ + Event/event_export.h \ + RtecEventCommC.i \ Event/event_export.h Event/EC_Filter.i Event/EC_And_Filter.i .obj/Event_Utilities.o .obj/Event_Utilities.so .shobj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ + Event_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -10511,10 +9530,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Event/event_export.h \ + RtecEventChannelAdminC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -10530,30 +9551,20 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + TimeBaseC.i \ + Time_Utilities.i \ + Event_Utilities.i .obj/EC_Gateway.o .obj/EC_Gateway.so .shobj/EC_Gateway.o .shobj/EC_Gateway.so: Event/EC_Gateway.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \ + Event/EC_Gateway.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -10591,8 +9602,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -10612,23 +9638,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -10657,9 +9668,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -10673,31 +9688,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -10751,8 +9742,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -10769,40 +9759,21 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + RtecEventCommS.h \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + Channel_Clients.h \ + Channel_Clients_T.h \ + Channel_Clients_T.i \ + Channel_Clients_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -10829,25 +9800,41 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i \ + Event_Utilities.i .obj/EC_Gateway_UDP.o .obj/EC_Gateway_UDP.so .shobj/EC_Gateway_UDP.o .shobj/EC_Gateway_UDP.so: Event/EC_Gateway_UDP.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h \ + Event/EC_Gateway_UDP.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecUDPAdminS.h \ + RtecUDPAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -10883,8 +9870,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -10904,23 +9906,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -10949,9 +9936,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -10965,31 +9956,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -11043,8 +10010,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecUDPAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -11061,44 +10028,17 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -11147,26 +10087,42 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i + Event/EC_Gateway_UDP.i \ + Event/ECG_UDP_Protocol.h \ + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i \ + Event_Utilities.i .obj/ECG_Mcast_EH.o .obj/ECG_Mcast_EH.so .shobj/ECG_Mcast_EH.o .shobj/ECG_Mcast_EH.so: Event/ECG_Mcast_EH.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h \ + Event/ECG_Mcast_EH.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ + Event/event_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -11204,8 +10160,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -11225,23 +10196,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -11270,9 +10226,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -11286,31 +10246,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -11364,8 +10300,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -11382,36 +10317,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -11459,36 +10368,53 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i \ + Event/ECG_Mcast_EH.i \ + Event/EC_Gateway_UDP.h \ + RtecUDPAdminS.h \ + RtecUDPAdminC.h \ + RtecUDPAdminC.i \ + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Event/EC_Gateway_UDP.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + TimeBaseC.h \ + svc_utils_export.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + TimeBaseC.i \ + Time_Utilities.i .obj/ECG_UDP_Sender.o .obj/ECG_UDP_Sender.so .shobj/ECG_UDP_Sender.o .shobj/ECG_UDP_Sender.so: Event/ECG_UDP_Sender.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h \ + Event/ECG_UDP_Sender.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventCommS.h \ + RtecEventCommC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -11524,8 +10450,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -11545,23 +10486,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -11590,9 +10516,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -11606,31 +10536,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -11684,8 +10590,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -11702,48 +10608,27 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecUDPAdminC.h \ + RtecUDPAdminC.i \ + Event/ECG_UDP_Sender.inl \ + Event/ECG_UDP_Protocol.h \ + Event/EC_Gateway_UDP.h \ + RtecUDPAdminS.h \ + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i \ + RtecEventChannelAdminS.h \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -11792,21 +10677,19 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i + Event/EC_Gateway_UDP.i .obj/EC_UDP_Admin.o .obj/EC_UDP_Admin.so .shobj/EC_UDP_Admin.o .shobj/EC_UDP_Admin.so: Event/EC_UDP_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h \ + Event/EC_UDP_Admin.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecUDPAdminS.h \ + RtecUDPAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -11842,8 +10725,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -11863,23 +10761,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -11908,9 +10791,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -11924,31 +10811,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -12002,8 +10865,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + Event/event_export.h \ + RtecUDPAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12020,30 +10883,10 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.i + RtecUDPAdminS_T.h \ + RtecUDPAdminS_T.i \ + RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i .obj/RtecDefaultEventDataS.o .obj/RtecDefaultEventDataS.so .shobj/RtecDefaultEventDataS.o .shobj/RtecDefaultEventDataS.so: RtecDefaultEventDataS.cpp \ RtecDefaultEventDataS.h \ @@ -12392,14 +11235,14 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/RtecEventCommS.o .obj/RtecEventCommS.so .shobj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h \ - $(ACE_ROOT)/ace/pre.h TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/pre.h \ + RtecEventCommC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -12435,8 +11278,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -12456,23 +11314,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -12501,9 +11344,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -12517,31 +11364,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -12595,7 +11418,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - svc_utils_export.h TimeBaseC.i \ + Event/event_export.h RtecEventCommC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12612,11 +11435,6 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \ - RtecDefaultEventDataS.h RtecDefaultEventDataC.h Event/event_export.h \ - RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \ - RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \ - RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \ RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \ RtecEventCommS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ @@ -12684,6 +11502,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -12754,14 +11582,13 @@ realclean: clean .obj/RtecEventChannelAdminS.o .obj/RtecEventChannelAdminS.so .shobj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \ RtecEventChannelAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - RtecEventCommS.h TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecEventChannelAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -12797,8 +11624,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -12818,23 +11660,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -12863,9 +11690,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -12879,31 +11710,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -12957,7 +11764,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - svc_utils_export.h TimeBaseC.i \ + Event/event_export.h RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -12974,17 +11781,8 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \ - RtecDefaultEventDataS.h RtecDefaultEventDataC.h Event/event_export.h \ - RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \ - RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \ - RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \ - RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \ - RtecEventCommS.i RtecBaseS.h RtecBaseC.h RtecBaseC.i RtecBaseS_T.h \ - RtecBaseS_T.i RtecBaseS_T.cpp RtecBaseS.i RtecEventChannelAdminC.h \ - RtecEventChannelAdminC.i RtecEventChannelAdminS_T.h \ - RtecEventChannelAdminS_T.i RtecEventChannelAdminS_T.cpp \ - RtecEventChannelAdminS.i \ + RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -13050,6 +11848,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -13119,14 +11927,13 @@ realclean: clean .obj/RtecUDPAdminS.o .obj/RtecUDPAdminS.so .shobj/RtecUDPAdminS.o .shobj/RtecUDPAdminS.so: RtecUDPAdminS.cpp RtecUDPAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - RtecEventCommS.h TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseS.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + RtecUDPAdminC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -13162,8 +11969,23 @@ realclean: clean $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -13183,23 +12005,8 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/String_Base.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ @@ -13228,9 +12035,13 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ @@ -13244,31 +12055,7 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Policy_ForwardC.i \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.h \ - $(TAO_ROOT)/tao/TimeBaseS_T.i \ - $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - TimeBaseC.h \ - $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ @@ -13322,7 +12109,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - svc_utils_export.h TimeBaseC.i \ + Event/event_export.h RtecUDPAdminC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -13339,14 +12126,8 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \ - RtecDefaultEventDataS.h RtecDefaultEventDataC.h Event/event_export.h \ - RtecDefaultEventDataC.i RtecDefaultEventDataS_T.h \ - RtecDefaultEventDataS_T.i RtecDefaultEventDataS_T.cpp \ - RtecDefaultEventDataS.i RtecEventCommC.h RtecEventCommC.i \ - RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \ - RtecEventCommS.i RtecUDPAdminC.h RtecUDPAdminC.i RtecUDPAdminS_T.h \ - RtecUDPAdminS_T.i RtecUDPAdminS_T.cpp RtecUDPAdminS.i \ + RtecUDPAdminS_T.h RtecUDPAdminS_T.i RtecUDPAdminS_T.cpp \ + RtecUDPAdminS.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -13412,6 +12193,16 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -13966,24 +12757,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - Event/event_export.h TimeBaseC.h svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - TimeBaseC.i RtecDefaultEventDataC.h RtecDefaultEventDataC.i \ - RtecEventCommC.i \ + Event/event_export.h RtecEventCommC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -14002,6 +12776,16 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -14277,24 +13061,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - Event/event_export.h RtecEventCommC.h TimeBaseC.h svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - TimeBaseC.i RtecDefaultEventDataC.h RtecDefaultEventDataC.i \ - RtecEventCommC.i RtecBaseC.h RtecBaseC.i RtecEventChannelAdminC.i \ + Event/event_export.h RtecEventChannelAdminC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -14313,6 +13080,16 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ @@ -14587,24 +13364,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - Event/event_export.h RtecEventCommC.h TimeBaseC.h svc_utils_export.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - TimeBaseC.i RtecDefaultEventDataC.h RtecDefaultEventDataC.i \ - RtecEventCommC.i RtecUDPAdminC.i \ + Event/event_export.h RtecUDPAdminC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i \ @@ -14623,6 +13383,16 @@ realclean: clean $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEventLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.RTEventLogAdmin index 9eb0013eadc..33420afffba 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTEventLogAdmin +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEventLogAdmin @@ -72,12 +72,12 @@ realclean: clean .obj/RTEventLogFactory_i.o .obj/RTEventLogFactory_i.so .shobj/RTEventLogFactory_i.o .shobj/RTEventLogFactory_i.so: Log/RTEventLogFactory_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.h \ + Log/RTEventLogFactory_i.h \ + RTEventLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -225,7 +225,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -280,8 +280,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -298,55 +298,55 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/rteventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + DsLogAdminS.h \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + RTEventLogAdminC.h \ + Log/rteventlog_export.h \ + RTEventLogAdminC.i \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.i \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS.i \ + Log/LogMgr_i.h \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -387,85 +387,85 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/RTEventLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/RTEventLogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \ + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + RtecSchedulerS.h \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecSchedulerC.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Log/RTEventLog_i.h \ + Event/EC_Event_Channel.h \ + Event/EC_Factory.h \ + Event/EC_Factory.i \ + Event/EC_Defaults.h \ + Event/EC_Event_Channel.i \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + Log/RTEventLogNotification.h \ + Event/EC_ConsumerAdmin.h \ + Event/EC_ProxySupplier.h \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ + Event/EC_ProxySupplier.i \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ + Event/EC_ConsumerAdmin.i \ + Event/EC_Default_Factory.h \ + Event/EC_Default_Factory.i \ + Event/EC_ProxyConsumer.h \ + Event/EC_ProxyConsumer.i \ + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i \ + Sched/Config_Scheduler.h \ + Sched/Scheduler_Generic.h \ + Sched/Scheduler.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/old_event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ + Sched/Scheduler.i \ + Sched/Scheduler_Generic.i \ + Sched/Config_Scheduler.i \ + Event/Module_Factory.h \ + Event/old_event_export.h \ + Event/Event_Channel.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ + Scheduler_Factory.h \ + Scheduler_Factory.i \ + Event/Local_ESTypes.h \ + Event/Local_ESTypes.i \ + Event/Timer_Module.h \ + Event/RT_Task.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Exit.h \ @@ -497,10 +497,10 @@ realclean: clean $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ + Event/RT_Task.i \ + Event/Timer_Module.i \ + Event/ReactorTask.h \ + Event/Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ $(ACE_ROOT)/ace/Select_Reactor_Base.h \ @@ -517,15 +517,15 @@ realclean: clean $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i + Event/Event_Manip.h \ + Event/Event_Manip.i \ + Event/Event_Channel.i .obj/RTEventLog_i.o .obj/RTEventLog_i.so .shobj/RTEventLog_i.o .shobj/RTEventLog_i.so: Log/RTEventLog_i.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/RTEventLog_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ + Log/RTEventLog_i.h \ + DsLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -673,7 +673,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -728,8 +728,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -746,56 +746,56 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/rteventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + RTEventLogAdminS.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + RTEventLogAdminC.h \ + Log/rteventlog_export.h \ + RTEventLogAdminC.i \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.i \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS.i \ + Log/Log_i.h \ + Log/LogRecordStore.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -836,85 +836,85 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Dispatching.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_QOS_Info.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h \ + Log/LogNotification.h \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Event/EC_Event_Channel.h \ + Event/EC_Factory.h \ + Event/EC_Factory.i \ + Event/EC_Defaults.h \ + Event/EC_Event_Channel.i \ + Log/LogMgr_i.h \ + Event_Utilities.h \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ + Event_Utilities.i \ + Event/EC_Default_Factory.h \ + Event/EC_Default_Factory.i \ + Event/EC_Dispatching.h \ + Event/EC_Dispatching.i \ + Event/EC_ConsumerAdmin.h \ + Event/EC_ProxySupplier.h \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ + Event/EC_ProxySupplier.i \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ + Event/EC_ConsumerAdmin.i \ + Event/EC_SupplierAdmin.h \ + Event/EC_ProxyConsumer.h \ + Event/EC_ProxyConsumer.i \ + Event/EC_SupplierAdmin.i \ + Event/EC_Timeout_Generator.h \ + Event/EC_Timeout_Filter.h \ + Event/EC_QOS_Info.h \ + Event/EC_QOS_Info.i \ + Event/EC_Timeout_Filter.i \ + Event/EC_Timeout_Generator.i \ + Event/EC_ObserverStrategy.h \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_SupplierControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_SupplierControl.i \ + Event/EC_ObserverStrategy.i \ + Event/EC_ConsumerControl.h \ + Event/EC_ConsumerControl.i \ + Event/EC_SupplierControl.h \ + Event/EC_SupplierControl.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/RTEventLogNotification.o .obj/RTEventLogNotification.so .shobj/RTEventLogNotification.o .shobj/RTEventLogNotification.so: Log/RTEventLogNotification.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogNotification.h \ + Log/LogNotification.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + DsLogAdminS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1062,7 +1062,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/NVList.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ @@ -1117,8 +1117,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ + svc_utils_export.h \ + TimeBaseC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ @@ -1135,98 +1135,98 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogNotificationS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/RTEventLogNotification.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + DsLogAdminC.h \ + Log/log_export.h \ + DsLogAdminC.i \ + DsLogAdminS_T.h \ + DsLogAdminS_T.i \ + DsLogAdminS_T.cpp \ + DsLogAdminS.i \ + DsLogNotificationS.h \ + DsLogNotificationC.h \ + DsLogNotificationC.i \ + DsLogNotificationS_T.h \ + DsLogNotificationS_T.i \ + DsLogNotificationS_T.cpp \ + DsLogNotificationS.i \ + Log/RTEventLogNotification.h \ + Event/EC_ConsumerAdmin.h \ + Event/EC_ProxySupplier.h \ + RtecEventChannelAdminS.h \ + RtecEventCommS.h \ + RtecDefaultEventDataS.h \ + RtecDefaultEventDataC.h \ + Event/event_export.h \ + RtecDefaultEventDataC.i \ + RtecDefaultEventDataS_T.h \ + RtecDefaultEventDataS_T.i \ + RtecDefaultEventDataS_T.cpp \ + RtecDefaultEventDataS.i \ + RtecEventCommC.h \ + RtecEventCommC.i \ + RtecEventCommS_T.h \ + RtecEventCommS_T.i \ + RtecEventCommS_T.cpp \ + RtecEventCommS.i \ + RtecBaseS.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecEventChannelAdminC.h \ + RtecEventChannelAdminC.i \ + RtecEventChannelAdminS_T.h \ + RtecEventChannelAdminS_T.i \ + RtecEventChannelAdminS_T.cpp \ + RtecEventChannelAdminS.i \ + Event/EC_Filter.h \ + Event/EC_Filter.i \ + Event/EC_ProxySupplier.i \ + ESF/ESF_Peer_Admin.h \ + ESF/ESF_Proxy_Admin.h \ + ESF/ESF_Proxy_Collection.h \ + ESF/ESF_Proxy_Collection.i \ + ESF/ESF_Proxy_Collection.cpp \ + ESF/ESF_Worker.h \ + ESF/ESF_Worker.i \ + ESF/ESF_Worker.cpp \ + ESF/ESF_Proxy_Admin.i \ + ESF/ESF_Proxy_Admin.cpp \ + ESF/ESF_Shutdown_Proxy.h \ + ESF/ESF_Shutdown_Proxy.i \ + ESF/ESF_Shutdown_Proxy.cpp \ + ESF/ESF_Peer_Admin.i \ + ESF/ESF_Peer_Admin.cpp \ + ESF/ESF_Peer_Workers.h \ + ESF/ESF_Peer_Workers.i \ + ESF/ESF_Peer_Workers.cpp \ + Event/EC_ConsumerAdmin.i \ + Event/EC_Event_Channel.h \ + Event/EC_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Log/rteventlog_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RTEventLogAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \ + Event/EC_Factory.i \ + Event/EC_Defaults.h \ + Event/EC_Event_Channel.i \ + RTEventLogAdminS.h \ + RTEventLogAdminC.h \ + Log/rteventlog_export.h \ + RTEventLogAdminC.i \ + RTEventLogAdminS_T.h \ + RTEventLogAdminS_T.i \ + RTEventLogAdminS_T.cpp \ + RTEventLogAdminS.i \ + Event/EC_Default_Factory.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ @@ -1244,31 +1244,31 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Event/EC_Default_Factory.i \ + Event/EC_ProxyConsumer.h \ + Event/EC_ProxyConsumer.i \ + Time_Utilities.h \ + Time_Utilities.i \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Dispatching.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Dispatching.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_QOS_Info.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_QOS_Info.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerControl.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp + Event_Utilities.h \ + Event_Service_Constants.h \ + Event_Utilities.i \ + Event/EC_Dispatching.h \ + Event/EC_Dispatching.i \ + Event/EC_Filter_Builder.h \ + Event/EC_Filter_Builder.i \ + Event/EC_QOS_Info.h \ + Event/EC_QOS_Info.i \ + Event/EC_Scheduling_Strategy.h \ + Event/EC_Scheduling_Strategy.i \ + Event/EC_ConsumerControl.h \ + Event/EC_ConsumerControl.i \ + ESF/ESF_RefCount_Guard.h \ + ESF/ESF_RefCount_Guard.i \ + ESF/ESF_RefCount_Guard.cpp \ + ESF/ESF_Proxy_RefCount_Guard.h \ + ESF/ESF_Proxy_RefCount_Guard.i \ + ESF/ESF_Proxy_RefCount_Guard.cpp .obj/RTEventLogAdminS.o .obj/RTEventLogAdminS.so .shobj/RTEventLogAdminS.o .shobj/RTEventLogAdminS.so: RTEventLogAdminS.cpp RTEventLogAdminS.h \ $(ACE_ROOT)/ace/pre.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSched b/TAO/orbsvcs/orbsvcs/Makefile.RTSched index dad6a1a9a88..2693e6ea688 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTSched +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSched @@ -157,9 +157,9 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Runtime_Scheduler.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -288,12 +288,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -304,13 +304,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -332,25 +332,25 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Runtime_Scheduler.i .obj/Runtime_Scheduler.o .obj/Runtime_Scheduler.so .shobj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -532,7 +532,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -548,21 +548,21 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseC.i \ + Time_Utilities.i \ + Runtime_Scheduler.h \ + Scheduler_Factory.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -584,20 +584,20 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Runtime_Scheduler.i .obj/Scheduler_Utilities.o .obj/Scheduler_Utilities.so .shobj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -627,8 +627,8 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + Scheduler_Utilities.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -784,9 +784,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -802,16 +802,16 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.i + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Utilities.i .obj/Config_Scheduler.o .obj/Config_Scheduler.so .shobj/Config_Scheduler.o .shobj/Config_Scheduler.so: Sched/Config_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -993,7 +993,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -1009,21 +1009,21 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + TimeBaseC.i \ + Time_Utilities.i \ + Scheduler_Factory.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ Sched/Config_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1045,23 +1045,23 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ + Event_Service_Constants.h \ Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \ + Sched/Scheduler_Generic.h \ + Sched/Scheduler.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -1088,8 +1088,8 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \ + Sched/Scheduler.i \ + Sched/Scheduler_Generic.i \ Sched/Config_Scheduler.i .obj/DynSched.o .obj/DynSched.so .shobj/DynSched.o .shobj/DynSched.so: Sched/DynSched.cpp Sched/DynSched.h \ @@ -1219,7 +1219,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ Sched/SchedEntry.h Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1303,9 +1303,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -1321,13 +1321,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1472,8 +1472,8 @@ realclean: clean $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + Scheduler_Factory.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1562,12 +1562,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -1583,13 +1583,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1611,19 +1611,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ Sched/Reconfig_Sched_Utils.h Sched/sched_export.h \ Sched/Reconfig_Sched_Utils.i Sched/Reconfig_Sched_Utils_T.h \ Sched/Reconfig_Sched_Utils_T.i Sched/Reconfig_Sched_Utils_T.cpp \ @@ -1631,8 +1631,8 @@ realclean: clean $(ACE_ROOT)/ace/Sched_Params.i \ Sched/Reconfig_Scheduler.i Sched/Reconfig_Scheduler_T.i \ Sched/Reconfig_Scheduler_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Time_Utilities.h \ + Time_Utilities.i .obj/Reconfig_Sched_Utils.o .obj/Reconfig_Sched_Utils.so .shobj/Reconfig_Sched_Utils.o .shobj/Reconfig_Sched_Utils.so: Sched/Reconfig_Sched_Utils.cpp \ Sched/Reconfig_Sched_Utils_T.h \ @@ -1641,7 +1641,7 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ Sched/Reconfig_Sched_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ + Scheduler_Factory.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1665,7 +1665,7 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1821,12 +1821,12 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Naming/naming_export.h \ + CosNamingC.i \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -1842,13 +1842,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Scheduler_Factory.i \ + RtecSchedulerS.h \ + TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ @@ -1870,19 +1870,19 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RtecBaseS.h \ + RtecBaseS_T.h \ + RtecBaseS_T.i \ + RtecBaseS_T.cpp \ + RtecBaseS.i \ + RtecSchedulerS_T.h \ + RtecSchedulerS_T.i \ + RtecSchedulerS_T.cpp \ + RtecSchedulerS.i \ Sched/sched_export.h Sched/Reconfig_Sched_Utils.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ @@ -1919,8 +1919,8 @@ realclean: clean Sched/Reconfig_Sched_Utils_T.i Sched/Reconfig_Sched_Utils_T.cpp \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + Time_Utilities.h \ + Time_Utilities.i .obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1928,7 +1928,7 @@ realclean: clean $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2107,9 +2107,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2125,13 +2125,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2172,8 +2172,8 @@ realclean: clean $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + Time_Utilities.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2329,7 +2329,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2345,8 +2345,8 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + Time_Utilities.i \ Sched/Scheduler.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -2374,12 +2374,12 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + RtecSchedulerC.h \ + Sched/sched_export.h \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ Sched/sched_export.h Sched/Scheduler.i .obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \ @@ -2511,7 +2511,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2595,9 +2595,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2613,13 +2613,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ Sched/sched_export.h Sched/Scheduler.i Sched/Scheduler_Generic.i .obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \ @@ -2751,7 +2751,7 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ Sched/SchedEntry.h Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2835,9 +2835,9 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/sched_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + Sched/sched_export.h \ + TimeBaseC.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -2853,13 +2853,13 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + TimeBaseC.i \ + RtecBaseC.h \ + RtecBaseC.i \ + RtecSchedulerC.i \ + Event_Service_Constants.h \ + Time_Utilities.h \ + Time_Utilities.i \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils index fecc47fec7a..bfd3d22b9a4 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils +++ b/TAO/orbsvcs/orbsvcs/Makefile.Svc_Utils @@ -77,9 +77,9 @@ realclean: clean .obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + Time_Utilities.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \ + TimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -261,7 +261,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -277,12 +277,12 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i + TimeBaseC.i \ + Time_Utilities.i .obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \ + svc_utils_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.av b/TAO/orbsvcs/orbsvcs/Makefile.av index bd3442378fb..4e07b883e7f 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.av +++ b/TAO/orbsvcs/orbsvcs/Makefile.av @@ -2335,9 +2335,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2379,8 +2379,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -2393,51 +2393,51 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.h \ + sfpC.i \ AV/Policy.h AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h \ AV/Protocol_Factory.h AV/MCast.i AV/UDP.h AV/UDP.i AV/RTCP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + AV/UDP.h \ + AV/RTP.h \ + AV/Protocol_Factory.h \ + AV/Policy.h \ + AV/MCast.h \ AV/RTCP_Channel.h AV/RTP.h AV/RTCP_Packet.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ @@ -2471,7 +2471,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/ORB_Core.i .obj/AV_Core.o .obj/AV_Core.so .shobj/AV_Core.o .shobj/AV_Core.so: AV/AV_Core.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ + AV/AV_Core.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ @@ -2607,7 +2607,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -2659,11 +2659,11 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + AV/AV_export.h \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -2677,7 +2677,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + AV/FlowSpec_Entry.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/Containers.h \ @@ -2688,7 +2688,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + AV/Transport.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -2786,28 +2786,28 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ + AV/Protocol_Factory.h \ + AV/Policy.h \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/TCP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + AV/Policy.i \ + AV/UDP.h \ + AV/UDP.i \ + AV/TCP.h \ + AV/RTP.h \ + AV/MCast.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTCP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + AV/MCast.i \ + AV/RTCP.h \ + AV/AVStreams_i.h \ $(ACE_ROOT)/ace/ATM_Addr.h \ $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -2820,42 +2820,42 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTCP_Channel.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTCP_Packet.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/default_resource.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Resource_Factory.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/AVStreams_i.i \ + AV/Flows_T.h \ + AV/Flows_T.cpp \ + AV/RTCP_Channel.h \ + AV/RTCP_Packet.h \ + AV/sfp.h \ + sfpC.h \ + sfpC.i \ + AV/default_resource.h \ + AV/Resource_Factory.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ @@ -2893,7 +2893,7 @@ AVSVC_COMPONENTS: .obj/FlowSpec_Entry.o .obj/FlowSpec_Entry.so .shobj/FlowSpec_Entry.o .shobj/FlowSpec_Entry.so: AV/FlowSpec_Entry.cpp AV/FlowSpec_Entry.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3029,7 +3029,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3081,10 +3081,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -3486,9 +3486,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3530,8 +3530,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -3544,40 +3544,40 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.cpp .obj/Endpoint_Strategy.o .obj/Endpoint_Strategy.so .shobj/Endpoint_Strategy.o .shobj/Endpoint_Strategy.so: AV/Endpoint_Strategy.cpp AV/Endpoint_Strategy.h \ @@ -3855,9 +3855,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -3899,8 +3899,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -3913,34 +3913,34 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h \ $(TAO_ROOT)/tao/debug.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/Endpoint_Strategy_T.h \ @@ -4254,9 +4254,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4298,8 +4298,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -4312,34 +4312,34 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h \ $(TAO_ROOT)/tao/debug.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp \ @@ -4621,9 +4621,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4665,8 +4665,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -4679,51 +4679,51 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/AV_Core.h AV/Transport.h AV/AVStreams_i.i AV/Flows_T.h \ AV/Flows_T.cpp AV/sfp.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.h \ + sfpC.i \ AV/Policy.h AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h \ AV/Protocol_Factory.h AV/MCast.i AV/UDP.h AV/UDP.i AV/Nil.h AV/RTCP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ + AV/UDP.h \ + AV/RTP.h \ + AV/Protocol_Factory.h \ + AV/Policy.h \ + AV/MCast.h \ AV/RTCP_Channel.h AV/RTP.h AV/RTCP_Packet.h AV/TCP.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ @@ -4883,9 +4883,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -4930,10 +4930,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -5055,7 +5055,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -5068,35 +5068,35 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp .obj/UDP.o .obj/UDP.so .shobj/UDP.o .shobj/UDP.so: AV/UDP.cpp AV/UDP.h \ @@ -5252,9 +5252,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5299,10 +5299,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -5424,7 +5424,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -5437,35 +5437,35 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/MCast.h AV/MCast.i .obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: AV/Policy.cpp AV/Policy.h \ @@ -5614,9 +5614,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5661,10 +5661,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -5939,9 +5939,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ AV/Policy.i AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -5986,10 +5986,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -6113,7 +6113,7 @@ AVSVC_COMPONENTS: .obj/MCast.o .obj/MCast.so .shobj/MCast.o .shobj/MCast.so: AV/MCast.cpp AV/MCast.h \ $(ACE_ROOT)/ace/pre.h \ AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -6249,7 +6249,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6301,10 +6301,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -6437,7 +6437,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -6450,35 +6450,35 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp .obj/media_timer.o .obj/media_timer.so .shobj/media_timer.o .shobj/media_timer.so: AV/media_timer.cpp AV/media_timer.h \ @@ -6637,7 +6637,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + AV/AVStreams_i.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -6785,9 +6785,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -6829,8 +6829,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -6843,50 +6843,50 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/MCast.i \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ + AV/AVStreams_i.i \ + AV/Flows_T.h \ + AV/Flows_T.cpp \ + AV/UDP.h \ + AV/Protocol_Factory.h \ + AV/Policy.h \ + AV/Policy.i \ + AV/UDP.i \ + AV/RTP.h \ + AV/MCast.h \ + AV/MCast.i \ AV/RTCP_Channel.h AV/RTP.h AV/RTCP_Packet.h AV/media_timer.h \ AV/global.h AV/md5.h @@ -6990,15 +6990,15 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + AV/AV_export.h \ + AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + AV/Policy.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ @@ -7047,10 +7047,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AV/Policy.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7095,10 +7095,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -7120,7 +7120,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -7212,8 +7212,8 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/Policy.h AV/FlowSpec_Entry.h AV/MCast.h AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ @@ -7247,8 +7247,8 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i AV/RTP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + AV/AV_export.h \ + AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -7257,7 +7257,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + AV/Policy.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ @@ -7374,10 +7374,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AV/Policy.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7422,10 +7422,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -7447,7 +7447,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -7539,8 +7539,8 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/Policy.h AV/FlowSpec_Entry.h AV/MCast.h AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ @@ -7548,11 +7548,11 @@ AVSVC_COMPONENTS: .obj/RTP.o .obj/RTP.so .shobj/RTP.o .shobj/RTP.so: AV/RTP.cpp AV/RTP.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Protocol_Factory.h \ + AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -7584,7 +7584,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.h \ + AV/Policy.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(TAO_ROOT)/tao/PortableServer/ORB_Manager.h \ @@ -7701,10 +7701,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Policy.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ + AV/Policy.i \ + AV/FlowSpec_Entry.h \ + AV/AV_Core.h \ + AVStreamsC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -7749,10 +7749,10 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -7774,7 +7774,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ + AV/Transport.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -7866,19 +7866,19 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ AV/Policy.h AV/FlowSpec_Entry.h AV/MCast.h AV/Protocol_Factory.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ AV/MCast.i AV/RTCP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + AV/AVStreams_i.h \ $(ACE_ROOT)/ace/ATM_Addr.h \ $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -7891,47 +7891,47 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/Endpoint_Strategy.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/UDP.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/RTP.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/AVStreams_i.i \ + AV/Flows_T.h \ + AV/Flows_T.cpp \ + AV/UDP.h \ + AV/UDP.i \ + AV/RTP.h \ AV/RTCP_Channel.h AV/RTCP_Packet.h AV/Nil.h .obj/sfp.o .obj/sfp.so .shobj/sfp.o .shobj/sfp.so: AV/sfp.cpp AV/sfp.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ + AV/AV_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \ + sfpC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -8110,7 +8110,7 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \ + sfpC.i \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -8128,11 +8128,11 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ AV/Policy.i AV/MCast.h AV/FlowSpec_Entry.h AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + AVStreamsC.h \ + CosPropertyServiceC.h \ + Property/property_export.h \ + CosPropertyServiceC.i \ + AVStreamsC.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -8253,7 +8253,7 @@ AVSVC_COMPONENTS: $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + CosPropertyServiceS.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -8266,43 +8266,43 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/AVStreams_i.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ AV/AVStreams_i.i AV/Flows_T.h AV/Flows_T.cpp AV/UDP.h AV/UDP.i \ $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/ARGV.i .obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: AV/default_resource.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/default_resource.h \ + AV/default_resource.h \ $(ACE_ROOT)/ace/pre.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ + AV/AVStreams_i.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -8575,9 +8575,9 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/objectid.h \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + AV/AV_export.h \ + CosPropertyServiceS.h \ + CosPropertyServiceC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ @@ -8619,8 +8619,8 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/property_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + Property/property_export.h \ + CosPropertyServiceC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ @@ -8633,43 +8633,43 @@ AVSVC_COMPONENTS: $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AV_Core.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \ + CosPropertyServiceS_T.h \ + CosPropertyServiceS_T.i \ + CosPropertyServiceS_T.cpp \ + CosPropertyServiceS.i \ + AVStreamsS.h \ + AVStreamsC.h \ + AVStreamsC.i \ + AVStreamsS_T.h \ + AVStreamsS_T.i \ + AVStreamsS_T.cpp \ + AVStreamsS.i \ + Property/CosPropertyService_i.h \ + CosNamingC.h \ + Naming/naming_export.h \ + CosNamingC.i \ + AV/AV_Core.h \ + AV/Endpoint_Strategy.h \ + AV/Endpoint_Strategy_T.h \ + AV/Endpoint_Strategy_T.cpp \ $(TAO_ROOT)/tao/debug.h \ $(ACE_ROOT)/ace/Process_Semaphore.h \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Transport.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Flows_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Resource_Factory.h \ + Null_MediaCtrlS.h \ + Null_MediaCtrlC.h \ + Null_MediaCtrlC.i \ + Null_MediaCtrlS_T.h \ + Null_MediaCtrlS_T.i \ + Null_MediaCtrlS_T.cpp \ + Null_MediaCtrlS.i \ + AV/FlowSpec_Entry.h \ + AV/Transport.h \ + AV/Transport.i \ + AV/FlowSpec_Entry.i \ + AV/AVStreams_i.i \ + AV/Flows_T.h \ + AV/Flows_T.cpp \ + AV/Resource_Factory.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ |