ChangeLogTag:Mon Mar 19 19:49:04 2001 Carlos O'Ryan <coryan@uci.edu>

21 files changed, 64 insertions, 40 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index efbff707906..422b12271d9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,27 @@
+Mon Mar 19 19:49:04 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor:
+        * orbsvcs/tests/Event/Basic/BCast.bor:
+        * orbsvcs/tests/Event/Basic/Bitmask.bor:
+        * orbsvcs/tests/Event/Basic/Complex.bor:
+        * orbsvcs/tests/Event/Basic/Control.bor:
+        * orbsvcs/tests/Event/Basic/Disconnect.bor:
+        * orbsvcs/tests/Event/Basic/Gateway.bor:
+        * orbsvcs/tests/Event/Basic/MT_Disconnect.bor:
+        * orbsvcs/tests/Event/Basic/Negation.bor:
+        * orbsvcs/tests/Event/Basic/Observer.bor:
+        * orbsvcs/tests/Event/Basic/Random.bor:
+        * orbsvcs/tests/Event/Basic/Reconnect.bor:
+        * orbsvcs/tests/Event/Basic/Shutdown.bor:
+        * orbsvcs/tests/Event/Basic/Timeout.bor:
+        * orbsvcs/tests/Event/Basic/Wildcard.bor:
+        * orbsvcs/tests/Event/Performance/Connect.bor:
+        * orbsvcs/tests/Event/Performance/Inversion.bor:
+        * orbsvcs/tests/Event/Performance/Throughput.bor:
+        * orbsvcs/tests/Event/Performance/Latency.bor:
+        * orbsvcs/tests/Event/Performance/Latency_Server.bor:
+	  Use the new directory for the ECTest library.
+
 Mon Mar 19 16:37:21 2001  Chris Cleeland  <cleeland_c@ociweb.com>
 
 	* tao/Transport.cpp:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor
index 329b1c2d36d..04ca51d6d52 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor
@@ -7,7 +7,7 @@ NAME = Atomic_Reconnect
 OBJFILES = $(OBJDIR)\Atomic_Reconnect.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.bor b/TAO/orbsvcs/tests/Event/Basic/BCast.bor
index 7f5aaf084b7..3370153de12 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.bor
@@ -7,7 +7,7 @@ NAME = BCast
 OBJFILES = $(OBJDIR)\BCast.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor b/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor
index 97e692d1230..b09f1fe0132 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor
@@ -7,7 +7,7 @@ NAME = Bitmask
 OBJFILES = $(OBJDIR)\Bitmask.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.bor b/TAO/orbsvcs/tests/Event/Basic/Complex.bor
index 97865fbbf09..4b9dc2459a1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.bor
@@ -7,7 +7,7 @@ NAME = Complex
 OBJFILES = $(OBJDIR)\Complex.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.bor b/TAO/orbsvcs/tests/Event/Basic/Control.bor
index ea67189b70c..4dc8a09bad6 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.bor
@@ -7,7 +7,7 @@ NAME = Control
 OBJFILES = $(OBJDIR)\Control.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor
index 9dd9e5670b5..1e232cb4af3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor
@@ -7,7 +7,7 @@ NAME = Disconnect
 OBJFILES = $(OBJDIR)\Disconnect.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor b/TAO/orbsvcs/tests/Event/Basic/Gateway.bor
index 33a114e1fe5..4a58df38e2a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.bor
@@ -7,7 +7,7 @@ NAME = Gateway
 OBJFILES = $(OBJDIR)\Gateway.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor
index 91fb388a7b3..5b2bea94909 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor
@@ -7,7 +7,7 @@ NAME = MT_Disconnect
 OBJFILES = $(OBJDIR)\MT_Disconnect.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.bor b/TAO/orbsvcs/tests/Event/Basic/Negation.bor
index d00b908b20e..4f2daaba1c9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.bor
@@ -7,7 +7,7 @@ NAME = Negation
 OBJFILES = $(OBJDIR)\Negation.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.bor b/TAO/orbsvcs/tests/Event/Basic/Observer.bor
index a6530d6a38a..04e997e4676 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.bor
@@ -7,7 +7,7 @@ NAME = Observer
 OBJFILES = $(OBJDIR)\Observer.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.bor b/TAO/orbsvcs/tests/Event/Basic/Random.bor
index 14552d03154..7de852e31a3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.bor
@@ -7,7 +7,7 @@ NAME = Random
 OBJFILES = $(OBJDIR)\Random.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor
index f40f5474d43..62f3ada134f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor
@@ -7,7 +7,7 @@ NAME = Reconnect
 OBJFILES = $(OBJDIR)\Reconnect.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor b/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor
index 9d6bb9f88bf..e988773f3fe 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor
@@ -7,7 +7,7 @@ NAME = Shutdown
 OBJFILES = $(OBJDIR)\Shutdown.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor b/TAO/orbsvcs/tests/Event/Basic/Timeout.bor
index 311136a5953..04a3de620c0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.bor
@@ -7,7 +7,7 @@ NAME = Timeout
 OBJFILES = $(OBJDIR)\Timeout.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor b/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor
index b6010978c61..5b205a58c2c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor
@@ -7,7 +7,7 @@ NAME = Wildcard
 OBJFILES = $(OBJDIR)\Wildcard.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.bor b/TAO/orbsvcs/tests/Event/Performance/Connect.bor
index 35c6821da2a..6ba04e7e932 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.bor
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.bor
@@ -7,7 +7,7 @@ NAME = Connect
 OBJFILES = $(OBJDIR)\Connect.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.bor b/TAO/orbsvcs/tests/Event/Performance/Inversion.bor
index fc15218f66e..7b84ae21afd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.bor
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.bor
@@ -7,7 +7,7 @@ NAME = Inversion
 OBJFILES = $(OBJDIR)\Inversion.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.bor b/TAO/orbsvcs/tests/Event/Performance/Latency.bor
index 7c7f07d1a3c..ecd62fd8687 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.bor
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.bor
@@ -7,7 +7,7 @@ NAME = Latency
 OBJFILES = $(OBJDIR)\Latency.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -18,7 +18,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor
index 5e863a101fc..3a8ef4c1ce7 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor
@@ -7,7 +7,7 @@ NAME = Latency_Server
 OBJFILES = $(OBJDIR)\Latency_Server.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -18,7 +18,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.bor b/TAO/orbsvcs/tests/Event/Performance/Throughput.bor
index a138b22a5c7..cc9b5646621 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.bor
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.bor
@@ -7,7 +7,7 @@ NAME = Throughput
 OBJFILES = $(OBJDIR)\Throughput.obj
 
 CFLAGS = \
-	-I..\lib \
+	$(TAO_RTEVENT_TEST_CFLAGS) \
 	$(TAO_RTEVENT_CFLAGS) \
 	$(TAO_NAMING_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS) \
@@ -17,7 +17,7 @@ CFLAGS = \
 	$(ACE_CFLAGS)
 
 LIBFILES = \
-	..\lib\$(BINDIR)\ECTests$(LIB_DECORATOR).lib \
+	$(TAO_RTEVENT_TEST_LIB) \
 	$(TAO_RTEVENT_LIB) \
         $(TAO_NAMING_LIB) \
         $(TAO_SVC_UTILS_LIB) \