1 files changed, 162 insertions, 162 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
index 42545045192..b73de01fc72 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
+++ b/TAO/orbsvcs/orbsvcs/Makefile.DsLogAdmin
@@ -77,9 +77,9 @@ realclean: clean
 
 
 .obj/LogRecordStore.o .obj/LogRecordStore.so .shobj/LogRecordStore.o .shobj/LogRecordStore.so: Log/LogRecordStore.cpp \
-  Time_Utilities.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(ACE_ROOT)/ace/pre.h \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -264,12 +264,12 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
-  Time_Utilities.i \
-  Log/LogRecordStore.h \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(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 \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS_T.h \
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
@@ -286,17 +286,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 \
-  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 \
+  $(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 \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -333,20 +333,20 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Log/Log_Constraint_Interpreter.h \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Tokens.h \
-  Trader/trading_export.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter_Utils.h \
-  Trader/Interpreter.h \
-  Log/Log_Constraint_Visitors.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
 
 .obj/BasicLogFactory_i.o .obj/BasicLogFactory_i.so .shobj/BasicLogFactory_i.o .shobj/BasicLogFactory_i.so: Log/BasicLogFactory_i.cpp \
-  Log/BasicLogFactory_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h \
   $(ACE_ROOT)/ace/pre.h \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -480,7 +480,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
   $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseS.i \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -537,8 +537,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -550,21 +550,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 \
-  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/BasicLog_i.h \
-  Log/Log_i.h \
-  Log/LogRecordStore.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/BasicLog_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -607,8 +607,8 @@ realclean: clean
 
 .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 \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -742,7 +742,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
   $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseS.i \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -799,8 +799,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -812,18 +812,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 \
-  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 \
+  $(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 \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -860,20 +860,20 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Log/Log_Constraint_Interpreter.h \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Tokens.h \
-  Trader/trading_export.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter_Utils.h \
-  Trader/Interpreter.h \
-  Log/Log_Constraint_Visitors.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
 
 .obj/BasicLog_i.o .obj/BasicLog_i.so .shobj/BasicLog_i.o .shobj/BasicLog_i.so: Log/BasicLog_i.cpp \
-  Log/BasicLog_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/BasicLog_i.h \
   $(ACE_ROOT)/ace/pre.h \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -1007,7 +1007,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
   $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseS.i \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -1064,8 +1064,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1077,19 +1077,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 \
-  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 \
+  $(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 \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -1126,14 +1126,14 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Log/LogMgr_i.h
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogMgr_i.h
 
 .obj/Log_i.o .obj/Log_i.so .shobj/Log_i.o .shobj/Log_i.so: Log/Log_i.cpp \
-  Log/Log_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \
   $(ACE_ROOT)/ace/pre.h \
-  Log/LogRecordStore.h \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -1267,7 +1267,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
   $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseS.i \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -1324,8 +1324,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1337,17 +1337,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 \
-  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 \
+  $(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 \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -1384,21 +1384,21 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Log/Iterator_i.h \
-  Log/Log_Constraint_Interpreter.h \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Tokens.h \
-  Trader/trading_export.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter_Utils.h \
-  Trader/Interpreter.h \
-  Log/Log_Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Iterator_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h \
   $(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 \
-  DsLogAdminS.h \
-  TimeBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseS.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -1532,7 +1532,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TimeBaseS_T.i \
   $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseS.i \
-  TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -1589,8 +1589,8 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  svc_utils_export.h \
-  TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1602,20 +1602,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 \
-  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/BasicLog_i.h \
-  Log/Log_i.h \
-  Log/LogRecordStore.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/BasicLog_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Log_i.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/LogRecordStore.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -1657,8 +1657,8 @@ realclean: clean
 .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 \
   Log/Log_Constraint_Visitors.h \
   $(ACE_ROOT)/ace/pre.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter_Utils.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/post.h \
@@ -1871,7 +1871,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Trader/trading_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -1880,21 +1880,21 @@ realclean: clean
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Tokens.h \
-  DsLogAdminC.h \
-  Log/log_export.h \
-  TimeBaseC.h \
-  svc_utils_export.h \
-  TimeBaseC.i \
-  DsLogAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \
   Log/log_export.h
 
 .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 \
-  Trader/Constraint_Nodes.h \
-  Trader/Constraint_Tokens.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h \
   $(ACE_ROOT)/ace/post.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -2079,9 +2079,9 @@ realclean: clean
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  Trader/trading_export.h \
-  Trader/Constraint_Visitors.h \
-  Trader/Interpreter_Utils.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/trading_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -2118,13 +2118,13 @@ realclean: clean
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  Trader/Interpreter.h \
-  DsLogAdminC.h \
-  Log/log_export.h \
-  TimeBaseC.h \
-  svc_utils_export.h \
-  TimeBaseC.i \
-  DsLogAdminC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Interpreter.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/log_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/DsLogAdminC.i \
   Log/log_export.h Log/Log_Constraint_Visitors.h
 
 .obj/DsLogAdminS.o .obj/DsLogAdminS.so .shobj/DsLogAdminS.o .shobj/DsLogAdminS.so: DsLogAdminS.cpp DsLogAdminS.h \