ChangeLogTag: Tue Sep 17 09:09:45 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 54 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 18eb1bd2252..b355e9c3890 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Tue Sep 17 09:09:32 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation/Collocation_Test_Stubs.bor:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor:
+        * orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor:
+        * orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor:
+          Fixed for static build
+
 Mon Sep 16 18:23:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/DLL_ORB/Test_Client_Module.bor:
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor
index 0d432f52e87..a3328add6f5 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor
@@ -25,7 +25,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -39,7 +40,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor
index 50123be87b9..26374871f16 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor
@@ -24,7 +24,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -38,7 +39,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor
index 683fca8a4c1..16929879041 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor
@@ -25,7 +25,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -39,7 +40,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor
index 13f03272d01..904164204d9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor
@@ -24,7 +24,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -38,7 +39,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
index 65e57d53a9d..f485b07e570 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
@@ -23,7 +23,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -37,7 +38,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\control.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
index 99e1f338769..e56e4be1f1b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
@@ -22,7 +22,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -36,7 +37,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\control.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
index 8528a14a70f..08d59c2b6ff 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
@@ -24,7 +24,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -38,7 +39,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\control.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
index 02ab827fc19..f8a7dc125a4 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
@@ -24,7 +24,8 @@ CFLAGS = \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_ETCL_CFLAGS) \
         $(TAO_NOTIFY_CFLAGS) \
-        $(TAO_NOTIFYTESTS_CFLAGS)
+        $(TAO_NOTIFYTESTS_CFLAGS) \
+        $(TAO_MESSAGING_CFLAGS)
 
 CPPDIR = .
 
@@ -38,7 +39,8 @@ LIBFILES = \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_ETCL_LIB) \
         $(TAO_NOTIFY_LIB) \
-        $(TAO_NOTIFYTESTS_LIB)
+        $(TAO_NOTIFYTESTS_LIB) \
+        $(TAO_MESSAGING_LIB)
 
 IDLFILES = \
         $(IDLDIR)\control.idl
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor
index df33a3b3325..fa9e734ee24 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor
@@ -20,7 +20,8 @@ CFLAGS = \
         $(TAO_NOTIFY_CFLAGS) \
         $(TAO_STRATEGIES_CFLAGS) \
         $(TAO_NOTIFYTESTS_CFLAGS) \
-        $(TAO_MESSAGING_CFLAGS)
+        $(TAO_MESSAGING_CFLAGS) \
+        $(TAO_DYNAMICANY_CFLAGS)
 
 CPPDIR = .
 
@@ -36,6 +37,7 @@ LIBFILES = \
         $(TAO_NOTIFY_LIB) \
         $(TAO_STRATEGIES_LIB) \
         $(TAO_NOTIFYTESTS_LIB) \
-        $(TAO_MESSAGING_LIB)
+        $(TAO_MESSAGING_LIB) \
+        $(TAO_DYNAMICANY_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/Collocation/Collocation_Test_Stubs.bor b/TAO/tests/Collocation/Collocation_Test_Stubs.bor
index 7a3baf5a8d9..92e67e3c679 100644
--- a/TAO/tests/Collocation/Collocation_Test_Stubs.bor
+++ b/TAO/tests/Collocation/Collocation_Test_Stubs.bor
@@ -9,13 +9,14 @@ TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
 	-Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
 
 OBJFILES = \
-	$(OBJDIR)\DiamondC.obj
+        $(OBJDIR)\DiamondS.obj \
+        $(OBJDIR)\Diamond_i.obj
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	-DMY_STUB_HAS_DLL=1 \
-	-DMY_STUB_BUILD_DLL=1
+        -DMY_STUB_HAS_DLL=$(DLL_FLAG) \
+        -DMY_STUB_BUILD_DLL
 
 LIBFILES = \
 	$(ACE_LIB) \