ChangeLogTag: Tue Mar 12 07:28:45 2001 Johnny Willemsen <jwillemsen@remedy.nl>

47 files changed, 1116 insertions, 95 deletions

diff --git a/TAO/tests/CDR/Makefile.bor b/TAO/tests/CDR/Makefile.bor
index 7c8ef190efa..7300be3f368 100644
--- a/TAO/tests/CDR/Makefile.bor
+++ b/TAO/tests/CDR/Makefile.bor
@@ -2,6 +2,21 @@
 # Makefile for building the CDR tests
 #
 
-MAKEFILES = allocator.bor basic_types.bor growth.bor octet_sequence.bor tc.bor
+NAMES = \
+        alignment \
+        allocator \
+        basic_types \
+        growth \
+        octet_sequence \
+        tc
+
+OBJFILES = $(OBJDIR)\$(NAME).obj
+
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
+
+LIBFILES = $(ACE_LIB) $(TAO_LIB)
+
+CPPDIR = .
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/CDR/allocator.bor b/TAO/tests/CDR/allocator.bor
deleted file mode 100644
index 8183581eae3..00000000000
--- a/TAO/tests/CDR/allocator.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the allocator test
-#
-
-NAME = allocator
-
-OBJFILES = $(OBJDIR)\allocator.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/CDR/basic_types.bor b/TAO/tests/CDR/basic_types.bor
deleted file mode 100644
index a0c3dbd072d..00000000000
--- a/TAO/tests/CDR/basic_types.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the basic_types test
-#
-
-NAME = basic_types
-
-OBJFILES = $(OBJDIR)\basic_types.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/CDR/growth.bor b/TAO/tests/CDR/growth.bor
deleted file mode 100644
index 57a473474df..00000000000
--- a/TAO/tests/CDR/growth.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the growth test
-#
-
-NAME = growth
-
-OBJFILES = $(OBJDIR)\growth.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/CDR/octet_sequence.bor b/TAO/tests/CDR/octet_sequence.bor
deleted file mode 100644
index bac4e902f70..00000000000
--- a/TAO/tests/CDR/octet_sequence.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the octet_sequence test
-#
-
-NAME = octet_sequence
-
-OBJFILES = $(OBJDIR)\octet_sequence.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/CDR/tc.bor b/TAO/tests/CDR/tc.bor
deleted file mode 100644
index 37004b8a558..00000000000
--- a/TAO/tests/CDR/tc.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for building the tc test
-#
-
-NAME = tc
-
-OBJFILES = $(OBJDIR)\tc.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/Leader_Followers/client.bor b/TAO/tests/Leader_Followers/client.bor
index 1026ef799d6..068fb0e7560 100644
--- a/TAO/tests/Leader_Followers/client.bor
+++ b/TAO/tests/Leader_Followers/client.bor
@@ -10,7 +10,6 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 OBJFILES = \
 	$(OBJDIR)\testC.obj \
 	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
 	$(OBJDIR)\client.obj
 
 CFLAGS = \
diff --git a/TAO/tests/LongWrites/Makefile.bor b/TAO/tests/LongWrites/Makefile.bor
new file mode 100644
index 00000000000..48c4568075d
--- /dev/null
+++ b/TAO/tests/LongWrites/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the LongWrites test
+#
+
+MAKEFILES = \
+	client.bor \
+	server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/LongWrites/client.bor b/TAO/tests/LongWrites/client.bor
new file mode 100644
index 00000000000..0e01e873e45
--- /dev/null
+++ b/TAO/tests/LongWrites/client.bor
@@ -0,0 +1,44 @@
+
+#
+# Makefile for building the LongWrites client test
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+        $(OBJDIR)\receiver.obj \
+        $(OBJDIR)\sender.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB) \
+	$(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/LongWrites/server.bor b/TAO/tests/LongWrites/server.bor
new file mode 100644
index 00000000000..997a75cb710
--- /dev/null
+++ b/TAO/tests/LongWrites/server.bor
@@ -0,0 +1,43 @@
+
+#
+# Makefile for building the LongWrites server test
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+        $(OBJDIR)\coordinator.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB) \
+	$(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/MProfile_Forwarding/Makefile.bor b/TAO/tests/MProfile_Forwarding/Makefile.bor
new file mode 100644
index 00000000000..8e2ae699bc4
--- /dev/null
+++ b/TAO/tests/MProfile_Forwarding/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the MProfile_Forwarding test executables
+#
+
+MAKEFILES = server.bor client.bor manager.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MProfile_Forwarding/client.bor b/TAO/tests/MProfile_Forwarding/client.bor
new file mode 100644
index 00000000000..3f819df154e
--- /dev/null
+++ b/TAO/tests/MProfile_Forwarding/client.bor
@@ -0,0 +1,38 @@
+#
+# Makefile for building the MProfile_Forwarding client
+#
+
+NAME = client
+
+TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Forwarding/manager.bor b/TAO/tests/MProfile_Forwarding/manager.bor
new file mode 100644
index 00000000000..826e740637d
--- /dev/null
+++ b/TAO/tests/MProfile_Forwarding/manager.bor
@@ -0,0 +1,40 @@
+#
+# Makefile for building the MProfile_Forwarding manager
+#
+
+NAME = manager
+
+TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+        $(OBJDIR)\manager.obj \
+        $(OBJDIR)\Servant_Locator.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_IORMANIP_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+	$(TAO_IORMANIP_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Forwarding/server.bor b/TAO/tests/MProfile_Forwarding/server.bor
new file mode 100644
index 00000000000..2467223f1ce
--- /dev/null
+++ b/TAO/tests/MProfile_Forwarding/server.bor
@@ -0,0 +1,39 @@
+#
+# Makefile for building the MProfile_Forwarding server
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\test_i.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor
index cca8691c9fc..2ba109a1a00 100644
--- a/TAO/tests/Makefile.bor
+++ b/TAO/tests/Makefile.bor
@@ -8,9 +8,11 @@ DIRS = \
         Bidirectional \
         Bidirectional_NestedUpcall \
 	CDR \
+	Client_Leaks \
 	Codec \
 	Collocation \
 	Connection_Purging \
+	Crashed_Callback \
 	DSI_Gateway \
 	DynAny_Test \
 	Endpoint_Per_Priority \
@@ -19,35 +21,39 @@ DIRS = \
 	Faults \
         FL_Cube \
         Forwarding \
+        Hello \
 	IDL_Test \
+	InterOp-Naming \
         ior_corbaloc \
 	IORManipulation \
-	InterOp-Naming \
 	Leader_Followers \
+        LongUpcalls \
+        LongWrites \
 	MProfile \
+        MProfile_Forwarding \
+	MT_Client \
+	MT_Server \
+        Multiple \
 	Multiple_Inheritance \
+	Muxing \
         Native_Exceptions \
 	Nested_Event_Loop \
+        NestedUpcall \
+        Object_Loader \
+	OctetSeq \
 	ORB_destroy \
 	ORB_init \
-	OctetSeq \
 	Param_Test \
         POA \
 	Policies \
         Portable_Interceptors \
         QtTests \
 	RTCORBA \
+	Server_Leaks \
         Single_Read \
+        Smart_Proxies \
         Strategies \
 	Timed_Buffered_Oneways \
-	Timeout \
-	MT_Client \
-	MT_Server \
-	Muxing \
-	Client_Leaks \
-	Server_Leaks \
-	Crashed_Callback \
-	LongUpcalls \
-	Hello
+        Timeout
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Multiple/Makefile.bor b/TAO/tests/Multiple/Makefile.bor
new file mode 100644
index 00000000000..7f157a98b98
--- /dev/null
+++ b/TAO/tests/Multiple/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the Multiple test
+#
+
+MAKEFILES = \
+	client.bor \
+	server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/Multiple/client.bor b/TAO/tests/Multiple/client.bor
new file mode 100644
index 00000000000..0f8afc36958
--- /dev/null
+++ b/TAO/tests/Multiple/client.bor
@@ -0,0 +1,42 @@
+
+#
+# Makefile for building the Multiple test
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\MultipleC.obj \
+        $(OBJDIR)\MultipleS.obj \
+        $(OBJDIR)\Multiple_Impl.obj \
+        $(OBJDIR)\Collocation_Tester.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_PORTABLESERVER_LIB)
+
+CPPDIR = .
+
+IDLDIR = .
+
+IDLFILES = \
+        $(IDLDIR)\Multiple.idl
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MultipleC.cpp $(IDLDIR)\MultipleS.cpp: $(IDLDIR)\Multiple.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/Multiple/server.bor b/TAO/tests/Multiple/server.bor
new file mode 100644
index 00000000000..9b0df169363
--- /dev/null
+++ b/TAO/tests/Multiple/server.bor
@@ -0,0 +1,42 @@
+
+#
+# Makefile for building the Multiple test
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\MultipleC.obj \
+        $(OBJDIR)\MultipleS.obj \
+        $(OBJDIR)\Multiple_Impl.obj \
+        $(OBJDIR)\Collocation_Tester.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_PORTABLESERVER_LIB)
+
+CPPDIR = .
+
+IDLDIR = .
+
+IDLFILES = \
+        $(IDLDIR)\Multiple.idl
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MultipleC.cpp $(IDLDIR)\MultipleS.cpp: $(IDLDIR)\Multiple.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor
new file mode 100644
index 00000000000..ebea6fef21c
--- /dev/null
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the MT_Client_Test test
+#
+
+MAKEFILES = \
+	client.bor \
+	server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.bor b/TAO/tests/NestedUpcall/MT_Client_Test/client.bor
new file mode 100644
index 00000000000..41adbd84309
--- /dev/null
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.bor
@@ -0,0 +1,42 @@
+
+#
+# Makefile for building the MT_Client_Test example
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\MT_Client_TestC.obj \
+        $(OBJDIR)\MT_Client_TestS.obj \
+        $(OBJDIR)\MT_Object_i.obj \
+        $(OBJDIR)\local_server.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        MT_Client_Test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MT_Client_TestC.cpp $(IDLDIR)\MT_Client_TestS.cpp: $(IDLDIR)\MT_Client_Test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.bor b/TAO/tests/NestedUpcall/MT_Client_Test/server.bor
new file mode 100644
index 00000000000..aa63aea4b64
--- /dev/null
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.bor
@@ -0,0 +1,41 @@
+
+#
+# Makefile for building the MT_Client_Test example
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\MT_Client_TestC.obj \
+        $(OBJDIR)\MT_Client_TestS.obj \
+        $(OBJDIR)\MT_Object_i.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        MT_Client_Test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MT_Client_TestC.cpp $(IDLDIR)\MT_Client_TestS.cpp: $(IDLDIR)\MT_Client_Test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/Makefile.bor b/TAO/tests/NestedUpcall/Makefile.bor
new file mode 100644
index 00000000000..7bb1dd6a088
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the TAO NestedUpCall tests
+#
+
+DIRS = \
+        MT_Client_Test \
+        Simple \
+        Triangle_Test
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/NestedUpcall/Simple/Makefile.bor b/TAO/tests/NestedUpcall/Simple/Makefile.bor
new file mode 100644
index 00000000000..c28c38497a8
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Simple/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the Simple example
+#
+
+MAKEFILES = \
+	client.bor \
+	server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/NestedUpcall/Simple/client.bor b/TAO/tests/NestedUpcall/Simple/client.bor
new file mode 100644
index 00000000000..4fd1a9d9503
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Simple/client.bor
@@ -0,0 +1,41 @@
+
+#
+# Makefile for building the Simple test
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+        $(OBJDIR)\client_i.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/Simple/server.bor b/TAO/tests/NestedUpcall/Simple/server.bor
new file mode 100644
index 00000000000..2362d8c57c4
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Simple/server.bor
@@ -0,0 +1,41 @@
+
+#
+# Makefile for building the Simple test
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+        $(OBJDIR)\server_i.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor b/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor
new file mode 100644
index 00000000000..d7d8a27255e
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor
@@ -0,0 +1,11 @@
+#
+# Makefile for building the Triangle_Test test
+#
+
+MAKEFILES = \
+        server_A.bor \
+        server_B.bor \
+        initiator.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor b/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor
new file mode 100644
index 00000000000..4da3766a55b
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor
@@ -0,0 +1,49 @@
+#
+# Makefile for building the Triangle_Test example
+#
+
+NAME = initiator
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\Triangle_TestC.obj \
+        $(OBJDIR)\Triangle_TestS.obj \
+        $(OBJDIR)\initiator.obj \
+        $(OBJDIR)\initiator_i.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        Triangle_Test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
+	$(TAO_IDL) $**
+
+
+
+
+
+
+
+
+
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor b/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor
new file mode 100644
index 00000000000..2a03f1de54a
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor
@@ -0,0 +1,41 @@
+
+#
+# Makefile for building the Triangle_Test example
+#
+
+NAME = server_a
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\Triangle_TestC.obj \
+        $(OBJDIR)\Triangle_TestS.obj \
+        $(OBJDIR)\Server_A.obj \
+        $(OBJDIR)\object_A_i.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        Triangle_Test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor b/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor
new file mode 100644
index 00000000000..dfd763b369e
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor
@@ -0,0 +1,41 @@
+
+#
+# Makefile for building the Triangle_Test example
+#
+
+NAME = server_b
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\Triangle_TestC.obj \
+        $(OBJDIR)\Triangle_TestS.obj \
+        $(OBJDIR)\Server_b.obj \
+        $(OBJDIR)\Object_B_i.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        Triangle_Test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/Object_Loader/Makefile.bor b/TAO/tests/Object_Loader/Makefile.bor
new file mode 100644
index 00000000000..b5909fee788
--- /dev/null
+++ b/TAO/tests/Object_Loader/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the Object_Loader test
+#
+
+MAKEFILES = \
+        test_dll.bor \
+        driver.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/tests/Object_Loader/driver.bor b/TAO/tests/Object_Loader/driver.bor
new file mode 100644
index 00000000000..c4056b453c8
--- /dev/null
+++ b/TAO/tests/Object_Loader/driver.bor
@@ -0,0 +1,42 @@
+
+#
+# Makefile for building the Object_Loader test
+#
+
+NAME = driver
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\test_i.obj \
+        $(OBJDIR)\driver.obj \
+        $(OBJDIR)\loader.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/Object_Loader/test_dll.bor b/TAO/tests/Object_Loader/test_dll.bor
new file mode 100644
index 00000000000..e74e7e77c97
--- /dev/null
+++ b/TAO/tests/Object_Loader/test_dll.bor
@@ -0,0 +1,40 @@
+
+#
+# Makefile for building the Object_Loader test
+#
+
+NAME = test_dll
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+        $(OBJDIR)\testS.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS)
+
+
+LIBFILES = \
+	$(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB)
+
+IDLFILES = \
+        test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
+
diff --git a/TAO/tests/Param_Test/Makefile.bor b/TAO/tests/Param_Test/Makefile.bor
index 4693d686fc3..932cc62f261 100644
--- a/TAO/tests/Param_Test/Makefile.bor
+++ b/TAO/tests/Param_Test/Makefile.bor
@@ -2,6 +2,9 @@
 # Makefile for building the Param_Test executables
 #
 
-MAKEFILES = server.bor client.bor
+MAKEFILES = \
+        server.bor \
+        client.bor \
+        anyop.bor
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Param_Test/anyop.bor b/TAO/tests/Param_Test/anyop.bor
new file mode 100644
index 00000000000..05cd6ce7dc7
--- /dev/null
+++ b/TAO/tests/Param_Test/anyop.bor
@@ -0,0 +1,43 @@
+#
+# Makefile for building the anyop client
+#
+
+NAME = anyop
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. \
+	-hc Cli.h -cs Cli.cpp -ci Cli.i \
+	-hs Ser.h -ss Ser.cpp -si Ser.i \
+	-hT Ser_T.h -sT Ser_T.cpp -st Ser_T.i \
+	-Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\param_testCli.obj \
+        $(OBJDIR)\anyop.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_DYNAMICINTERFACE_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_DYNAMICINTERFACE_LIB)
+
+CPPDIR = .
+
+IDLDIR = .
+
+IDLFILES = \
+        $(IDLDIR)\param_test.idl
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\param_testSer.cpp $(IDLDIR)\param_testCli.cpp: $(IDLDIR)\param_test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor b/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor
new file mode 100644
index 00000000000..0dd74dc8a97
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Smart_Proxies Benchmark test executables
+#
+
+MAKEFILES = client.bor server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.bor b/TAO/tests/Smart_Proxies/Benchmark/client.bor
new file mode 100644
index 00000000000..faf5753015e
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.bor
@@ -0,0 +1,41 @@
+#
+# Makefile for building the Smart_Proxies Benchmark client
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+        $(OBJDIR)\Smart_Proxy_Impl.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.bor b/TAO/tests/Smart_Proxies/Benchmark/server.bor
new file mode 100644
index 00000000000..af6563174b0
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.bor
@@ -0,0 +1,40 @@
+#
+# Makefile for building the Smart_Proxies Benchmark server
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor
index ba0e00ac0cd..999c05236d2 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor
@@ -4,12 +4,12 @@
 
 NAME = Coll_Test_Stubs
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp -Gd \
 	-Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
 	-Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
 
 OBJFILES = \
-	$(OBJDIR)\DiamondC.obj
+        $(OBJDIR)\DiamondC.obj
 
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) \
 	-DMY_Stub_HAS_DLL=1 -DMY_Stub_BUILD_DLL=1
diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.bor b/TAO/tests/Smart_Proxies/Collocation/Collocation.bor
index bcfee5209ad..d72a99c6bb2 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Collocation.bor
+++ b/TAO/tests/Smart_Proxies/Collocation/Collocation.bor
@@ -8,10 +8,19 @@ OBJFILES = \
 	$(OBJDIR)\Coll_Tester.obj \
 	$(OBJDIR)\main.obj
 
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DDiamond_HAS_DLL=1 -DMY_Stub_HAS_DLL=1
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        -DDiamond_HAS_DLL=1 \
+        -DMY_Stub_HAS_DLL=1
 
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(BINDIR)\Diamond$(LIB_DECORATOR).lib \
-	$(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib 
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(BINDIR)\Diamond$(LIB_DECORATOR).lib \
+	$(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib
 
 CPPDIR = .
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.bor b/TAO/tests/Smart_Proxies/Collocation/Diamond.bor
index fba12ef90bc..5f287329f8f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.bor
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond.bor
@@ -4,12 +4,14 @@
 
 NAME = Diamond
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp -Gd \
 	-Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
 	-Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
 
 OBJFILES = \
+        $(OBJDIR)\DiamondC.obj \
 	$(OBJDIR)\DiamondS.obj \
+        $(OBJDIR)\DiamondS_T.obj \
 	$(OBJDIR)\Diamond_i.obj
 
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DDiamond_HAS_DLL=1 -DDiamond_BUILD_DLL=1 $(TAO_PORTABLESERVER_CFLAGS)
diff --git a/TAO/tests/Smart_Proxies/Makefile.bor b/TAO/tests/Smart_Proxies/Makefile.bor
new file mode 100644
index 00000000000..c40d8826c2e
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Makefile.bor
@@ -0,0 +1,10 @@
+#
+# Makefile for building the Smart_Proxies tests
+#
+
+DIRS = \
+        Benchmark \
+        On_Demand \
+        Policy
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor b/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor
new file mode 100644
index 00000000000..8b0814c137a
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Smart_Proxies On_Demand test executables
+#
+
+MAKEFILES = client.bor server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.bor b/TAO/tests/Smart_Proxies/On_Demand/client.bor
new file mode 100644
index 00000000000..3d203948b17
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.bor
@@ -0,0 +1,42 @@
+#
+# Makefile for building the Smart_Proxies On_Demand client
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+        $(OBJDIR)\Smart_Proxy_Impl.obj \
+        $(OBJDIR)\Smart_Test_Factory.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.bor b/TAO/tests/Smart_Proxies/On_Demand/server.bor
new file mode 100644
index 00000000000..86508562107
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.bor
@@ -0,0 +1,40 @@
+#
+# Makefile for building the Smart_Proxies On_Demand server
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.bor b/TAO/tests/Smart_Proxies/Policy/Makefile.bor
new file mode 100644
index 00000000000..65eff120128
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Policy/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Smart_Proxies Policy test executables
+#
+
+MAKEFILES = client.bor server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Policy/client.bor b/TAO/tests/Smart_Proxies/Policy/client.bor
new file mode 100644
index 00000000000..3ee68382219
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Policy/client.bor
@@ -0,0 +1,41 @@
+#
+# Makefile for building the Smart_Proxies Policy client
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+        $(OBJDIR)\Smart_Proxy_Impl.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Policy/server.bor b/TAO/tests/Smart_Proxies/Policy/server.bor
new file mode 100644
index 00000000000..ccf3deb0f17
--- /dev/null
+++ b/TAO/tests/Smart_Proxies/Policy/server.bor
@@ -0,0 +1,40 @@
+#
+# Makefile for building the Smart_Proxies Policy server
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
+
+OBJFILES = \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_SMARTPROXIES_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_SMARTPROXIES_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**