ChangeLogTag: Mon May 12 16:15:27 2003 Simon McQueen <sm@prismtechnologies.com>

22 files changed, 193 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 573bc5623ce..8f181243e9b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,29 @@
+Mon May 12 16:15:27 2003  Simon McQueen  <sm@prismtechnologies.com>
+
+        * examples/AMH/Sink_Server/client.bor:
+        * examples/AMH/Sink_Server/mt_server.bor:
+        * examples/AMH/Sink_Server/st_server.bor:
+        * examples/Buffered_AMI/client.bor:
+        * examples/Buffered_AMI/server.bor:
+        * examples/Buffered_Oneways/Buffered_Oneways_client.bor:
+        * examples/Buffered_Oneways/Buffered_Oneways_server.bor:
+        * orbsvcs/CosEvent_Service/Makefile.bor:
+        * orbsvcs/Event_Service/Makefile.bor:
+        * orbsvcs/IFR_Service/IFR_Service.bor:
+        * orbsvcs/ImplRepo_Service/ImplRepo.bor:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.bor:
+        * orbsvcs/LoadBalancer/LoadManager.bor:
+        * orbsvcs/LoadBalancer/LoadMonitor.bor:
+        * orbsvcs/Naming_Service/Naming_Service.bor:
+        * orbsvcs/Naming_Service/NT_Naming_Service.bor:
+        * orbsvcs/Notify_Service/Notify_Service.bor:
+        * orbsvcs/Notify_Service/NT_Notify_Service.bor:
+        * orbsvcs/Time_Service/Time_Service_Server.bor:
+        * orbsvcs/Time_Service/Time_Service_Clerk.bor:
+        * orbsvcs/Trading_Service/Makefile.bor:
+
+          And yet more fixes for static builds linking. More to come.
+
 Sun May 11 22:48:13 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs/LoadBalancer/Makefile.LoadManager:
diff --git a/TAO/examples/AMH/Sink_Server/client.bor b/TAO/examples/AMH/Sink_Server/client.bor
index a79346ac59b..85544d99996 100644
--- a/TAO/examples/AMH/Sink_Server/client.bor
+++ b/TAO/examples/AMH/Sink_Server/client.bor
@@ -17,14 +17,21 @@ CFLAGS = \
    $(TAO_CFLAGS) \
    $(TAO_PORTABLESERVER_CFLAGS) \
    $(TAO_VALUETYPE_CFLAGS) \
-   $(TAO_STRATEGIES_CFLAGS)
+   $(TAO_STRATEGIES_CFLAGS) \
+   $(TAO_VALUETYPE_CFLAGS) \
+   $(TAO_IORINTERCEPTOR_CFLAGS) \
+   $(TAO_ORT_CFLAGS)
 
 LIBFILES = \
    $(ACE_LIB) \
    $(TAO_LIB) \
    $(TAO_PORTABLESERVER_LIB) \
    $(TAO_VALUETYPE_LIB) \
-   $(TAO_STRATEGIES_LIB)
+   $(TAO_STRATEGIES_LIB) \
+   $(TAO_VALUETYPE_LIB) \
+   $(TAO_IORINTERCEPTOR_LIB) \
+   $(TAO_ORT_LIB)
+
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.bor b/TAO/examples/AMH/Sink_Server/mt_server.bor
index 103a1a8e882..821faff2d10 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.bor
+++ b/TAO/examples/AMH/Sink_Server/mt_server.bor
@@ -20,7 +20,10 @@ CFLAGS = \
 	$(TAO_CFLAGS) \
    $(TAO_PORTABLESERVER_CFLAGS) \
    $(TAO_VALUETYPE_CFLAGS) \
-   $(TAO_STRATEGIES_CFLAGS)
+   $(TAO_STRATEGIES_CFLAGS) \
+   $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 
 LIBFILES = \
@@ -28,7 +31,10 @@ LIBFILES = \
 	$(TAO_LIB) \
    $(TAO_PORTABLESERVER_LIB) \
    $(TAO_VALUETYPE_LIB) \
-   $(TAO_STRATEGIES_LIB)
+   $(TAO_STRATEGIES_LIB) \
+   $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/examples/AMH/Sink_Server/st_server.bor b/TAO/examples/AMH/Sink_Server/st_server.bor
index f52d3ed4ffc..7d561d1d460 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.bor
+++ b/TAO/examples/AMH/Sink_Server/st_server.bor
@@ -19,14 +19,20 @@ CFLAGS = \
         $(TAO_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_VALUETYPE_CFLAGS) \
-        $(TAO_STRATEGIES_CFLAGS)
+        $(TAO_STRATEGIES_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
         $(ACE_LIB) \
         $(TAO_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_VALUETYPE_LIB) \
-        $(TAO_STRATEGIES_LIB)
+        $(TAO_STRATEGIES_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/examples/Buffered_AMI/client.bor b/TAO/examples/Buffered_AMI/client.bor
index 5411b0d6063..4d1cb5ab053 100644
--- a/TAO/examples/Buffered_AMI/client.bor
+++ b/TAO/examples/Buffered_AMI/client.bor
@@ -17,14 +17,20 @@ CFLAGS = \
 	$(TAO_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_VALUETYPE_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_VALUETYPE_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/examples/Buffered_AMI/server.bor b/TAO/examples/Buffered_AMI/server.bor
index 9f8a11eb71d..3b9a4e70051 100644
--- a/TAO/examples/Buffered_AMI/server.bor
+++ b/TAO/examples/Buffered_AMI/server.bor
@@ -17,14 +17,20 @@ CFLAGS = \
 	$(TAO_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_VALUETYPE_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_VALUETYPE_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor b/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor
index 2b35bb58d86..2e97cf4c310 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor
@@ -17,13 +17,19 @@ CFLAGS = \
         $(ACE_CFLAGS) \
         $(TAO_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
         $(ACE_LIB) \
         $(TAO_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Test.idl
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor b/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor
index f20e6e6a7cd..281e9f59e21 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor
@@ -17,13 +17,19 @@ CFLAGS = \
         $(ACE_CFLAGS) \
         $(TAO_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
         $(ACE_LIB) \
         $(TAO_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Test.idl
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.bor b/TAO/orbsvcs/CosEvent_Service/Makefile.bor
index 2f7119bf51e..241cd631363 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.bor
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.bor
@@ -13,7 +13,10 @@ CFLAGS = \
 	$(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_NAMING_CFLAGS) \
         $(TAO_MESSAGING_CFLAGS) \
-	$(TAO_EVENT_CFLAGS)
+	$(TAO_EVENT_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -21,7 +24,10 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_NAMING_LIB) \
         $(TAO_MESSAGING_LIB) \
-	$(TAO_EVENT_LIB)
+	$(TAO_EVENT_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile.bor b/TAO/orbsvcs/Event_Service/Makefile.bor
index 540c2a89440..608c988bb05 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.bor
+++ b/TAO/orbsvcs/Event_Service/Makefile.bor
@@ -16,7 +16,10 @@ CFLAGS = \
 	$(TAO_RTSCHED_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
         $(TAO_MESSAGING_CFLAGS) \
-	$(TAO_RTOLDEVENT_CFLAGS)
+	$(TAO_RTOLDEVENT_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -27,7 +30,10 @@ LIBFILES = \
 	$(TAO_RTSCHED_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_MESSAGING_LIB) \
-	$(TAO_RTOLDEVENT_LIB)
+	$(TAO_RTOLDEVENT_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.bor b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
index 0b9cfe7704e..70b116dd528 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.bor
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
@@ -20,7 +20,10 @@ CFLAGS = \
 	$(TAO_IORTABLE_CFLAGS) \
 	$(TAO_IFR_CLIENT_CFLAGS) \
         $(TAO_TYPECODEFACTORY_CFLAGS) \
-        $(TAO_IFRSERVICE_CFLAGS)
+        $(TAO_IFRSERVICE_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -30,7 +33,10 @@ LIBFILES = \
 	$(TAO_IORTABLE_LIB) \
 	$(TAO_IFR_CLIENT_LIB) \
         $(TAO_TYPECODEFACTORY_LIB) \
-        $(TAO_IFRSERVICE_LIB)
+        $(TAO_IFRSERVICE_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
index ce2a713254c..cb56fea107f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
@@ -19,14 +19,20 @@ CFLAGS = \
 	$(TAO_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_IORTABLE_CFLAGS) \
-	$(TAO_SVC_UTILS_CFLAGS)
+	$(TAO_SVC_UTILS_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_IORTABLE_LIB) \
-	$(TAO_SVC_UTILS_LIB)
+	$(TAO_SVC_UTILS_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor
index f7a851b12a4..e8bcf52682c 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor
@@ -19,7 +19,10 @@ CFLAGS = \
 	$(TAO_LIFECYCLE_CFLAGS) \
 	$(TAO_TRADING_CFLAGS) \
 	$(TAO_IORTABLE_CFLAGS) \
-	$(TAO_DYNAMICANY_CFLAGS)
+	$(TAO_DYNAMICANY_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -30,7 +33,11 @@ LIBFILES = \
 	$(TAO_LIFECYCLE_LIB) \
 	$(TAO_TRADING_LIB) \
 	$(TAO_IORTABLE_LIB) \
-	$(TAO_DYNAMICANY_LIB)
+	$(TAO_DYNAMICANY_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
+
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.bor b/TAO/orbsvcs/LoadBalancer/LoadManager.bor
index 151c494ea08..3c8a34c4b75 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.bor
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.bor
@@ -23,7 +23,9 @@ CFLAGS = \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_PORTABLEGROUP_CFLAGS) \
 	$(TAO_COSLOADBALANCING_CFLAGS) \
-	$(TAO_VALUETYPE_CFLAGS)
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -34,7 +36,9 @@ LIBFILES = \
 	$(TAO_NAMING_LIB) \
 	$(TAO_PORTABLEGROUP_LIB) \
 	$(TAO_COSLOADBALANCING_LIB) \
-	$(TAO_VALUETYPE_LIB)
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor b/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor
index 6ffea499773..17b850d59c2 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor
@@ -26,7 +26,9 @@ CFLAGS = \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_PORTABLEGROUP_CFLAGS) \
 	$(TAO_COSLOADBALANCING_CFLAGS) \
-	$(TAO_VALUETYPE_CFLAGS)
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -37,7 +39,9 @@ LIBFILES = \
 	$(TAO_NAMING_LIB) \
 	$(TAO_PORTABLEGROUP_LIB) \
 	$(TAO_COSLOADBALANCING_LIB) \
-	$(TAO_VALUETYPE_LIB)
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor
index 44f48960fe8..f4f81b4dce8 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor
@@ -15,7 +15,10 @@ CFLAGS = \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
-	$(TAO_IORTABLE_CFLAGS)
+	$(TAO_IORTABLE_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -23,7 +26,11 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_NAMING_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
-	$(TAO_IORTABLE_LIB)
+	$(TAO_IORTABLE_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
+
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.bor b/TAO/orbsvcs/Naming_Service/Naming_Service.bor
index 62167b2d822..ba4ee935bfb 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.bor
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.bor
@@ -14,7 +14,10 @@ CFLAGS = \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
-	$(TAO_IORTABLE_CFLAGS)
+	$(TAO_IORTABLE_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -22,7 +25,10 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_NAMING_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
-	$(TAO_IORTABLE_LIB)
+	$(TAO_IORTABLE_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor
index 24f2ecd491b..4e7ad1f94c0 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor
@@ -18,7 +18,10 @@ CFLAGS = \
 	$(TAO_EVENT_CFLAGS) \
 	$(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -31,7 +34,10 @@ LIBFILES = \
 	$(TAO_EVENT_LIB) \
 	$(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.bor b/TAO/orbsvcs/Notify_Service/Notify_Service.bor
index 526c7711520..32dfbac2b55 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.bor
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.bor
@@ -17,7 +17,10 @@ CFLAGS = \
 	$(TAO_EVENT_CFLAGS) \
 	$(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -30,7 +33,10 @@ LIBFILES = \
 	$(TAO_EVENT_LIB) \
 	$(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor
index 5d2c6da4968..eccc9f4fe67 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor
@@ -16,7 +16,10 @@ CFLAGS = \
 	$(TAO_IORTABLE_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
-	$(TAO_TIME_CFLAGS)
+	$(TAO_TIME_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -25,7 +28,10 @@ LIBFILES = \
 	$(TAO_IORTABLE_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
 	$(TAO_NAMING_LIB) \
-	$(TAO_TIME_LIB)
+	$(TAO_TIME_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.bor b/TAO/orbsvcs/Time_Service/Time_Service_Server.bor
index 16971bee9ef..e527c1fc352 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.bor
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.bor
@@ -16,7 +16,10 @@ CFLAGS = \
 	$(TAO_IORTABLE_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
-	$(TAO_TIME_CFLAGS)
+	$(TAO_TIME_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -25,7 +28,10 @@ LIBFILES = \
 	$(TAO_IORTABLE_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
 	$(TAO_NAMING_LIB) \
-	$(TAO_TIME_LIB)
+	$(TAO_TIME_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .
 
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.bor b/TAO/orbsvcs/Trading_Service/Makefile.bor
index f52598f9f4a..88a7e50041b 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.bor
+++ b/TAO/orbsvcs/Trading_Service/Makefile.bor
@@ -14,7 +14,10 @@ CFLAGS = \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_DYNAMICANY_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
-	$(TAO_TRADING_CFLAGS)
+	$(TAO_TRADING_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS) \
+	$(TAO_IORINTERCEPTOR_CFLAGS) \
+	$(TAO_ORT_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
@@ -22,7 +25,10 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_DYNAMICANY_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
-	$(TAO_TRADING_LIB)
+	$(TAO_TRADING_LIB) \
+	$(TAO_VALUETYPE_LIB) \
+	$(TAO_IORINTERCEPTOR_LIB) \
+	$(TAO_ORT_LIB)
 
 CPPDIR = .