summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-04-08 20:22:33 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-04-08 20:22:33 +0000
commitfd086adbf9daa6f8e5d1c782955be38c471c8888 (patch)
treec39489d9c7f2abd21f24bf10957207e8d863671d /TAO/orbsvcs
parentc4bac837318fda7b89f9a5a6ae06117866c21a6b (diff)
downloadATCD-fd086adbf9daa6f8e5d1c782955be38c471c8888.tar.gz
ChangeLogTag:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/CosEvent_Service/Makefile.bor36
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile.bor45
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.bor45
-rw-r--r--TAO/orbsvcs/IFR_Service/Makefile.bor11
-rw-r--r--TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor45
-rw-r--r--TAO/orbsvcs/IFR_Service/tao_ifr.bor40
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.bor52
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor46
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Makefile.bor9
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr.bor37
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor46
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Makefile.bor9
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadManager.bor47
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadMonitor.bor50
-rw-r--r--TAO/orbsvcs/LoadBalancer/Makefile.bor11
-rw-r--r--TAO/orbsvcs/Makefile.bor21
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile.bor8
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor41
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.bor39
-rw-r--r--TAO/orbsvcs/Notify_Service/Makefile.bor8
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor47
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.bor46
-rw-r--r--TAO/orbsvcs/PSS/Makefile.bor52
-rw-r--r--TAO/orbsvcs/TAO_Service/Makefile.bor21
-rw-r--r--TAO/orbsvcs/Time_Service/Makefile.bor11
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor41
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Server.bor41
-rw-r--r--TAO/orbsvcs/Trading_Service/Makefile.bor37
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.bor30
-rw-r--r--TAO/orbsvcs/examples/Makefile.bor11
-rw-r--r--TAO/orbsvcs/examples/RtEC/Makefile.bor10
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.bor34
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.bor36
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.bor34
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Makefile.bor10
-rw-r--r--TAO/orbsvcs/examples/Security/Makefile.bor10
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Makefile.bor9
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.bor39
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.bor49
-rw-r--r--TAO/orbsvcs/orbsvcs/AV.bor92
-rw-r--r--TAO/orbsvcs/orbsvcs/CosConcurrency.bor58
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.bor91
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLifeCycle.bor62
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor99
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.bor72
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.bor160
-rw-r--r--TAO/orbsvcs/orbsvcs/CosProperty.bor55
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTime.bor59
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTrading.bor87
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.bor78
-rw-r--r--TAO/orbsvcs/orbsvcs/ETCL.bor30
-rw-r--r--TAO/orbsvcs/orbsvcs/FTORB_Utils.bor75
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_ClientORB.bor81
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_ServerORB.bor81
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance.bor74
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService.bor99
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.bor35
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup.bor105
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling.bor100
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.bor148
-rw-r--r--TAO/orbsvcs/orbsvcs/RTOLDEvent.bor46
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.bor71
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSchedEvent.bor40
-rw-r--r--TAO/orbsvcs/orbsvcs/RT_Notification.bor76
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP.bor85
-rw-r--r--TAO/orbsvcs/orbsvcs/Security.bor83
-rw-r--r--TAO/orbsvcs/orbsvcs/Svc_Utils.bor62
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.bor36
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.bor41
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.bor36
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor38
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor43
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor39
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Makefile.bor17
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor41
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.bor37
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor39
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor40
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.bor40
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.bor41
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.bor35
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.bor40
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.bor35
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.Bug_1393_Client.bor40
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.bor21
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.bor41
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Makefile.bor41
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Makefile.bor35
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor50
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor50
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.bor35
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/Makefile.bor32
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Makefile.bor38
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor36
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor36
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor39
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Bitmask.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Complex.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Gateway.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Makefile.bor21
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Negation.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Timeout.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Wildcard.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.bor35
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor35
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.bor33
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Makefile.bor35
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor81
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor85
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.bor62
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.bor58
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.bor42
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/client.bor45
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.bor50
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor7
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor35
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor52
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.bor7
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.bor35
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.bor53
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor14
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.bor7
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.bor51
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.bor46
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/Makefile.bor13
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.bor32
-rw-r--r--TAO/orbsvcs/tests/Log/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Makefile.bor32
-rw-r--r--TAO/orbsvcs/tests/Miop/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/Makefile.bor7
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.bor35
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/server.bor41
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Makefile.bor51
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.bor57
-rw-r--r--TAO/orbsvcs/tests/Notify/Makefile.bor21
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/Makefile.bor76
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor60
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor60
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor58
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor57
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.bor10
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.bor70
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Makefile.bor146
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor12
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor60
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor60
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor59
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor11
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.bor39
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor43
-rw-r--r--TAO/orbsvcs/tests/Property/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Property/client.bor37
-rw-r--r--TAO/orbsvcs/tests/Property/server.bor35
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client.bor74
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Server.bor76
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/makefile.bor47
-rw-r--r--TAO/orbsvcs/tests/Security/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.bor50
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server.bor52
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/makefile.bor47
-rw-r--r--TAO/orbsvcs/tests/Time/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/Time/client.bor35
-rw-r--r--TAO/orbsvcs/tests/Trading/Makefile.bor11
-rw-r--r--TAO/orbsvcs/tests/Trading/TradingLib.bor52
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.bor35
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.bor35
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.bor35
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/Makefile.bor9
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/client.bor46
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.bor45
232 files changed, 0 insertions, 9257 deletions
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.bor b/TAO/orbsvcs/CosEvent_Service/Makefile.bor
deleted file mode 100644
index db9d9e0563b..00000000000
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the CosEvent Service executable
-#
-
-NAME = CosEvent_Service
-
-OBJFILES = \
- $(OBJDIR)\CosEvent_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Event_Service/Makefile.bor b/TAO/orbsvcs/Event_Service/Makefile.bor
deleted file mode 100644
index 491f50c428f..00000000000
--- a/TAO/orbsvcs/Event_Service/Makefile.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Event Service executable
-#
-
-NAME = Event_Service
-
-OBJFILES = \
- $(OBJDIR)\Event_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_RTOLDEVENT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_RTOLDEVENT_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
-
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.bor b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
deleted file mode 100644
index 0038af96fb0..00000000000
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the IFR Service executable
-#
-
-!ifndef MINIMUM_CORBA
-NAME = IFR_Service
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\IFR_Server.obj \
- $(OBJDIR)\IFR_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_TYPECODEFACTORY_CFLAGS) \
- $(TAO_IFRSERVICE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_TYPECODEFACTORY_LIB) \
- $(TAO_IFRSERVICE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
-
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.bor b/TAO/orbsvcs/IFR_Service/Makefile.bor
deleted file mode 100644
index 2a40947b3a6..00000000000
--- a/TAO/orbsvcs/IFR_Service/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the IFR Service executable and library
-#
-
-MAKEFILES = \
- IFR_Service.bor \
- TAO_IFR_BE_DLL.bor \
- tao_ifr.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor
deleted file mode 100644
index 10c58e5e5de..00000000000
--- a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO_IFR_BE_DLL library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_IFR_BE_DLL
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\be_global.obj \
- $(OBJDIR)\be_produce.obj \
- $(OBJDIR)\ifr_adding_visitor.obj \
- $(OBJDIR)\ifr_adding_visitor_exception.obj \
- $(OBJDIR)\ifr_adding_visitor_operation.obj \
- $(OBJDIR)\ifr_adding_visitor_structure.obj \
- $(OBJDIR)\ifr_adding_visitor_union.obj \
- $(OBJDIR)\ifr_removing_visitor.obj \
- $(OBJDIR)\ifr_visitor.obj
-
-!ifdef STATIC
-TAO_IFR_BE_DLLFLAG=0
-!else
-TAO_IFR_BE_DLLFLAG=1
-!endif
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_IDL_FE_CFLAGS) \
- -DTAO_IFR_BE_HAS_DLL=$(TAO_IFR_BE_DLLFLAG) \
- -DTAO_IFR_BE_BUILD_DLL
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_IDL_FE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/IFR_Service/tao_ifr.bor b/TAO/orbsvcs/IFR_Service/tao_ifr.bor
deleted file mode 100644
index 8600b285465..00000000000
--- a/TAO/orbsvcs/IFR_Service/tao_ifr.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the tao_ifr executable
-#
-
-!ifndef MINIMUM_CORBA
-NAME = tao_ifr
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\tao_ifr.obj \
- $(OBJDIR)\drv_args_ifr.obj \
- $(OBJDIR)\drv_preproc_ifr.obj
-
-!ifdef STATIC
-TAO_IFR_BE_DLLFLAG=0
-!else
-TAO_IFR_BE_DLLFLAG=1
-!endif
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_IDL_FE_CFLAGS) \
- -DTAO_IFR_BE_HAS_DLL=$(TAO_IFR_BE_DLLFLAG)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_IDL_FE_LIB) \
- $(CORE_BINDIR)\TAO_IFR_BE_DLL$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.bor b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.bor
deleted file mode 100644
index 2a48d9c7206..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ImR_Activator executable
-#
-
-!ifndef MINIMUM_CORBA
-NAME = ImR_Activator
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\ImR_Activator.obj \
- $(OBJDIR)\ImR_Activator_i.obj \
- $(OBJDIR)\Iterator.obj \
- $(OBJDIR)\Activator_Options.obj \
- $(OBJDIR)\Server_Info.obj \
- $(OBJDIR)\Server_Repository.obj \
- $(OBJDIR)\Repository_Configuration.obj \
- $(OBJDIR)\XML_ContentHandler.obj \
- $(OBJDIR)\Activator_NT_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_XML_CFLAGS) \
- $(ACE_XML_PARSER_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_XML_LIB) \
- $(ACE_XML_PARSER_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
deleted file mode 100644
index e8cf7d6500d..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ImplRepo_Service executable
-#
-
-!ifndef MINIMUM_CORBA
-NAME = ImplRepo_Service
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\Adapter_Activator.obj \
- $(OBJDIR)\Forwarder.obj \
- $(OBJDIR)\ImR_Locator.obj \
- $(OBJDIR)\ImR_Locator_i.obj \
- $(OBJDIR)\Locator_NT_Service.obj \
- $(OBJDIR)\Locator_Options.obj \
- $(OBJDIR)\INS_Locator.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.bor b/TAO/orbsvcs/ImplRepo_Service/Makefile.bor
deleted file mode 100644
index 936b9004389..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Implementation Repository executables
-#
-
-MAKEFILES = ImplRepo.bor ImR_Activator.bor tao_imr.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr.bor b/TAO/orbsvcs/ImplRepo_Service/tao_imr.bor
deleted file mode 100644
index b4ed31101e0..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the tao_imr executable
-#
-
-!ifndef MINIMUM_CORBA
-NAME = tao_imr
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\tao_imr.obj \
- $(OBJDIR)\tao_imr_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor
deleted file mode 100644
index e0100efc0af..00000000000
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Naming Service executable
-#
-
-NAME = LifeCycle_Service
-
-OBJFILES = \
- $(OBJDIR)\LifeCycle_Service.obj \
- $(OBJDIR)\LifeCycle_Service_i.obj \
- $(OBJDIR)\Factory_Trader.obj \
- $(OBJDIR)\Criteria_Evaluator.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- $(TAO_TRADING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_LIFECYCLE_LIB) \
- $(TAO_TRADING_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.bor b/TAO/orbsvcs/LifeCycle_Service/Makefile.bor
deleted file mode 100644
index 53810dc8080..00000000000
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the LifeCycle_service executables
-#
-
-MAKEFILES = LifeCycle_Service.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.bor b/TAO/orbsvcs/LoadBalancer/LoadManager.bor
deleted file mode 100644
index e7877c8b198..00000000000
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Makefile for building the LoadManager Service executable
-#
-# $Id$
-#
-
-!ifndef MINIMUM_CORBA
-NAME = LoadManager
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\LoadManager.obj \
- $(OBJDIR)\Signal_Handler.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_COSLOADBALANCING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor b/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor
deleted file mode 100644
index d40534415fd..00000000000
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Makefile for building the LoadManager Service executable
-#
-# $Id$
-#
-
-!ifndef MINIMUM_CORBA
-NAME = LoadMonitor
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\Push_Handler.obj \
- $(OBJDIR)\LoadMonitor.obj \
- $(OBJDIR)\Signal_Handler.obj \
- $(OBJDIR)\Monitor_Signal_Handler.obj
-
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_COSLOADBALANCING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.bor b/TAO/orbsvcs/LoadBalancer/Makefile.bor
deleted file mode 100644
index 4ed66c87a1d..00000000000
--- a/TAO/orbsvcs/LoadBalancer/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for building the TAO ORB Services libraries
-#
-# $Id$
-#
-
-MAKEFILES = \
- LoadManager.bor \
- LoadMonitor.bor
-
-!include <$(ACE_ROOT)/include/makeinclude/recurse.bor>
diff --git a/TAO/orbsvcs/Makefile.bor b/TAO/orbsvcs/Makefile.bor
deleted file mode 100644
index 32cffe1334e..00000000000
--- a/TAO/orbsvcs/Makefile.bor
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-#
-# Makefile for building orbsvcs
-#
-
-DIRS = \
- orbsvcs \
- PSS \
- CosEvent_Service \
- Event_Service \
- IFR_Service \
- ImplRepo_Service \
- LifeCycle_Service \
- LoadBalancer \
- Naming_Service \
- Notify_Service \
- TAO_Service \
- Time_Service \
- Trading_Service
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.bor b/TAO/orbsvcs/Naming_Service/Makefile.bor
deleted file mode 100644
index 6249dce3536..00000000000
--- a/TAO/orbsvcs/Naming_Service/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Naming Service executables
-
-MAKEFILES = Naming_Service.bor NT_Naming_Service.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor
deleted file mode 100644
index d95476a2d93..00000000000
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the NT Naming Service executable
-#
-
-NAME = NT_Naming_Service
-
-OBJFILES = \
- $(OBJDIR)\Naming_Service.obj \
- $(OBJDIR)\NT_Naming_Service.obj \
- $(OBJDIR)\NT_Naming_Server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.bor b/TAO/orbsvcs/Naming_Service/Naming_Service.bor
deleted file mode 100644
index 5dc75e70257..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Naming Service executable
-#
-
-NAME = Naming_Service
-
-OBJFILES = \
- $(OBJDIR)\Naming_Service.obj \
- $(OBJDIR)\Naming_Server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.bor b/TAO/orbsvcs/Notify_Service/Makefile.bor
deleted file mode 100644
index e44fa388892..00000000000
--- a/TAO/orbsvcs/Notify_Service/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Naming Service executables
-
-MAKEFILES = Notify_Service.bor NT_Notify_Service.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor
deleted file mode 100644
index 691a0296542..00000000000
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the NT Notify Service executable
-
-NAME = NT_Notify_Service
-
-OBJFILES = \
- $(OBJDIR)\Notify_Service.obj \
- $(OBJDIR)\NT_Notify_Service.obj \
- $(OBJDIR)\NT_Notify_Server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.bor b/TAO/orbsvcs/Notify_Service/Notify_Service.bor
deleted file mode 100644
index 70f30ef5812..00000000000
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Notification Service executable
-
-NAME = Notify_Service
-
-OBJFILES = \
- $(OBJDIR)\Notify_Service.obj \
- $(OBJDIR)\Notify_Server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/PSS/Makefile.bor b/TAO/orbsvcs/PSS/Makefile.bor
deleted file mode 100644
index bc665892ef6..00000000000
--- a/TAO/orbsvcs/PSS/Makefile.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Makefile for building the TAO PSDL library
-#
-# $Id$
-#
-
-NAME = TAO_PSDL
-
-OBJFILES = \
- $(OBJDIR)\PSDL_Enum_Type_Visitor.obj \
- $(OBJDIR)\PSDL_Exception_Scope.obj \
- $(OBJDIR)\PSDL_Exception_Visitor.obj \
- $(OBJDIR)\PSDL_Extern.obj \
- $(OBJDIR)\PSDL_Interface_Scope.obj \
- $(OBJDIR)\PSDL_Interface_Visitor.obj \
- $(OBJDIR)\PSDL_Interpreter.obj \
- $(OBJDIR)\PSDL_l.obj \
- $(OBJDIR)\PSDL_Module_Scope.obj \
- $(OBJDIR)\PSDL_Module_Visitor.obj \
- $(OBJDIR)\PSDL_Node.obj \
- $(OBJDIR)\PSDL_Node_Visitor.obj \
- $(OBJDIR)\PSDL_Op_Dcl_Scope.obj \
- $(OBJDIR)\PSDL_Root_Scope.obj \
- $(OBJDIR)\PSDL_Scope.obj \
- $(OBJDIR)\PSDL_Scope_Visitor.obj \
- $(OBJDIR)\PSDL_Simple_Scope.obj \
- $(OBJDIR)\PSDL_Stream.obj \
- $(OBJDIR)\PSDL_Struct_Scope.obj \
- $(OBJDIR)\PSDL_Struct_Visitor.obj \
- $(OBJDIR)\PSDL_Type_Dcl_Visitor.obj \
- $(OBJDIR)\PSDL_Typecode_Defn.obj \
- $(OBJDIR)\PSDL_Visitor_Factory.obj \
- $(OBJDIR)\PSDL_y.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_PSDL_CFLAGS) \
- -DTAO_PSDL_BUILD_DLL
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.bor b/TAO/orbsvcs/TAO_Service/Makefile.bor
deleted file mode 100644
index 38dd90e6070..00000000000
--- a/TAO/orbsvcs/TAO_Service/Makefile.bor
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO_Service executable
-#
-
-NAME = TAO_Service
-
-OBJFILES = \
- $(OBJDIR)\TAO_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Time_Service/Makefile.bor b/TAO/orbsvcs/Time_Service/Makefile.bor
deleted file mode 100644
index 76490c27007..00000000000
--- a/TAO/orbsvcs/Time_Service/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time Service
-#
-
-MAKEFILES = \
- Time_Service_Server.bor \
- Time_Service_Clerk.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor
deleted file mode 100644
index 94cfd628b50..00000000000
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time_Service_Clerk
-#
-
-NAME = Time_Service_Clerk
-
-OBJFILES = \
- $(OBJDIR)\Time_Service_Clerk.obj \
- $(OBJDIR)\Clerk_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TIME_CFLAGS) \
- $(TAO_MESSAGING_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_NAMING_LIB) \
- $(TAO_TIME_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.bor b/TAO/orbsvcs/Time_Service/Time_Service_Server.bor
deleted file mode 100644
index a3ebdf14fc3..00000000000
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time_Service_Server
-#
-
-NAME = Time_Service_Server
-
-OBJFILES = \
- $(OBJDIR)\Time_Service_Server.obj \
- $(OBJDIR)\server_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TIME_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TIME_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.bor b/TAO/orbsvcs/Trading_Service/Makefile.bor
deleted file mode 100644
index 2e5521911e9..00000000000
--- a/TAO/orbsvcs/Trading_Service/Makefile.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Trading Service executable
-#
-
-NAME = Trading_Service
-
-OBJFILES = \
- $(OBJDIR)\Trading_Service.obj \
- $(OBJDIR)\Trading_Server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_TRADING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_TRADING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.bor b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.bor
deleted file mode 100644
index 1b52515d339..00000000000
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the CosEvent Service executable
-#
-
-NAME = CosEvent_Service
-
-OBJFILES = \
- $(OBJDIR)\CosEvent_Service.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_EVENT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_EVENT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/examples/Makefile.bor b/TAO/orbsvcs/examples/Makefile.bor
deleted file mode 100644
index a908b5f663b..00000000000
--- a/TAO/orbsvcs/examples/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building orbsvcs examples
-#
-
-DIRS = \
- RtEC \
- Security
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/examples/RtEC/Makefile.bor b/TAO/orbsvcs/examples/RtEC/Makefile.bor
deleted file mode 100644
index 6a963fb2e46..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building orbsvcs RtEC examples
-#
-
-DIRS = \
- Simple
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.bor b/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.bor
deleted file mode 100644
index e6d11077a5c..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Consumer.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Consumer
-
-OBJFILES = \
- $(OBJDIR)\Consumer.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.bor b/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.bor
deleted file mode 100644
index 70a16056527..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Service.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Service
-
-OBJFILES = \
- $(OBJDIR)\Service.obj
-
-CFLAGS = \
- $(TAO_RTOLDEVENT_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTOLDEVENT_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.bor b/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.bor
deleted file mode 100644
index f4c89ba10be..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/EC_Simple_Supplier.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Supplier
-
-OBJFILES = \
- $(OBJDIR)\Supplier.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.bor b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.bor
deleted file mode 100644
index 4d5627cba21..00000000000
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- EC_Simple_Service.bor \
- EC_Simple_Consumer.bor \
- EC_Simple_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/examples/Security/Makefile.bor b/TAO/orbsvcs/examples/Security/Makefile.bor
deleted file mode 100644
index 80c358bf82d..00000000000
--- a/TAO/orbsvcs/examples/Security/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building orbsvcs security examples
-#
-
-DIRS = \
- Send_File
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.bor b/TAO/orbsvcs/examples/Security/Send_File/Makefile.bor
deleted file mode 100644
index 69f2ceefeb5..00000000000
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the security send_file test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.bor b/TAO/orbsvcs/examples/Security/Send_File/client.bor
deleted file mode 100644
index 6115e794925..00000000000
--- a/TAO/orbsvcs/examples/Security/Send_File/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the security send_file executable
-#
-
-!ifdef SSL_ROOT
-NAME = client
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/orbsvcs/examples/Security/Send_File/server.bor b/TAO/orbsvcs/examples/Security/Send_File/server.bor
deleted file mode 100644
index 8fa9b56f8ea..00000000000
--- a/TAO/orbsvcs/examples/Security/Send_File/server.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the security send_file executable
-#
-
-!ifdef SSL_ROOT
-NAME = server
-!endif
-
-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)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_SSL_CFLAGS) \
- $(SSL_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SSLIOP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_SSL_LIB) \
- $(SSL_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SSLIOP_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/orbsvcs/orbsvcs/AV.bor b/TAO/orbsvcs/orbsvcs/AV.bor
deleted file mode 100644
index 043f9f1dc0d..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV.bor
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO AV library
-#
-
-NAME = TAO_AV
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_AV_Export \
- -Wb,export_include=AV/AV_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\AVStreams.idl \
- $(IDLDIR)\Null_MediaCtrl.idl \
- $(IDLDIR)\sfp.idl
-
-OBJFILES = \
- $(OBJDIR)\AV_Core.obj \
- $(OBJDIR)\AVStreams_i.obj \
- $(OBJDIR)\AVStreamsC.obj \
- $(OBJDIR)\AVStreamsS.obj \
- $(OBJDIR)\Endpoint_Strategy.obj \
- $(OBJDIR)\Fill_ACE_QoS.obj \
- $(OBJDIR)\FlowSpec_Entry.obj \
- $(OBJDIR)\MCast.obj \
- $(OBJDIR)\md5c.obj \
- $(OBJDIR)\media_timer.obj \
- $(OBJDIR)\Null_MediaCtrlC.obj \
- $(OBJDIR)\Null_MediaCtrlS.obj \
- $(OBJDIR)\Policy.obj \
- $(OBJDIR)\QoS_UDP.obj \
- $(OBJDIR)\Protocol_Factory.obj \
- $(OBJDIR)\RTCP.obj \
- $(OBJDIR)\RTCP_Channel.obj \
- $(OBJDIR)\RTCP_Packet.obj \
- $(OBJDIR)\RTP.obj \
- $(OBJDIR)\sfp.obj \
- $(OBJDIR)\sfpC.obj \
- $(OBJDIR)\sfpS.obj \
- $(OBJDIR)\TCP.obj \
- $(OBJDIR)\Transport.obj \
- $(OBJDIR)\UDP.obj
-
-RESOURCE = $(OBJDIR)\AV.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_AV_CFLAGS) \
- -DTAO_AV_BUILD_DLL
-
-CPPDIR = .;AV
-CDIR = AV
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\AV
-INCLUDES = AV\*.h AV\*.i AV\*_T.cpp
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\AVStreamsC.cpp $(IDLDIR)\AVStreamsS.cpp: $(IDLDIR)\AVStreams.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\Null_MediaCtrlC.cpp $(IDLDIR)\Null_MediaCtrlS.cpp: $(IDLDIR)\Null_MediaCtrl.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\sfpC.cpp $(IDLDIR)\sfpS.cpp: $(IDLDIR)\sfp.idl
- @$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor b/TAO/orbsvcs/orbsvcs/CosConcurrency.bor
deleted file mode 100644
index cf32feda418..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosConcurrency library
-#
-
-NAME = TAO_CosConcurrency
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Concurrency_Export \
- -Wb,export_include=Concurrency/concurrency_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosConcurrencyControl.idl
-
-OBJFILES = \
- $(OBJDIR)\CC_Lock.obj \
- $(OBJDIR)\CC_LockSet.obj \
- $(OBJDIR)\CC_LockSetFactory.obj \
- $(OBJDIR)\Concurrency_Utils.obj \
- $(OBJDIR)\CosConcurrencyControlC.obj \
- $(OBJDIR)\CosConcurrencyControlS.obj
-
-RESOURCE = $(OBJDIR)\CosConcurrency.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLSERVER_CFLAGS) \
- $(TAO_CONCURRENCY_CFLAGS) \
- -DTAO_CONCURRENCY_BUILD_DLL
-
-CPPDIR = .;Concurrency
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Concurrency
-INCLUDES = Concurrency\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosConcurrencyControlC.cpp $(IDLDIR)\CosConcurrencyControlS.cpp: $(IDLDIR)\CosConcurrencyControl.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.bor b/TAO/orbsvcs/orbsvcs/CosEvent.bor
deleted file mode 100644
index e7d49ed47f0..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent.bor
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosEvent library
-#
-
-NAME = TAO_CosEvent
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Event_Export \
- -Wb,export_include=CosEvent/event_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosEventChannelAdmin.idl \
- $(IDLDIR)\CosEventComm.idl
-
-OBJFILES = \
- $(OBJDIR)\CEC_ConsumerAdmin.obj \
- $(OBJDIR)\CEC_ConsumerControl.obj \
- $(OBJDIR)\CEC_Default_Factory.obj \
- $(OBJDIR)\CEC_Dispatching.obj \
- $(OBJDIR)\CEC_Dispatching_Task.obj \
- $(OBJDIR)\CEC_EventChannel.obj \
- $(OBJDIR)\CEC_Event_Loader.obj \
- $(OBJDIR)\CEC_Factory.obj \
- $(OBJDIR)\CEC_MT_Dispatching.obj \
- $(OBJDIR)\CEC_ProxyPullConsumer.obj \
- $(OBJDIR)\CEC_ProxyPullSupplier.obj \
- $(OBJDIR)\CEC_ProxyPushConsumer.obj \
- $(OBJDIR)\CEC_ProxyPushSupplier.obj \
- $(OBJDIR)\CEC_Pulling_Strategy.obj \
- $(OBJDIR)\CEC_Reactive_ConsumerControl.obj \
- $(OBJDIR)\CEC_Reactive_Pulling_Strategy.obj \
- $(OBJDIR)\CEC_Reactive_SupplierControl.obj \
- $(OBJDIR)\CEC_SupplierAdmin.obj \
- $(OBJDIR)\CEC_SupplierControl.obj \
-# $(OBJDIR)\ConsumerAdmin_i.obj \
-# $(OBJDIR)\CosEvent_Utilities.obj \
- $(OBJDIR)\CosEventChannelAdminC.obj \
- $(OBJDIR)\CosEventChannelAdminS.obj \
- $(OBJDIR)\CosEventCommC.obj \
- $(OBJDIR)\CosEventCommS.obj \
-# $(OBJDIR)\EventChannel_i.obj \
-# $(OBJDIR)\ProxyPushConsumer_i.obj \
-# $(OBJDIR)\ProxyPushSupplier_i.obj \
-# $(OBJDIR)\SupplierAdmin_i.obj
-
-RESOURCE = $(OBJDIR)\CosEvent.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- -DTAO_EVENT_BUILD_DLL
-
-CPPDIR = .;CosEvent
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\CosEvent
-INCLUDES = CosEvent\*.h CosEvent\*.i
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_MESSAGING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosEventChannelAdminC.cpp $(IDLDIR)\CosEventChannelAdminS.cpp: $(IDLDIR)\CosEventChannelAdmin.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosEventCommC.cpp $(IDLDIR)\CosEventCommS.cpp: $(IDLDIR)\CosEventComm.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor b/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor
deleted file mode 100644
index 1f8a6d302e0..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosLifeCycle library
-#
-
-NAME = TAO_CosLifeCycle
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_LifeCycle_Export \
- -Wb,export_include=LifeCycle/lifecycle_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosLifeCycle.idl \
- $(IDLDIR)\LifeCycleService.idl
-
-OBJFILES = \
- $(OBJDIR)\CosLifeCycleC.obj \
- $(OBJDIR)\CosLifeCycleS.obj \
- $(OBJDIR)\LifeCycleServiceC.obj \
- $(OBJDIR)\LifeCycleServiceS.obj
-
-RESOURCE = $(OBJDIR)\CosLifeCycle.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLSERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- -DTAO_LIFECYCLE_BUILD_DLL
-
-CPPDIR = .;LifeCycle
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\LifeCycle
-INCLUDES = LifeCycle\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosLifeCycleC.cpp $(IDLDIR)\CosLifeCycleS.cpp: $(IDLDIR)\CosLifeCycle.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\LifeCycleServiceC.cpp $(IDLDIR)\LifeCycleServiceS.cpp: $(IDLDIR)\LifeCycleService.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor
deleted file mode 100644
index 5955ef01134..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Makefile for the TAO CosLoadBalancing library
-#
-# $Id$
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_CosLoadBalancing
-!else
-!undef NAME
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 \
- -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosLoadBalancing.idl \
- $(IDLDIR)\LB_ORT.idl
-
-OBJFILES = \
- $(OBJDIR)\CosLoadBalancingC.obj \
- $(OBJDIR)\CosLoadBalancingS.obj \
- $(OBJDIR)\LB_ORTC.obj \
- $(OBJDIR)\LB_LeastLoaded.obj \
- $(OBJDIR)\LB_LoadAlert.obj \
- $(OBJDIR)\LB_LoadAlertInfo.obj \
- $(OBJDIR)\LB_LoadAlertMap.obj \
- $(OBJDIR)\LB_LoadAlert_Handler.obj \
- $(OBJDIR)\LB_LoadListMap.obj \
- $(OBJDIR)\LB_LoadManager.obj \
- $(OBJDIR)\LB_LoadMap.obj \
- $(OBJDIR)\LB_Location_Index_Map.obj \
- $(OBJDIR)\LB_MemberLocator.obj \
- $(OBJDIR)\LB_MonitorMap.obj \
- $(OBJDIR)\LB_Pull_Handler.obj \
- $(OBJDIR)\LB_Random.obj \
- $(OBJDIR)\LB_RoundRobin.obj \
- $(OBJDIR)\LB_ClientComponent.obj \
- $(OBJDIR)\LB_ClientORBInitializer.obj \
- $(OBJDIR)\LB_ClientRequestInterceptor.obj \
- $(OBJDIR)\LB_ServerRequestInterceptor.obj \
- $(OBJDIR)\LB_IORInterceptor.obj \
- $(OBJDIR)\LB_ObjectReferenceFactory.obj \
- $(OBJDIR)\LB_ORBInitializer.obj \
- $(OBJDIR)\LB_Component.obj \
- $(OBJDIR)\LB_CPU_Monitor.obj
-
-RESOURCE = $(OBJDIR)\CosLoadBalancing.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- -DTAO_LOADBALANCING_BUILD_DLL
-
-CPPDIR = .;LoadBalancing
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\LoadBalancing
-INCLUDES = LoadBalancing\*.h LoadBalancing\*.inl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosLoadBalancingC.cpp $(IDLDIR)\CosLoadBalancingS.cpp: $(IDLDIR)\CosLoadBalancing.idl
- $(TAO_IDL) $** -GC \
- -Wb,export_macro=TAO_LoadBalancing_Export \
- -Wb,export_include=LoadBalancing/LoadBalancing_export.h
-
-$(IDLDIR)\LB_ORTC.cpp: $(IDLDIR)\LB_ORT.idl
- $(TAO_IDL) $** -DCORBA3
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.bor b/TAO/orbsvcs/orbsvcs/CosNaming.bor
deleted file mode 100644
index 41c2c6ec7ff..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosNaming.bor
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosNaming library
-#
-
-NAME = TAO_CosNaming
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Naming_Export \
- -Wb,export_include=Naming/naming_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosNaming.idl
-
-OBJFILES = \
- $(OBJDIR)\CosNamingC.obj \
- $(OBJDIR)\CosNamingS.obj \
- $(OBJDIR)\Entries.obj \
- $(OBJDIR)\Hash_Naming_Context.obj \
- $(OBJDIR)\Naming_Context_Interface.obj \
- $(OBJDIR)\Naming_Loader.obj \
- $(OBJDIR)\Naming_Utils.obj \
- $(OBJDIR)\Persistent_Context_Index.obj \
- $(OBJDIR)\Persistent_Entries.obj \
- $(OBJDIR)\Persistent_Naming_Context.obj \
- $(OBJDIR)\Transient_Naming_Context.obj \
- $(OBJDIR)\Flat_File_Persistence.obj \
- $(OBJDIR)\Naming_Service_Container.obj \
- $(OBJDIR)\Storable.obj \
- $(OBJDIR)\Storable_Naming_Context.obj \
- $(OBJDIR)\Storable_Naming_Context_Activator.obj
-
-RESOURCE = $(OBJDIR)\CosNaming.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- -DTAO_NAMING_BUILD_DLL
-
-CPPDIR = .;Naming
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Naming
-INCLUDES = Naming\*.h Naming\*_T.cpp
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosNamingC.cpp $(IDLDIR)\CosNamingS.cpp: $(IDLDIR)\CosNaming.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
deleted file mode 100644
index adfc1aad9fd..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ /dev/null
@@ -1,160 +0,0 @@
-#$Id$
-#
-# Makefile for building the TAO CosNotification library
-#
-
-NAME = TAO_CosNotification
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Notify_Export \
- -Wb,export_include=Notify/notify_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosNotification.idl \
- $(IDLDIR)\CosNotifyChannelAdmin.idl \
- $(IDLDIR)\CosNotifyComm.idl \
- $(IDLDIR)\CosNotifyFilter.idl \
- $(IDLDIR)\NotifyExt.idl \
- $(IDLDIR)\Event_Forwarder.idl
-
-OBJFILES = \
- $(OBJDIR)\CosNotificationC.obj \
- $(OBJDIR)\CosNotificationS.obj \
- $(OBJDIR)\CosNotifyChannelAdminC.obj \
- $(OBJDIR)\CosNotifyChannelAdminS.obj \
- $(OBJDIR)\CosNotifyCommC.obj \
- $(OBJDIR)\CosNotifyCommS.obj \
- $(OBJDIR)\CosNotifyFilterC.obj \
- $(OBJDIR)\CosNotifyFilterS.obj \
- $(OBJDIR)\NotifyExtC.obj \
- $(OBJDIR)\NotifyExtS.obj \
- $(OBJDIR)\Event_ForwarderC.obj \
- $(OBJDIR)\Event_ForwarderS.obj \
- $(OBJDIR)\Notify_Extensions.obj \
- $(OBJDIR)\Event_Manager.obj \
- $(OBJDIR)\Admin.obj \
- $(OBJDIR)\AdminProperties.obj \
- $(OBJDIR)\AnyEvent.obj \
- $(OBJDIR)\CosEC_ProxyPushConsumer.obj \
- $(OBJDIR)\CosEC_ProxyPushSupplier.obj \
- $(OBJDIR)\ProxyPushConsumer.obj \
- $(OBJDIR)\ProxyPushSupplier.obj \
- $(OBJDIR)\PushConsumer.obj \
- $(OBJDIR)\PushSupplier.obj \
- $(OBJDIR)\Buffering_Strategy.obj \
- $(OBJDIR)\Builder.obj \
- $(OBJDIR)\Consumer.obj \
- $(OBJDIR)\ConsumerAdmin.obj \
- $(OBJDIR)\Event.obj \
- $(OBJDIR)\EventChannel.obj \
- $(OBJDIR)\EventChannelFactory.obj \
- $(OBJDIR)\EventType.obj \
- $(OBJDIR)\EventTypeSeq.obj \
- $(OBJDIR)\Default_Factory.obj \
- $(OBJDIR)\FilterAdmin.obj \
- $(OBJDIR)\ID_Factory.obj \
- $(OBJDIR)\Method_Request.obj \
- $(OBJDIR)\Method_Request_Dispatch.obj \
- $(OBJDIR)\Method_Request_Event.obj \
- $(OBJDIR)\Object.obj \
- $(OBJDIR)\Method_Request_Lookup.obj \
- $(OBJDIR)\Method_Request_Shutdown.obj \
- $(OBJDIR)\CosNotify_Service.obj \
- $(OBJDIR)\Peer.obj \
- $(OBJDIR)\POA_Helper.obj \
- $(OBJDIR)\Properties.obj \
- $(OBJDIR)\PropertySeq.obj \
- $(OBJDIR)\Property_Boolean.obj \
- $(OBJDIR)\Proxy.obj \
- $(OBJDIR)\ProxyConsumer.obj \
- $(OBJDIR)\ProxySupplier.obj \
- $(OBJDIR)\QoSProperties.obj \
- $(OBJDIR)\Reactive_Task.obj \
- $(OBJDIR)\Refcountable.obj \
- $(OBJDIR)\SequenceProxyPushConsumer.obj \
- $(OBJDIR)\SequenceProxyPushSupplier.obj \
- $(OBJDIR)\SequencePushConsumer.obj \
- $(OBJDIR)\SequencePushSupplier.obj \
- $(OBJDIR)\StructuredEvent.obj \
- $(OBJDIR)\StructuredProxyPushConsumer.obj \
- $(OBJDIR)\StructuredProxyPushSupplier.obj \
- $(OBJDIR)\StructuredPushConsumer.obj \
- $(OBJDIR)\StructuredPushSupplier.obj \
- $(OBJDIR)\Supplier.obj \
- $(OBJDIR)\Subscription_Change_Worker.obj \
- $(OBJDIR)\SupplierAdmin.obj \
- $(OBJDIR)\ThreadPool_Task.obj \
- $(OBJDIR)\Worker_Task.obj \
- $(OBJDIR)\ETCL_Filter.obj \
- $(OBJDIR)\ETCL_FilterFactory.obj \
- $(OBJDIR)\Notify_Constraint_Interpreter.obj \
- $(OBJDIR)\Notify_Constraint_Visitors.obj \
- $(OBJDIR)\Notify_Default_CO_Factory.obj \
- $(OBJDIR)\Notify_Default_Collection_Factory.obj \
- $(OBJDIR)\Notify_Default_EMO_Factory.obj \
- $(OBJDIR)\Notify_Default_POA_Factory.obj \
- $(OBJDIR)\Notify_EventChannelFactory_i.obj \
- $(OBJDIR)\Method_Request_Updates.obj \
- $(OBJDIR)\Timer_Queue.obj \
- $(OBJDIR)\Timer_Reactor.obj \
- $(OBJDIR)\Batch_Buffering_Strategy.obj \
- $(OBJDIR)\CosNotify_Initializer.obj
-
-RESOURCE = $(OBJDIR)\CosNotification.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- -DTAO_NOTIFY_BUILD_DLL
-
-CPPDIR = .;Notify;Notify\Any;Notify\Structured\;Notify\Sequence
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Notify
-INCLUDES = Notify\*.h Notify\*.i* Notify\*_T.cpp
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_ETCL_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosNotificationC.cpp $(IDLDIR)\CosNotificationS.cpp: $(IDLDIR)\CosNotification.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosNotifyChannelAdminC.cpp $(IDLDIR)\CosNotifyChannelAdminS.cpp: $(IDLDIR)\CosNotifyChannelAdmin.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosNotifyCommC.cpp $(IDLDIR)\CosNotifyCommS.cpp: $(IDLDIR)\CosNotifyComm.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosNotifyFilterC.cpp $(IDLDIR)\CosNotifyFilterS.cpp: $(IDLDIR)\CosNotifyFilter.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\NotifyExtC.cpp $(IDLDIR)\NotifyExtS.cpp: $(IDLDIR)\NotifyExt.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\Event_ForwarderC.cpp $(IDLDIR)\Event_ForwarderS.cpp: $(IDLDIR)\Event_Forwarder.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.bor b/TAO/orbsvcs/orbsvcs/CosProperty.bor
deleted file mode 100644
index 54ca75e5322..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosProperty.bor
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosProperty library
-#
-
-NAME = TAO_CosProperty
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Property_Export \
- -Wb,export_include=Property/property_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosPropertyService.idl
-
-OBJFILES = \
- $(OBJDIR)\CosPropertyService_i.obj \
- $(OBJDIR)\CosPropertyServiceC.obj \
- $(OBJDIR)\CosPropertyServiceS.obj
-
-RESOURCE = $(OBJDIR)\CosProperty.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- -DTAO_PROPERTY_BUILD_DLL
-
-CPPDIR = .;Property
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Property
-INCLUDES = Property\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosPropertyServiceC.cpp $(IDLDIR)\CosPropertyServiceS.cpp: $(IDLDIR)\CosPropertyService.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.bor b/TAO/orbsvcs/orbsvcs/CosTime.bor
deleted file mode 100644
index 80da54ae7d8..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTime.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosTime library
-#
-
-NAME = TAO_CosTime
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Time_Export \
- -Wb,export_include=Time/time_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\TimeService.idl
-
-OBJFILES = \
- $(OBJDIR)\TAO_Time_Service_Clerk.obj \
- $(OBJDIR)\TAO_Time_Service_Server.obj \
- $(OBJDIR)\TAO_TIO.obj \
- $(OBJDIR)\TAO_UTO.obj \
- $(OBJDIR)\Timer_Helper.obj \
- $(OBJDIR)\TimeServiceC.obj \
- $(OBJDIR)\TimeServiceS.obj
-
-RESOURCE = $(OBJDIR)\CosTime.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_TIME_CFLAGS) \
- -DTAO_TIME_BUILD_DLL
-
-CPPDIR = .;Time
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Time
-INCLUDES = Time\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\TimeServiceC.cpp $(IDLDIR)\TimeServiceS.cpp: $(IDLDIR)\TimeService.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.bor b/TAO/orbsvcs/orbsvcs/CosTrading.bor
deleted file mode 100644
index 5650bfe1daa..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTrading.bor
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO CosTrading library
-#
-
-NAME = TAO_CosTrading
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Trading_Export \
- -Wb,export_include=Trader/trading_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\CosTrading.idl \
- $(IDLDIR)\CosTradingDynamic.idl \
- $(IDLDIR)\CosTradingRepos.idl
-
-OBJFILES = \
- $(OBJDIR)\Constraint_Interpreter.obj \
- $(OBJDIR)\Constraint_l.obj \
- $(OBJDIR)\Constraint_Nodes.obj \
- $(OBJDIR)\Constraint_Visitors.obj \
- $(OBJDIR)\Constraint_y.obj \
- $(OBJDIR)\CosTradingC.obj \
- $(OBJDIR)\CosTradingDynamicC.obj \
- $(OBJDIR)\CosTradingDynamicS.obj \
- $(OBJDIR)\CosTradingReposC.obj \
- $(OBJDIR)\CosTradingReposS.obj \
- $(OBJDIR)\CosTradingS.obj \
- $(OBJDIR)\Interpreter.obj \
- $(OBJDIR)\Interpreter_Utils.obj \
- $(OBJDIR)\Offer_Database.obj \
- $(OBJDIR)\Offer_Iterators.obj \
- $(OBJDIR)\Service_Type_Repository.obj \
- $(OBJDIR)\Trader.obj \
- $(OBJDIR)\Trader_Constraint_Visitors.obj \
- $(OBJDIR)\Trader_Interfaces.obj \
- $(OBJDIR)\Trader_Utils.obj \
- $(OBJDIR)\Trading_Loader.obj
-
-RESOURCE = $(OBJDIR)\CosTrading.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TRADING_CFLAGS) \
- -DTAO_TRADING_BUILD_DLL
-
-CPPDIR = .;Trader
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Trader
-INCLUDES = Trader\*.h Trader\*_T.cpp
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\CosTradingC.cpp $(IDLDIR)\CosTradingS.cpp: $(IDLDIR)\CosTrading.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosTradingDynamicC.cpp $(IDLDIR)\CosTradingDynamicS.cpp: $(IDLDIR)\CosTradingDynamic.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\CosTradingReposC.cpp $(IDLDIR)\CosTradingReposS.cpp: $(IDLDIR)\CosTradingRepos.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
deleted file mode 100644
index 5c22ce8ea7d..00000000000
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO DsLogAdmin library
-#
-
-NAME = TAO_DsLogAdmin
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Log_Export \
- -Wb,export_include=Log/log_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\DsLogAdmin.idl \
- $(IDLDIR)\DsLogNotification.idl
-
-OBJFILES = \
- $(OBJDIR)\BasicLog_i.obj \
- $(OBJDIR)\BasicLogFactory_i.obj \
- $(OBJDIR)\DsLogAdminC.obj \
- $(OBJDIR)\DsLogAdminS.obj \
- $(OBJDIR)\DsLogNotificationC.obj \
- $(OBJDIR)\DsLogNotificationS.obj \
- $(OBJDIR)\Iterator_i.obj \
- $(OBJDIR)\Log_Constraint_Interpreter.obj \
- $(OBJDIR)\Log_Constraint_Visitors.obj \
- $(OBJDIR)\Log_i.obj \
- $(OBJDIR)\LogMgr_i.obj \
- $(OBJDIR)\LogNotification.obj \
- $(OBJDIR)\LogRecordStore.obj \
- $(OBJDIR)\PersistStore.obj
-
-RESOURCE = $(OBJDIR)\DsLogAdmin.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_TRADING_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_LOG_CFLAGS) \
- -DTAO_LOG_BUILD_DLL
-
-CPPDIR = .;Log
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Log
-INCLUDES = Log\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_TRADING_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_ETCL_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\DsLogAdminC.cpp $(IDLDIR)\DsLogAdminS.cpp: $(IDLDIR)\DsLogAdmin.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\DsLogNotificationC.cpp $(IDLDIR)\DsLogNotificationS.cpp: $(IDLDIR)\DsLogNotification.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/ETCL.bor b/TAO/orbsvcs/orbsvcs/ETCL.bor
deleted file mode 100644
index 006d0f503dc..00000000000
--- a/TAO/orbsvcs/orbsvcs/ETCL.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO ETCL library
-#
-
-NAME = TAO_ETCL
-
-OBJFILES = \
- $(OBJDIR)\ETCL_Constraint.obj \
- $(OBJDIR)\ETCL_Interpreter.obj \
- $(OBJDIR)\ETCL_l.obj \
- $(OBJDIR)\ETCL_y.obj
-
-RESOURCE = $(OBJDIR)\ETCL.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- -DTAO_ETCL_BUILD_DLL
-
-CPPDIR = .;ETCL
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/TAO/orbsvcs/orbsvcs/FTORB_Utils.bor b/TAO/orbsvcs/orbsvcs/FTORB_Utils.bor
deleted file mode 100644
index 9267bc870cc..00000000000
--- a/TAO/orbsvcs/orbsvcs/FTORB_Utils.bor
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO_FTORB_Utils library with Borland C++ Builder
-
-NAME = TAO_FTORB_Utils
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\FT_CORBA_ORBC.obj \
- $(OBJDIR)\FT_CORBA_ORBS.obj \
- $(OBJDIR)\PortableGroup_Simple_DSC.obj \
- $(OBJDIR)\FT_IOGR_Property.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_IORManip$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-IDLFILES = \
- $(IDLDIR)\FT_CORBA_ORB.idl \
- $(IDLDIR)\PortableGroup_Simple_DS.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_FT_ORB_UTILS_BUILD_DLL
-!endif
-
-CFLAGS = \
- -I..\..\orbsvcs\orbsvcs \
- -I..\..\orbsvcs \
- -I..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\FT_CORBA_ORBS.cpp $(IDLDIR)\FT_CORBA_ORBC.cpp: $(IDLDIR)\FT_CORBA_ORB.idl
- $(TAO_IDL) -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=FaultTolerance\FT_ORB_Utils_export.h -Wb,skel_export_include=tao\PortableServer\PolicyS.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
-
-$(IDLDIR)\PortableGroup_Simple_DSC.cpp $(IDLDIR)\PortableGroup_Simple_DSS.cpp: $(IDLDIR)\PortableGroup_Simple_DS.idl
- $(TAO_IDL) -Wb,skel_export_include=tao\PortableServer\PolicyS.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/orbsvcs/FT_ClientORB.bor b/TAO/orbsvcs/orbsvcs/FT_ClientORB.bor
deleted file mode 100644
index 4ac3bc5a438..00000000000
--- a/TAO/orbsvcs/orbsvcs/FT_ClientORB.bor
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO_FT_ClientORB library with Borland C++ Builder
-
-NAME = TAO_FT_ClientORB
-
-
-OBJFILES = \
- $(OBJDIR)\PortableGroup_Simple_DSC.obj \
- $(OBJDIR)\FT_ClientORBInitializer.obj \
- $(OBJDIR)\FT_ClientPolicyFactory.obj \
- $(OBJDIR)\FT_ClientPolicy_i.obj \
- $(OBJDIR)\FT_ClientRequest_Interceptor.obj \
- $(OBJDIR)\FT_ClientService_Activate.obj \
- $(OBJDIR)\FT_Endpoint_Selector_Factory.obj \
- $(OBJDIR)\FT_Invocation_Endpoint_Selectors.obj \
- $(OBJDIR)\FT_Service_Callbacks.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_PortableGroup$(LIB_DECORATOR).lib \
- TAO_FTORB_Utils$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_IORManip$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_FT_CLIENTORB_BUILD_DLL
-!endif
-
-CFLAGS = \
- -I..\..\orbsvcs\orbsvcs \
- -I..\..\orbsvcs \
- -I..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\PortableGroup_Simple_DS.idl
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -I.. -Ge 1 -GC -Wb,export_macro=TAO_FT_ServerORB_Export \
- -Wb,export_include=FaultTolerance/FT_ServerORB_export.h \
- -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
-
-INCDIR_NAME = orbsvcs
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\PortableGroup_Simple_DSC.cpp $(IDLDIR)\PortableGroup_Simple_DSS.cpp: $(IDLDIR)\PortableGroup_Simple_DS.idl
- $(TAO_IDL) -Wb,skel_export_include=tao\PortableServer\PolicyS.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/orbsvcs/FT_ServerORB.bor b/TAO/orbsvcs/orbsvcs/FT_ServerORB.bor
deleted file mode 100644
index 2fabacb514d..00000000000
--- a/TAO/orbsvcs/orbsvcs/FT_ServerORB.bor
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO_FT_ServerORB library with Borland C++ Builder
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_FT_ServerORB
-!else
-!undef NAME
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -I.. -Ge 1 -GC -Wb,export_macro=TAO_FT_ServerORB_Export \
- -Wb,export_include=FaultTolerance/FT_ServerORB_export.h \
- -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\PortableGroup_Simple_DS.idl
-
-OBJFILES = \
- $(OBJDIR)\PortableGroup_Simple_DSC.obj \
- $(OBJDIR)\FT_ServerORBInitializer.obj \
- $(OBJDIR)\FT_ServerPolicyFactory.obj \
- $(OBJDIR)\FT_ServerPolicy_i.obj \
- $(OBJDIR)\FT_ServerRequest_Interceptor.obj \
- $(OBJDIR)\FT_ServerService_Activate.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_FTORB_Utils$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_PortableGroup$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_IORManip$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_FT_SERVERORB_BUILD_DLL
-!endif
-
-CFLAGS = \
- -I..\..\orbsvcs\orbsvcs \
- -I..\..\orbsvcs \
- -I..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\PortableGroup_Simple_DSC.cpp $(IDLDIR)\PortableGroup_Simple_DSS.cpp: $(IDLDIR)\PortableGroup_Simple_DS.idl
- $(TAO_IDL) -Wb,skel_export_include=tao\PortableServer\PolicyS.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.bor b/TAO/orbsvcs/orbsvcs/FaultTolerance.bor
deleted file mode 100644
index 6514c650b5e..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.bor
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO FaultTolerance library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_FaultTolerance
-!else
-!undef NAME
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -I.. -Ge 1 -Wb,export_macro=TAO_FT_Export \
- -Wb,export_include=FaultTolerance/fault_tol_export.h \
- -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\FT_CORBA.idl
-
-OBJFILES = \
- $(OBJDIR)\FT_CORBAC.obj \
- $(OBJDIR)\FT_CORBAS.obj
-
-RESOURCE = $(OBJDIR)\FaultTolerance.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_FT_CFLAGS) \
- $(TAO_FTORB_CFLAGS) \
- -DTAO_FT_BUILD_DLL
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\FaultTolerance
-INCLUDES = FaultTolerance\*.h FaultTolerance\*.inl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_FTORB_LIB) \
- $(TAO_NOTIFY_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\FT_CORBAC.cpp $(IDLDIR)\FT_CORBAS.cpp: $(IDLDIR)\FT_CORBA.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.bor b/TAO/orbsvcs/orbsvcs/IFRService.bor
deleted file mode 100644
index 1e815f3ac7f..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService.bor
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the IFR Service library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_IFRService
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\AbstractInterfaceDef_i.obj \
- $(OBJDIR)\AliasDef_i.obj \
- $(OBJDIR)\ArrayDef_i.obj \
- $(OBJDIR)\AttributeDef_i.obj \
- $(OBJDIR)\ComponentContainer_i.obj \
- $(OBJDIR)\ComponentDef_i.obj \
- $(OBJDIR)\ComponentModuleDef_i.obj \
- $(OBJDIR)\ComponentRepository_i.obj \
- $(OBJDIR)\ConstantDef_i.obj \
- $(OBJDIR)\ConsumesDef_i.obj \
- $(OBJDIR)\Contained_i.obj \
- $(OBJDIR)\Container_i.obj \
- $(OBJDIR)\EmitsDef_i.obj \
- $(OBJDIR)\EnumDef_i.obj \
- $(OBJDIR)\EventDef_i.obj \
- $(OBJDIR)\EventPortDef_i.obj \
- $(OBJDIR)\ExceptionDef_i.obj \
- $(OBJDIR)\ExtAbstractInterfaceDef_i.obj \
- $(OBJDIR)\ExtAttributeDef_i.obj \
- $(OBJDIR)\ExtInterfaceDef_i.obj \
- $(OBJDIR)\ExtLocalInterfaceDef_i.obj \
- $(OBJDIR)\ExtValueDef_i.obj \
- $(OBJDIR)\FactoryDef_i.obj \
- $(OBJDIR)\FinderDef_i.obj \
- $(OBJDIR)\FixedDef_i.obj \
- $(OBJDIR)\HomeDef_i.obj \
- $(OBJDIR)\IDLType_i.obj \
- $(OBJDIR)\IFR_BaseS.obj \
- $(OBJDIR)\IFR_BasicS.obj \
- $(OBJDIR)\IFR_ComponentsS.obj \
- $(OBJDIR)\IFR_ExtendedS.obj \
- $(OBJDIR)\IFR_Service_Loader.obj \
- $(OBJDIR)\IFR_Service_Utils.obj \
- $(OBJDIR)\InterfaceAttrExtension_i.obj \
- $(OBJDIR)\InterfaceDef_i.obj \
- $(OBJDIR)\IRObject_i.obj \
- $(OBJDIR)\LocalInterfaceDef_i.obj \
- $(OBJDIR)\ModuleDef_i.obj \
- $(OBJDIR)\NativeDef_i.obj \
- $(OBJDIR)\OperationDef_i.obj \
- $(OBJDIR)\Options.obj \
- $(OBJDIR)\PrimitiveDef_i.obj \
- $(OBJDIR)\ProvidesDef_i.obj \
- $(OBJDIR)\PublishesDef_i.obj \
- $(OBJDIR)\Repository_i.obj \
- $(OBJDIR)\SequenceDef_i.obj \
- $(OBJDIR)\StringDef_i.obj \
- $(OBJDIR)\StructDef_i.obj \
- $(OBJDIR)\tmplinst.obj \
- $(OBJDIR)\TypedefDef_i.obj \
- $(OBJDIR)\UnionDef_i.obj \
- $(OBJDIR)\UsesDef_i.obj \
- $(OBJDIR)\ValueBoxDef_i.obj \
- $(OBJDIR)\ValueDef_i.obj \
- $(OBJDIR)\ValueMemberDef_i.obj \
- $(OBJDIR)\WstringDef_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_TYPECODEFACTORY_CFLAGS) \
- -DTAO_IFRSERVICE_BUILD_DLL
-
-RESOURCE = $(OBJDIR)\IFRService.res
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_TYPECODEFACTORY_LIB)
-
-CPPDIR = .;IFRService
-
-INCDIR_NAME = orbsvcs\IFRService
-INCLUDES = IFRService\*.h IFRService\*.i
-
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
deleted file mode 100644
index 270d20e843d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO ORB Services libraries
-#
-
-MAKEFILES = \
- Svc_Utils.bor \
- CosNaming.bor \
- CosProperty.bor \
- CosTrading.bor \
- RTSched.bor \
- RTEvent.bor \
- RTOLDEvent.bor \
- RTSchedEvent.bor \
- CosEvent.bor \
- ETCL.bor \
- CosNotification.bor \
- Security.bor \
- SSLIOP.bor \
- AV.bor \
- CosConcurrency.bor \
- CosLifeCycle.bor \
- CosTime.bor \
- DsLogAdmin.bor \
- PortableGroup.bor \
- FTORB_Utils.bor \
- FT_ServerORB.bor \
- FT_ClientORB.bor \
- FaultTolerance.bor \
- CosLoadBalancing.bor \
- IFRService.bor \
- RTCosScheduling.bor
-
-!include <$(ACE_ROOT)/include/makeinclude/recurse.bor>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.bor b/TAO/orbsvcs/orbsvcs/PortableGroup.bor
deleted file mode 100644
index e6e9e2395a4..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.bor
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO PortableGroup library
-#
-
-NAME = TAO_PortableGroup
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -I.. -Ge 1 -GC -Wb,export_macro=TAO_PortableGroup_Export \
- -Wb,export_include=PortableGroup/portablegroup_export.h \
- -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\miop.idl \
- $(IDLDIR)\PortableGroup.idl \
- $(IDLDIR)\PortableGroup_Simple_DS.idl
-
-OBJFILES = \
- $(OBJDIR)\PortableGroup_Simple_DSC.obj \
- $(OBJDIR)\miopC.obj \
- $(OBJDIR)\miopS.obj \
- $(OBJDIR)\PortableGroupC.obj \
- $(OBJDIR)\PortableGroupS.obj \
- $(OBJDIR)\POA_Hooks.obj \
- $(OBJDIR)\Portable_Group_Map.obj \
- $(OBJDIR)\PortableGroup_Acceptor_Registry.obj \
- $(OBJDIR)\PortableGroup_Loader.obj \
- $(OBJDIR)\PortableGroup_ORBInitializer.obj \
- $(OBJDIR)\PortableGroup_Request_Dispatcher.obj \
- $(OBJDIR)\UIPMC_Acceptor.obj \
- $(OBJDIR)\UIPMC_Connection_Handler.obj \
- $(OBJDIR)\UIPMC_Connector.obj \
- $(OBJDIR)\UIPMC_Endpoint.obj \
- $(OBJDIR)\UIPMC_Factory.obj \
- $(OBJDIR)\UIPMC_Message_Block_Data_Iterator.obj \
- $(OBJDIR)\UIPMC_Profile.obj \
- $(OBJDIR)\UIPMC_Transport.obj \
- $(OBJDIR)\UIPMC_Wait_Never.obj \
- $(OBJDIR)\PG_Factory_Map.obj \
- $(OBJDIR)\PG_Factory_Set.obj \
- $(OBJDIR)\PG_GenericFactory.obj \
- $(OBJDIR)\PG_Location_Equal_To.obj \
- $(OBJDIR)\PG_Location_Hash.obj \
- $(OBJDIR)\PG_Location_Map.obj \
- $(OBJDIR)\PG_MemberInfo.obj \
- $(OBJDIR)\PG_ObjectGroupManager.obj \
- $(OBJDIR)\PG_ObjectGroup_Map.obj \
- $(OBJDIR)\PG_Operators.obj \
- $(OBJDIR)\PG_PropertyManager.obj \
- $(OBJDIR)\PG_Property_Utils.obj \
- $(OBJDIR)\PG_Default_Property_Validator.obj \
- $(OBJDIR)\PG_Null_Property_Validator.obj
-
-RESOURCE = $(OBJDIR)\PortableGroup.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_VALUEYTPE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- -DTAO_PORTABLEGROUP_BUILD_DLL
-
-CPPDIR = .;PortableGroup
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\PortableGroup
-INCLUDES = PortableGroup\*.h PortableGroup\*.i
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_VALUEYTPE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\miopC.cpp $(IDLDIR)\miopS.cpp: $(IDLDIR)\miop.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\PortableGroupC.cpp $(IDLDIR)\PortableGroupS.cpp: $(IDLDIR)\PortableGroup.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\PortableGroup_Simple_DSC.cpp $(IDLDIR)\PortableGroup_Simple_DSS.cpp: $(IDLDIR)\PortableGroup_Simple_DS.idl
- $(TAO_IDL) -Wb,skel_export_include=tao\PortableServer\PolicyS.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.bor b/TAO/orbsvcs/orbsvcs/RTCosScheduling.bor
deleted file mode 100644
index d0ecc19fccf..00000000000
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.bor
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO_RTCosScheduling library with Borland C++ Builder
-
-NAME = TAO_RTCosScheduling
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\RTCosSchedulingC.obj \
- $(OBJDIR)\RTCosSchedulingS.obj \
- $(OBJDIR)\RTCosScheduling_ClientScheduler_i.obj \
- $(OBJDIR)\RTCosScheduling_PCP_Manager.obj \
- $(OBJDIR)\RTCosScheduling_ServerScheduler_i.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j..\..\tao\RTPortableServer\$(CONFIG_SUBDIR) -j..\..\tao\RTPortableServer \
- -L..\..\tao\RTPortableServer\$(CONFIG_SUBDIR) -L..\..\tao\RTPortableServer \
- -j..\..\tao\RTCORBA\$(CONFIG_SUBDIR) -j..\..\tao\RTCORBA \
- -L..\..\tao\RTCORBA\$(CONFIG_SUBDIR) -L..\..\tao\RTCORBA \
- -j..\..\tao\PortableServer\$(CONFIG_SUBDIR) -j..\..\tao\PortableServer \
- -L..\..\tao\PortableServer\$(CONFIG_SUBDIR) -L..\..\tao\PortableServer \
- -j..\..\tao\IORInterceptor\$(CONFIG_SUBDIR) -j..\..\tao\IORInterceptor \
- -L..\..\tao\IORInterceptor\$(CONFIG_SUBDIR) -L..\..\tao\IORInterceptor \
- -j..\..\tao\ValueType\$(CONFIG_SUBDIR) -j..\..\tao\ValueType \
- -L..\..\tao\ValueType\$(CONFIG_SUBDIR) -L..\..\tao\ValueType \
- -j..\..\tao\ObjRefTemplate\$(CONFIG_SUBDIR) -j..\..\tao\ObjRefTemplate \
- -L..\..\tao\ObjRefTemplate\$(CONFIG_SUBDIR) -L..\..\tao\ObjRefTemplate \
- -j..\..\tao\$(CONFIG_SUBDIR) -j..\..\tao \
- -L..\..\tao\$(CONFIG_SUBDIR) -L..\..\tao \
- -j..\..\..\ace\$(CONFIG_SUBDIR) -j..\..\..\ace \
- -L..\..\..\ace\$(CONFIG_SUBDIR) -L..\..\..\ace \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-IDLFILES = \
- $(IDLDIR)\RTCosScheduling.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_RTCOSSCHEDULING_BUILD_DLL
-!endif
-
-CFLAGS = \
- -I..\..\orbsvcs \
- -I..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;RTCosScheduling
-
-IDLDIR = .
-
-INCLUDES = \
- RTCosScheduling\RTCosScheduling_ClientScheduler_i.h \
- RTCosScheduling\RTCosScheduling_PCP_Manager.h \
- RTCosScheduling\RTCosScheduling_ServerScheduler_i.h \
- RTCosScheduling\RTCosScheduling_ClientScheduler_i.i \
- RTCosScheduling\RTCosScheduling_PCP_Manager.i \
- RTCosScheduling\RTCosScheduling_ServerScheduler_i.i \
- RTCosScheduling.idl
-
-INCDIR_NAME = orbsvcs
-
-all: idl_src_files
-
-BASE_BINDIR = $(ACE_ROOT)\bin
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\RTCosSchedulingS.cpp $(IDLDIR)\RTCosSchedulingC.cpp: $(IDLDIR)\RTCosScheduling.idl
- $(TAO_IDL) -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h -Gv -I..\.. -I..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor
deleted file mode 100644
index a60c6866fe1..00000000000
--- a/TAO/orbsvcs/orbsvcs/RTEvent.bor
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO RTEvent library
-#
-
-NAME = TAO_RTEvent
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_RTEvent_Export \
- -Wb,export_include=Event/event_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\RtecDefaultEventData.idl \
- $(IDLDIR)\RtecEventChannelAdmin.idl \
- $(IDLDIR)\RtecEventComm.idl \
- $(IDLDIR)\RtecUDPAdmin.idl
-
-OBJFILES = \
- $(OBJDIR)\EC_Channel_Destroyer.obj \
- $(OBJDIR)\EC_Lifetime_Utils.obj \
- $(OBJDIR)\EC_Proxy_Disconnector.obj \
- $(OBJDIR)\EC_And_Filter.obj \
- $(OBJDIR)\EC_Basic_Factory.obj \
- $(OBJDIR)\EC_Basic_Filter_Builder.obj \
- $(OBJDIR)\EC_Bitmask_Filter.obj \
- $(OBJDIR)\EC_ProxyConsumer.obj \
- $(OBJDIR)\EC_ProxySupplier.obj \
- $(OBJDIR)\EC_Default_ProxyConsumer.obj \
- $(OBJDIR)\EC_Default_ProxySupplier.obj \
- $(OBJDIR)\EC_Busy_Lock.obj \
- $(OBJDIR)\EC_Conjunction_Filter.obj \
- $(OBJDIR)\EC_ConsumerAdmin.obj \
- $(OBJDIR)\EC_ConsumerControl.obj \
- $(OBJDIR)\EC_Default_Factory.obj \
- $(OBJDIR)\EC_Disjunction_Filter.obj \
- $(OBJDIR)\EC_Dispatching.obj \
- $(OBJDIR)\EC_Reactive_Dispatching.obj \
- $(OBJDIR)\EC_Dispatching_Task.obj \
- $(OBJDIR)\EC_Event_Channel_Base.obj \
- $(OBJDIR)\EC_Event_Channel.obj \
- $(OBJDIR)\EC_Factory.obj \
- $(OBJDIR)\EC_Filter.obj \
- $(OBJDIR)\EC_Filter_Builder.obj \
- $(OBJDIR)\EC_Group_Scheduling.obj \
- $(OBJDIR)\EC_Gateway.obj \
- $(OBJDIR)\EC_Gateway_IIOP.obj \
- $(OBJDIR)\EC_Gateway_IIOP_Factory.obj \
- $(OBJDIR)\ECG_ConsumerEC_Control.obj \
- $(OBJDIR)\ECG_Reactive_ConsumerEC_Control.obj \
- $(OBJDIR)\ECG_Reconnect_ConsumerEC_Control.obj \
- $(OBJDIR)\ECG_UDP_Out_Endpoint.obj \
- $(OBJDIR)\ECG_Mcast_EH.obj \
- $(OBJDIR)\ECG_UDP_Sender.obj \
- $(OBJDIR)\ECG_Adapters.obj \
- $(OBJDIR)\ECG_Address_Server_Base.obj \
- $(OBJDIR)\ECG_CDR_Message_Receiver.obj \
- $(OBJDIR)\ECG_CDR_Message_Sender.obj \
- $(OBJDIR)\ECG_Complex_Address_Server.obj \
- $(OBJDIR)\ECG_Mcast_Gateway.obj \
- $(OBJDIR)\ECG_Simple_Address_Server.obj \
- $(OBJDIR)\ECG_Simple_Mcast_EH.obj \
- $(OBJDIR)\ECG_UDP_EH.obj \
- $(OBJDIR)\ECG_UDP_Receiver.obj \
- $(OBJDIR)\EC_Masked_Type_Filter.obj \
- $(OBJDIR)\EC_MT_Dispatching.obj \
- $(OBJDIR)\EC_Negation_Filter.obj \
- $(OBJDIR)\EC_Null_Factory.obj \
- $(OBJDIR)\EC_Null_Scheduling.obj \
- $(OBJDIR)\EC_ObserverStrategy.obj \
- $(OBJDIR)\EC_Per_Supplier_Filter.obj \
- $(OBJDIR)\EC_Prefix_Filter_Builder.obj \
- $(OBJDIR)\EC_QOS_Info.obj \
- $(OBJDIR)\EC_Reactive_ConsumerControl.obj \
- $(OBJDIR)\EC_Reactive_SupplierControl.obj \
- $(OBJDIR)\EC_Reactive_Timeout_Generator.obj \
- $(OBJDIR)\EC_Scheduling_Strategy.obj \
- $(OBJDIR)\EC_Supplier_Filter.obj \
- $(OBJDIR)\EC_Supplier_Filter_Builder.obj \
- $(OBJDIR)\EC_SupplierAdmin.obj \
- $(OBJDIR)\EC_SupplierControl.obj \
- $(OBJDIR)\EC_Timeout_Filter.obj \
- $(OBJDIR)\EC_Timeout_Generator.obj \
- $(OBJDIR)\EC_Trivial_Supplier_Filter.obj \
- $(OBJDIR)\EC_Type_Filter.obj \
- $(OBJDIR)\EC_UDP_Admin.obj \
- $(OBJDIR)\Event_Utilities.obj \
- $(OBJDIR)\RtecDefaultEventDataC.obj \
- $(OBJDIR)\RtecDefaultEventDataS.obj \
- $(OBJDIR)\RtecEventChannelAdminC.obj \
- $(OBJDIR)\RtecEventChannelAdminS.obj \
- $(OBJDIR)\RtecEventCommC.obj \
- $(OBJDIR)\RtecEventCommS.obj \
- $(OBJDIR)\RtecUDPAdminC.obj \
- $(OBJDIR)\RtecUDPAdminS.obj
-
-RESOURCE = $(OBJDIR)\RTEvent.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- -DTAO_RTEVENT_BUILD_DLL
-
-CPPDIR = .;Event
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Event
-INCLUDES = Event\*.h Event\*.i
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_MESSAGING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\RtecDefaultEventDataC.cpp $(IDLDIR)\RtecDefaultEventDataS.cpp: $(IDLDIR)\RtecDefaultEventData.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\RtecEventChannelAdminC.cpp $(IDLDIR)\RtecEventChannelAdminS.cpp: $(IDLDIR)\RtecEventChannelAdmin.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\RtecEventCommC.cpp $(IDLDIR)\RtecEventCommS.cpp: $(IDLDIR)\RtecEventComm.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\RtecUDPAdminC.cpp $(IDLDIR)\RtecUDPAdminS.cpp: $(IDLDIR)\RtecUDPAdmin.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor b/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor
deleted file mode 100644
index 85a13393b6e..00000000000
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO RTOLDEvent library
-#
-
-NAME = TAO_RTOLDEvent
-
-OBJFILES = \
- $(OBJDIR)\BCU.obj \
- $(OBJDIR)\Dispatching_Modules.obj \
- $(OBJDIR)\Event_Channel.obj \
- $(OBJDIR)\Event_Manip.obj \
- $(OBJDIR)\GPlot_File.obj \
- $(OBJDIR)\Local_ESTypes.obj \
- $(OBJDIR)\Memory_Pools.obj \
- $(OBJDIR)\Module_Factory.obj \
- $(OBJDIR)\ReactorTask.obj \
- $(OBJDIR)\RT_Task.obj \
- $(OBJDIR)\Timer_Module.obj
-
-RESOURCE = $(OBJDIR)\RTOldEvent.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_RTOLDEVENT_CFLAGS) \
- -DTAO_RTOLDEVENT_BUILD_DLL
-
-CPPDIR = .;Event
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.bor b/TAO/orbsvcs/orbsvcs/RTSched.bor
deleted file mode 100644
index 188d61777ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/RTSched.bor
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO RTSched library
-#
-
-NAME = TAO_RTSched
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_RTSched_Export \
- -Wb,export_include=Sched/sched_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\RtecScheduler.idl
-
-OBJFILES = \
- $(OBJDIR)\Config_Scheduler.obj \
- $(OBJDIR)\DynSched.obj \
- $(OBJDIR)\Reconfig_Sched_Utils.obj \
- $(OBJDIR)\Reconfig_Scheduler.obj \
- $(OBJDIR)\RtecSchedulerC.obj \
- $(OBJDIR)\RtecSchedulerS.obj \
- $(OBJDIR)\RtecBaseC.obj \
- $(OBJDIR)\RtecBaseS.obj \
- $(OBJDIR)\Runtime_Scheduler.obj \
- $(OBJDIR)\SchedEntry.obj \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\Scheduler_Factory.obj \
- $(OBJDIR)\Scheduler_Generic.obj \
- $(OBJDIR)\Scheduler_Utilities.obj \
- $(OBJDIR)\Strategy_Scheduler.obj
-
-RESOURCE = $(OBJDIR)\RTSched.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- -DTAO_RTSCHED_BUILD_DLL
-
-CPPDIR = .;Sched
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Sched
-INCLUDES = Sched\*.h Sched\*.i Sched\*_T.cpp
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\RtecSchedulerC.cpp $(IDLDIR)\RtecSchedulerS.cpp: $(IDLDIR)\RtecScheduler.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor b/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor
deleted file mode 100644
index d13f0e1ac50..00000000000
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO RTSchedEvent library
-#
-
-NAME = TAO_RTSchedEvent
-
-OBJFILES = \
- $(OBJDIR)\EC_Gateway_Sched.obj \
- $(OBJDIR)\EC_Priority_Dispatching.obj \
- $(OBJDIR)\EC_Priority_Scheduling.obj \
- $(OBJDIR)\EC_Sched_Factory.obj \
- $(OBJDIR)\EC_Sched_Filter.obj \
- $(OBJDIR)\EC_Sched_Filter_Builder.obj
-
-RESOURCE = $(OBJDIR)\RTSchedEvent.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_RTSCHEDEVENT_CFLAGS) \
- -DTAO_RTSCHEDEVENT_BUILD_DLL
-
-CPPDIR = .;Event
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.bor b/TAO/orbsvcs/orbsvcs/RT_Notification.bor
deleted file mode 100644
index 6e356135e93..00000000000
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.bor
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO_RT_Notification library with Borland C++ Builder
-#
-
-NAME = TAO_RT_Notification
-
-OBJFILES = \
- $(OBJDIR)\RT_Builder.obj \
- $(OBJDIR)\RT_Factory.obj \
- $(OBJDIR)\RT_Notify_Service.obj \
- $(OBJDIR)\RT_POA_Helper.obj \
- $(OBJDIR)\RT_Properties.obj
-
-EXTERNAL_LIBS =
-
-LFLAGS = \
- -j$(TAO_ROOT)\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\orbsvcs\orbsvcs \
- -L$(TAO_ROOT)\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\orbsvcs\orbsvcs \
- -j$(TAO_ROOT)\tao\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao \
- -L$(TAO_ROOT)\tao\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao \
- -j$(ACE_ROOT)\ace\$(CONFIG_SUBDIR) -j$(ACE_ROOT)\ace \
- -L$(ACE_ROOT)\ace\$(CONFIG_SUBDIR) -L$(ACE_ROOT)\ace \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_CosNotification$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_ETCL$(LIB_DECORATOR).lib \
- TAO_DynamicAny$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
- $(EXTERNAL_LIBS)
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS=1 -DACE_AS_STATIC_LIBS=1
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_RT_NOTIFY_BUILD_DLL=1
-!endif
-
-CFLAGS = \
- -I$(TAO_ROOT)\orbsvcs \
- -I$(TAO_ROOT) \
- -I$(TAO_ROOT)\tao \
- -I$(ACE_ROOT) \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = Notify
-
-INCLUDES = \
- Channel_Clients_T.h \
- Notify\RT_Builder.h \
- Notify\RT_Factory.h \
- Notify\RT_Notify_Service.h \
- Notify\RT_POA_Helper.h \
- Notify\RT_Properties.h \
- Channel_Clients_T.cpp \
- Channel_Clients_T.i \
- Notify\RT_Builder.inl \
- Notify\RT_Factory.inl \
- Notify\RT_Notify_Service.inl \
- Notify\RT_POA_Helper.inl \
- Notify\RT_Properties.inl
-
-INCDIR_NAME = orbsvcs
-
-BASE_BINDIR = $(ACE_ROOT)\bin
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.bor b/TAO/orbsvcs/orbsvcs/SSLIOP.bor
deleted file mode 100644
index bc46bfe8445..00000000000
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.bor
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO SSLIOP library
-#
-
-!ifdef SSL_ROOT
-NAME = TAO_SSLIOP
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_SSLIOP_Export \
- -Wb,export_include=SSLIOP/SSLIOP_Export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\SSLIOP.idl
-
-OBJFILES = \
- $(OBJDIR)\IIOP_SSL_Acceptor.obj \
- $(OBJDIR)\IIOP_SSL_Connection_Handler.obj \
- $(OBJDIR)\IIOP_SSL_Transport.obj \
- $(OBJDIR)\IIOP_SSL_Connector.obj \
- $(OBJDIR)\ssl_endpoints.obj \
- $(OBJDIR)\SSLIOP_Accept_Strategy.obj \
- $(OBJDIR)\SSLIOP_Acceptor.obj \
- $(OBJDIR)\SSLIOP_Connection_Handler.obj \
- $(OBJDIR)\SSLIOP_Connector.obj \
- $(OBJDIR)\SSLIOP_Credentials.obj \
- $(OBJDIR)\SSLIOP_Current.obj \
- $(OBJDIR)\SSLIOP_Current_Impl.obj \
- $(OBJDIR)\SSLIOP_EVP_PKEY.obj \
- $(OBJDIR)\SSLIOP_Endpoint.obj \
- $(OBJDIR)\SSLIOP_Factory.obj \
- $(OBJDIR)\SSLIOP_Invocation_Interceptor.obj \
- $(OBJDIR)\SSLIOP_ORBInitializer.obj \
- $(OBJDIR)\SSLIOP_Profile.obj \
- $(OBJDIR)\SSLIOP_ReceivedCredentials.obj \
- $(OBJDIR)\SSLIOP_TargetCredentials.obj \
- $(OBJDIR)\SSLIOP_Transport.obj \
- $(OBJDIR)\SSLIOP_Util.obj \
- $(OBJDIR)\SSLIOP_Vault.obj \
- $(OBJDIR)\SSLIOP_X509.obj \
- $(OBJDIR)\SSLIOPC.obj
-
-RESOURCE = $(OBJDIR)\SSLIOP.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(ACE_SSL_CFLAGS) \
- $(SSL_CFLAGS) \
- $(TAO_SECURITY_CFLAGS) \
- $(TAO_SSLIOP_CFLAGS) \
- -DTAO_SSLIOP_BUILD_DLL
-
-CPPDIR = .;SSLIOP
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\SSLIOP
-INCLUDES = SSLIOP\*.h SSLIOP\*.i
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(ACE_SSL_LIB) \
- $(SSL_LIB) \
- $(TAO_SECURITY_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp)
-
-$(IDLDIR)\SSLIOPC.cpp: $(IDLDIR)\SSLIOP.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/Security.bor b/TAO/orbsvcs/orbsvcs/Security.bor
deleted file mode 100644
index 9183c42de5a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Security.bor
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO Security library
-#
-
-NAME = TAO_Security
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Security_Export \
- -Wb,export_include=Security/security_export.h \
- -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\Security.idl \
- $(IDLDIR)\SecurityLevel1.idl \
- $(IDLDIR)\SecurityLevel2.idl \
- $(IDLDIR)\SecurityReplaceable.idl
-
-OBJFILES = \
- $(OBJDIR)\SecurityC.obj \
- $(OBJDIR)\SecurityLevel1C.obj \
- $(OBJDIR)\SecurityLevel2C.obj \
- $(OBJDIR)\SecurityLevel2S.obj \
- $(OBJDIR)\SecurityReplaceableC.obj \
- $(OBJDIR)\Security_Current.obj \
- $(OBJDIR)\Security_Current_Impl.obj \
- $(OBJDIR)\Security_ORBInitializer.obj \
- $(OBJDIR)\Security_PolicyFactory.obj \
- $(OBJDIR)\SecurityManager.obj \
- $(OBJDIR)\PrincipalAuthenticator.obj \
- $(OBJDIR)\EstablishTrustPolicy.obj \
- $(OBJDIR)\InvocationCredentialsPolicy.obj \
- $(OBJDIR)\QOPPolicy.obj
-
-RESOURCE = $(OBJDIR)\Security.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SECURITY_CFLAGS) \
- -DTAO_SECURITY_BUILD_DLL
-
-CPPDIR = .;Security
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs\Security
-INCLUDES = Security\*.h
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\SecurityC.cpp: $(IDLDIR)\Security.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SecurityLevel1C.cpp: $(IDLDIR)\SecurityLevel1.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SecurityLevel2C.cpp: $(IDLDIR)\SecurityLevel2.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SecurityLevel2S.cpp: $(IDLDIR)\SecurityLevel2.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SecurityReplaceableC.cpp: $(IDLDIR)\SecurityReplaceable.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
deleted file mode 100644
index 32104e08751..00000000000
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO Svc Utils library
-#
-
-NAME = TAO_Svc_Utils
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I..\.. -Ge 1 -Wb,export_macro=TAO_Svc_Utils_Export \
- -Wb,export_include=svc_utils_export.h -Wb,pre_include=ace/pre.h \
- -Wb,post_include=ace/post.h
-
-IDLFILES = \
- $(IDLDIR)\TimeBase.idl \
- $(IDLDIR)\RtecBase.idl
-
-OBJFILES = \
- $(OBJDIR)\IOR_Multicast.obj \
- $(OBJDIR)\Time_Utilities.obj \
- $(OBJDIR)\TimeBaseC.obj \
- $(OBJDIR)\TimeBaseS.obj \
- $(OBJDIR)\RtecBaseC.obj \
- $(OBJDIR)\RtecBaseS.obj
-
-RESOURCE = $(OBJDIR)\Svc_Utils.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- -DTAO_SVC_UTILS_BUILD_DLL
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCDIR_NAME = orbsvcs
-INCLUDES = *.h *.i *_T.cpp *.idl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\TimeBaseC.cpp $(IDLDIR)\TimeBaseS.cpp: $(IDLDIR)\TimeBase.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\RtecBaseC.cpp $(IDLDIR)\RtecBaseS.cpp: $(IDLDIR)\RtecBase.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.bor
deleted file mode 100644
index 5b62a3ea62c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams async_three_stage test
-#
-
-MAKEFILES = receiver.bor sender.bor distributer.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.bor b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.bor
deleted file mode 100644
index 567efd3fd3d..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams async_three_stage test
-#
-
-NAME = distributer
-
-OBJFILES = \
- $(OBJDIR)\distributer.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.bor
deleted file mode 100644
index 88c3ba4a6e8..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams async_three_stage test
-#
-
-NAME = receiver
-
-OBJFILES = \
- $(OBJDIR)\receiver.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.bor b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.bor
deleted file mode 100644
index 542272312ea..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams async_three_stage test
-#
-
-NAME = sender
-
-OBJFILES = \
- $(OBJDIR)\sender.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.bor
deleted file mode 100644
index 9754a864cf8..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams component_switching test
-#
-
-MAKEFILES = receiver.bor sender.bor distributer.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor
deleted file mode 100644
index 2368c44430a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams component_switching test
-#
-
-NAME = distributer
-
-OBJFILES = \
- $(OBJDIR)\distributer.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor
deleted file mode 100644
index 17bcb5dc2bb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams component_switching test
-#
-
-NAME = receiver
-
-OBJFILES = \
- $(OBJDIR)\receiver.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor
deleted file mode 100644
index e5aa0dcebb9..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams component_switching test
-#
-
-NAME = sender
-
-OBJFILES = \
- $(OBJDIR)\sender.obj \
- $(OBJDIR)\Connection_Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.bor
deleted file mode 100644
index 5530892a3f8..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams full_profile test
-#
-
-MAKEFILES = ftp.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.bor
deleted file mode 100644
index 7919d1509ae..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams full_profile test
-#
-
-NAME = ftp
-
-OBJFILES = \
- $(OBJDIR)\ftp.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor
deleted file mode 100644
index aa11ace01a2..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams full_profile test
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Makefile.bor
deleted file mode 100644
index 14ab13608ff..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO AVStreams tests
-#
-
-DIRS = \
- Asynch_Three_Stage \
- Component_Switching \
- Full_Profile \
- Multicast \
- Multicast_Full_Profile \
- Pluggable \
- Simple_Three_Stage \
- Simple_Two_Stage \
- Simple_Two_Stage_With_QoS
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.bor
deleted file mode 100644
index 641d147457a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast test
-#
-
-MAKEFILES = ftp.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor
deleted file mode 100644
index 95553457674..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast test
-#
-
-NAME = ftp
-
-OBJFILES = \
- $(OBJDIR)\ftp.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor b/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor
deleted file mode 100644
index 0907b8b119b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast test
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.bor
deleted file mode 100644
index 410d043ca66..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast_full_profile test
-#
-
-MAKEFILES = ftp.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor
deleted file mode 100644
index a5e86c45bba..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast_full_profile test
-#
-
-NAME = ftp
-
-OBJFILES = \
- $(OBJDIR)\ftp.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor
deleted file mode 100644
index db8388e2dfa..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams multicast_full_profile test
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.bor
deleted file mode 100644
index 7663e7bf4b0..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams pluggable test
-#
-
-MAKEFILES = ftp.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor
deleted file mode 100644
index 4c797509e50..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams pluggable test
-#
-
-NAME = ftp
-
-OBJFILES = \
- $(OBJDIR)\ftp.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor
deleted file mode 100644
index 51a424edc69..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams pluggable test
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.bor
deleted file mode 100644
index 5391aad6c47..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_three_stage test
-#
-
-MAKEFILES = receiver.bor sender.bor distributer.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.bor
deleted file mode 100644
index 8149a7fa3c3..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_three_stage test
-#
-
-NAME = distributer
-
-OBJFILES = \
- $(OBJDIR)\distributer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.bor
deleted file mode 100644
index b15ddcaf094..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams simple_three_stage test
-#
-
-NAME = receiver
-
-OBJFILES = \
- $(OBJDIR)\receiver.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.bor
deleted file mode 100644
index 5e69d7f9b72..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_three_stage test
-#
-
-NAME = sender
-
-OBJFILES = \
- $(OBJDIR)\sender.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.bor
deleted file mode 100644
index 8f40626d1ef..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_two_stage test
-#
-
-MAKEFILES = receiver.bor sender.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.bor
deleted file mode 100644
index d38475e989e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams simple_two_stage test
-#
-
-NAME = receiver
-
-OBJFILES = \
- $(OBJDIR)\receiver.obj \
- $(OBJDIR)\Receiver_Stats.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.bor
deleted file mode 100644
index 6d9eea2266a..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_two_stage test
-#
-
-NAME = sender
-
-OBJFILES = \
- $(OBJDIR)\sender.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.bor
deleted file mode 100644
index ca8e674f714..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_two_stage_with_qos test
-#
-
-MAKEFILES = receiver.bor sender.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.bor
deleted file mode 100644
index 3fdb1998906..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the avstreams simple_two_stage_with_qos test
-#
-
-NAME = receiver
-
-OBJFILES = \
- $(OBJDIR)\receiver.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.bor b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.bor
deleted file mode 100644
index e7a2861c3e1..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the avstreams simple_two_stage_with_qos test
-#
-
-NAME = sender
-
-OBJFILES = \
- $(OBJDIR)\sender.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(ACE_QOS_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_AV_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(ACE_QOS_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_AV_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.Bug_1393_Client.bor b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.Bug_1393_Client.bor
deleted file mode 100644
index 1ec63049cc8..00000000000
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.Bug_1393_Client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-# Makefile for building the client exe with Borland C++ Builder
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\client.obj
-
-EXTERNAL_LIBS =
-
-LFLAGS = \
- -L..\..\..\tao\IFR_Client\$(CONFIG_SUBDIR) -L..\..\..\tao\IFR_Client \
- -L..\..\..\tao\$(CONFIG_SUBDIR) -L..\..\..\tao \
- -L..\..\..\..\ace\$(CONFIG_SUBDIR) -L..\..\..\..\ace \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_IFR_Client$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
- $(EXTERNAL_LIBS)
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS=1 -DACE_AS_STATIC_LIBS=1
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- -I..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.bor b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.bor
deleted file mode 100644
index 3a768e25049..00000000000
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.bor
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Bug_1393_Client.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Bug_1393_Client.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Bug_1393_Client.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Bug_1393_Client.bor install
-
-regenerate:
- perl E:\worcvs\tao13\bin\mwc.pl -type bor
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.bor b/TAO/orbsvcs/tests/Concurrency/CC_client.bor
deleted file mode 100644
index 76ddb26428e..00000000000
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the concurrency test
-#
-
-NAME = CC_client
-
-OBJFILES = \
- $(OBJDIR)\CC_client.obj \
- $(OBJDIR)\CC_tests.obj \
- $(OBJDIR)\CC_naming_service.obj \
- $(OBJDIR)\tmplinst.obj \
- $(OBJDIR)\CC_command.tab.obj \
- $(OBJDIR)\lex.CC_command.obj \
- $(OBJDIR)\CC_command.obj \
- $(OBJDIR)\CC_test_utils.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_CONCURRENCY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_CONCURRENCY_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.bor b/TAO/orbsvcs/tests/Concurrency/Makefile.bor
deleted file mode 100644
index 7a069935d50..00000000000
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the Concurrency test
-#
-
-MAKEFILES = CC_client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.bor b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.bor
deleted file mode 100644
index 783ba641a6e..00000000000
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs basic cosevent flags
-#
-
-NAMES = \
- Disconnect \
- MT_Disconnect \
- Pull_Push_Event \
- Push_Event \
- Random \
- Shutdown
-
-OBJFILES = $(OBJDIR)\$(NAME).obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_COSEVENT_CECTEST_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_COSEVENT_CECTEST_LIB) \
- $(TAO_MESSAGING_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.bor b/TAO/orbsvcs/tests/CosEvent/Makefile.bor
deleted file mode 100644
index 218acb5d0a8..00000000000
--- a/TAO/orbsvcs/tests/CosEvent/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO cosevent tests
-# $Id$
-#
-
-DIRS = \
- lib \
- Basic
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.bor b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.bor
deleted file mode 100644
index f3c87c29e25..00000000000
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the CECTest
-#
-
-NAME = CECTest
-
-OBJFILES = \
- $(OBJDIR)\Counting_Consumer.obj \
- $(OBJDIR)\Counting_Supplier.obj
-
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_COSEVENT_CECTEST_CFLAGS) \
- -DCEC_TEST_BUILD_DLL
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor
deleted file mode 100644
index 2d1715bffb5..00000000000
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECM_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\dataC.obj \
- $(OBJDIR)\dataS.obj \
- $(OBJDIR)\ECM_Data.obj \
- $(OBJDIR)\ECM_Consumer.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\data.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\dataS.cpp $(IDLDIR)\dataC.cpp: $(IDLDIR)\data.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor
deleted file mode 100644
index 6cd2e48b161..00000000000
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECM_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\dataC.obj \
- $(OBJDIR)\dataS.obj \
- $(OBJDIR)\ECM_Data.obj \
- $(OBJDIR)\ECM_Supplier.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\data.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\dataS.cpp $(IDLDIR)\dataC.cpp: $(IDLDIR)\data.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.bor b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.bor
deleted file mode 100644
index 002267cd547..00000000000
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- ECM_Supplier.bor \
- ECM_Consumer.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.bor b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.bor
deleted file mode 100644
index b96e0f71cd8..00000000000
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = MCast
-
-OBJFILES = \
- $(OBJDIR)\MCast.obj \
- $(OBJDIR)\Consumer.obj \
- $(OBJDIR)\Supplier.obj \
- $(OBJDIR)\AddrServer.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor b/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor
deleted file mode 100644
index d2b7cbf495a..00000000000
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-
-NAME = EC_Mcast
-
-OBJFILES = \
- $(OBJDIR)\EC_Mcast.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.bor b/TAO/orbsvcs/tests/EC_Multiple/Makefile.bor
deleted file mode 100644
index d2747debb0a..00000000000
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-
-NAME = EC_Multiple
-
-OBJFILES = \
- $(OBJDIR)\EC_Multiple.obj
-
-CFLAGS = \
- $(TAO_RTOLDEVENT_CFLAGS) \
- $(TAO_RTSCHEDEVENT_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTOLDEVENT_LIB) \
- $(TAO_RTSCHEDEVENT_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor
deleted file mode 100644
index d520daa653c..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECT_Consumer
-
-OBJFILES = \
- $(OBJDIR)\ECT_Consumer.obj \
- $(OBJDIR)\ECT_Consumer_Driver.obj \
- $(OBJDIR)\ECT_Driver.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor
deleted file mode 100644
index 0e96b0dc7c7..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECT_Supplier
-
-OBJFILES = \
- $(OBJDIR)\ECT_Supplier.obj \
- $(OBJDIR)\ECT_Supplier_Driver.obj \
- $(OBJDIR)\ECT_Driver.obj
-
-CFLAGS = \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor
deleted file mode 100644
index 03e2c891732..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECT_Throughput
-
-OBJFILES = \
- $(OBJDIR)\ECT_Throughput.obj \
- $(OBJDIR)\ECT_Consumer.obj \
- $(OBJDIR)\ECT_Supplier.obj \
- $(OBJDIR)\ECT_Driver.obj
-
-CFLAGS = \
- $(TAO_RTOLDEVENT_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTOLDEVENT_LIB) \
- $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.bor b/TAO/orbsvcs/tests/EC_Throughput/Makefile.bor
deleted file mode 100644
index f235eca15d4..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- ECT_Throughput.bor \
- ECT_Supplier.bor \
- ECT_Consumer.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor
deleted file mode 100644
index 086d4d7f638..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Atomic_Reconnect
-
-OBJFILES = $(OBJDIR)\Atomic_Reconnect.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.bor b/TAO/orbsvcs/tests/Event/Basic/BCast.bor
deleted file mode 100644
index 4d7dd5f70e1..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = BCast
-
-OBJFILES = $(OBJDIR)\BCast.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor b/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor
deleted file mode 100644
index d2937c735c7..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Bitmask
-
-OBJFILES = $(OBJDIR)\Bitmask.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.bor b/TAO/orbsvcs/tests/Event/Basic/Complex.bor
deleted file mode 100644
index 1e751550824..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Complex
-
-OBJFILES = $(OBJDIR)\Complex.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.bor b/TAO/orbsvcs/tests/Event/Basic/Control.bor
deleted file mode 100644
index 69856c072b8..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Control.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Control
-
-OBJFILES = $(OBJDIR)\Control.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor
deleted file mode 100644
index 513efa8717b..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Disconnect
-
-OBJFILES = $(OBJDIR)\Disconnect.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor b/TAO/orbsvcs/tests/Event/Basic/Gateway.bor
deleted file mode 100644
index 940ff043d3b..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Gateway
-
-OBJFILES = $(OBJDIR)\Gateway.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor
deleted file mode 100644
index c0d26d5c3b8..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = MT_Disconnect
-
-OBJFILES = $(OBJDIR)\MT_Disconnect.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.bor b/TAO/orbsvcs/tests/Event/Basic/Makefile.bor
deleted file mode 100644
index 7151f4539ee..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.bor
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = Reconnect.bor \
- Shutdown.bor \
- Observer.bor \
- BCast.bor \
- Timeout.bor \
- Wildcard.bor \
- Negation.bor \
- Disconnect.bor \
- MT_Disconnect.bor \
- Atomic_Reconnect.bor \
- Bitmask.bor \
- Complex.bor \
- Gateway.bor \
- Control.bor \
- Random.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.bor b/TAO/orbsvcs/tests/Event/Basic/Negation.bor
deleted file mode 100644
index 8cc3ce7ab82..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Negation
-
-OBJFILES = $(OBJDIR)\Negation.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.bor b/TAO/orbsvcs/tests/Event/Basic/Observer.bor
deleted file mode 100644
index fe685126fc5..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Observer
-
-OBJFILES = $(OBJDIR)\Observer.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.bor b/TAO/orbsvcs/tests/Event/Basic/Random.bor
deleted file mode 100644
index 52f627225fc..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Random.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Random
-
-OBJFILES = $(OBJDIR)\Random.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor
deleted file mode 100644
index 847ab11b19e..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Reconnect
-
-OBJFILES = $(OBJDIR)\Reconnect.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor b/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor
deleted file mode 100644
index 0ff8c07f9ba..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Shutdown
-
-OBJFILES = $(OBJDIR)\Shutdown.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor b/TAO/orbsvcs/tests/Event/Basic/Timeout.bor
deleted file mode 100644
index e54e0111f63..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Timeout
-
-OBJFILES = $(OBJDIR)\Timeout.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor b/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor
deleted file mode 100644
index 1a2b82b7141..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Wildcard
-
-OBJFILES = $(OBJDIR)\Wildcard.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Makefile.bor b/TAO/orbsvcs/tests/Event/Makefile.bor
deleted file mode 100644
index 652f205bffc..00000000000
--- a/TAO/orbsvcs/tests/Event/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-DIRS = \
- lib \
- Basic \
- Performance
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.bor b/TAO/orbsvcs/tests/Event/Performance/Connect.bor
deleted file mode 100644
index 4490c19a289..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Connect
-
-OBJFILES = $(OBJDIR)\Connect.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.bor b/TAO/orbsvcs/tests/Event/Performance/Inversion.bor
deleted file mode 100644
index fdb37c3e302..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Inversion
-
-OBJFILES = $(OBJDIR)\Inversion.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.bor b/TAO/orbsvcs/tests/Event/Performance/Latency.bor
deleted file mode 100644
index e4a9ad1c624..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Latency
-
-OBJFILES = $(OBJDIR)\Latency.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor
deleted file mode 100644
index 5cce2ff3949..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Latency_Server
-
-OBJFILES = $(OBJDIR)\Latency_Server.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.bor b/TAO/orbsvcs/tests/Event/Performance/Makefile.bor
deleted file mode 100644
index 7b0ae6a6c06..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- Throughput.bor \
- Connect.bor \
- Inversion.bor \
- Latency.bor \
- Latency_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.bor b/TAO/orbsvcs/tests/Event/Performance/Throughput.bor
deleted file mode 100644
index c42b83b59bb..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Throughput
-
-OBJFILES = $(OBJDIR)\Throughput.obj
-
-CFLAGS = \
- $(TAO_RTEVENT_TEST_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_CFLAGS) \
- $(ACE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(TAO_RTEVENT_TEST_LIB) \
- $(TAO_RTEVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.bor b/TAO/orbsvcs/tests/Event/lib/Makefile.bor
deleted file mode 100644
index 429e2a73605..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = ECTests
-
-OBJFILES = \
- $(OBJDIR)\Driver.obj \
- $(OBJDIR)\Consumer.obj \
- $(OBJDIR)\Supplier.obj \
- $(OBJDIR)\Counting_Consumer.obj \
- $(OBJDIR)\Counting_Supplier.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) \
- -DEC_TEST_BUILD_DLL
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTEVENT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.bor b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.bor
deleted file mode 100644
index 3722085d553..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the GroupRef_Manipulation test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor
deleted file mode 100644
index 925661a514d..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the GroupRef_Manipulation test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\testC.obj
-
-LFLAGS = \
- -j..\..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\..\lib \
- -L..\..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_IORManip$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
- $(TAO_FTORB_UTILS_LIB) \
- $(TAO_FT_CLIENTORB_LIB) \
- $(TAO_FT_SERVERORB_LIB)
-
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- -I..\..\..\..\orbsvcs \
- -I..\..\..\.. \
- -I..\..\..\..\tao \
- -I..\..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS) \
- $(TAO_FTORB_UTILS_CFLAGS) \
- $(TAO_FT_CLIENTORB_CFLAGS) \
- $(TAO_FT_SERVERORB_CFLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- testC.h \
- testS_T.h \
- testS_T.cpp \
- testC.i \
- testS_T.i \
- test.idl
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) -Gv -DCORBA3 -I..\..\..\.. -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor
deleted file mode 100644
index c0af5e9a570..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the GroupRef_Manipulation test client
-#
-
-NAME = server
-
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Server_ORBInitializer.obj \
- $(OBJDIR)\Server_Request_Interceptor.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj
-
-LFLAGS = \
- -j..\..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\..\lib \
- -L..\..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_FTORB_UTILS_LIB) \
- $(TAO_FT_CLIENTORB_LIB) \
- $(TAO_FT_SERVERORB_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_FTORB_UTILS_CFLAGS) \
- $(TAO_FT_CLIENTORB_CFLAGS) \
- $(TAO_FT_SERVERORB_CFLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- Server_ORBInitializer.h \
- Server_Request_Interceptor.h \
- testC.h \
- testS.h \
- testS_T.h \
- test_i.h \
- testS_T.cpp \
- testC.i \
- testS.i \
- testS_T.i \
- test.idl
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) -Gv -DCORBA3 -I..\..\..\.. -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
-
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.bor b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.bor
deleted file mode 100644
index a2c7d3923b7..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOGR tests
-#
-
-MAKEFILES = Manager.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.bor b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.bor
deleted file mode 100644
index 0c518e0824a..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.bor
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOGR tests
-#
-
-NAME = Manager
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I$(ACE_ROOT)\TAO -Ge 1
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_FTORB_UTILS_CFLAGS) \
- $(TAO_FT_CLIENTORB_CFLAGS) \
- $(TAO_FT_SERVERORB_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_FTORB_UTILS_LIB) \
- $(TAO_FT_CLIENTORB_LIB) \
- $(TAO_FT_SERVERORB_LIB) \
- $(TAO_MESSAGING_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.bor b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.bor
deleted file mode 100644
index 7e657631b4a..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOGR tests
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
- -I$(ACE_ROOT)\TAO -Ge 1
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_FTORB_CFLAGS)
-
-CPPDIR = .;FaultTolerance
-
-IDLDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_FTORB_LIB)
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.bor b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.bor
deleted file mode 100644
index 946bfe0efaf..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOGRManipulation executable
-#
-
-NAME = IOGRTest
-
-OBJFILES = $(OBJDIR)\IOGRTest.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_FTORB_UTILS_CFLAGS) \
- $(TAO_FT_CLIENTORB_CFLAGS) \
- $(TAO_FT_SERVERORB_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_FTORB_UTILS_LIB) \
- $(TAO_FT_CLIENTORB_LIB) \
- $(TAO_FT_SERVERORB_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor b/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor
deleted file mode 100644
index dd0e66d0f91..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the TAO obsvcs examples
-#
-
-DIRS = \
- IOGR \
- IOGRManipulation \
- GroupRef_Manipulation
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor b/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor
deleted file mode 100644
index 1df4e7805c1..00000000000
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOR_MCast test
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.bor b/TAO/orbsvcs/tests/IOR_MCast/client.bor
deleted file mode 100644
index 018b7c21151..00000000000
--- a/TAO/orbsvcs/tests/IOR_MCast/client.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOR_MCast test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MCastC.obj \
- $(OBJDIR)\MCastS.obj \
- $(OBJDIR)\ior_mcast_client_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\MCast.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MCastC.cpp $(IDLDIR)\MCastS.cpp: $(IDLDIR)\MCast.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.bor b/TAO/orbsvcs/tests/IOR_MCast/server.bor
deleted file mode 100644
index e890e7c096a..00000000000
--- a/TAO/orbsvcs/tests/IOR_MCast/server.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-#
-# Makefile for building the IOR_MCast test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MCastC.obj \
- $(OBJDIR)\MCastS.obj \
- $(OBJDIR)\MCast_Server_i.obj \
- $(OBJDIR)\server_i.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\MCast.idl
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MCastC.cpp $(IDLDIR)\MCastS.cpp: $(IDLDIR)\MCast.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor
deleted file mode 100644
index 023db1b5e68..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\LB_server.obj \
- $(OBJDIR)\Basic.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_COSLOADBALANCING_LIB) \
- $(TAO_VALUETYPE_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/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.bor
deleted file mode 100644
index 1032fa25489..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.bor
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\LB_server.obj \
- $(OBJDIR)\Simple.obj \
- $(OBJDIR)\Factory.obj \
- $(OBJDIR)\Factory_Map.obj \
- $(OBJDIR)\Factory_Struct.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_COSLOADBALANCING_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/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor
deleted file mode 100644
index 56addcbfaa1..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for building the TAO Load Balancer GenericFactory tests
-#
-# $Id$
-#
-
-
-DIRS = \
- Application_Controlled \
- Infrastructure_Controlled \
- Manage_Object_Group
-
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.bor
deleted file mode 100644
index aa9e793bc26..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.bor
deleted file mode 100644
index 0c35c228514..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\LB_server.obj \
- $(OBJDIR)\Basic.obj \
- $(OBJDIR)\Simple.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_COSLOADBALANCING_LIB) \
- $(TAO_VALUETYPE_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/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.bor
deleted file mode 100644
index eee7c0fe462..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Makefile for building the CPU load monitor test client executable
-#
-# $Id$
-#
-
-!ifndef MINIMUM_CORBA
-NAME = client
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_PORTABLEGROUP_CFLAGS) \
- $(TAO_COSLOADBALANCING_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_PORTABLEGROUP_LIB) \
- $(TAO_COSLOADBALANCING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_IORMANIP_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.bor
deleted file mode 100644
index 51fb5aa2254..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for building the TAO Load Monitor tests
-#
-# $Id$
-#
-
-
-DIRS = \
- CPU
-
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor
deleted file mode 100644
index 1bae18dc4de..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for building the TAO Load Balancer tests
-#
-# $Id$
-#
-
-
-DIRS = \
- GenericFactory \
- LoadMonitor
-
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.bor b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.bor
deleted file mode 100644
index 7ced06afc8e..00000000000
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for building the Basic_Log_Test client executable
-# $Id$
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\Basic_Log_Test.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_LOG_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_LOG_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Log/Makefile.bor b/TAO/orbsvcs/tests/Log/Makefile.bor
deleted file mode 100644
index 29eeb10f7c5..00000000000
--- a/TAO/orbsvcs/tests/Log/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building the Log tests
-# $Id$
-#
-
-DIRS = \
- Basic_Log_Test
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Makefile.bor b/TAO/orbsvcs/tests/Makefile.bor
deleted file mode 100644
index 4307997c7f7..00000000000
--- a/TAO/orbsvcs/tests/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for building the TAO orbsvcs tests
-# $Id$
-#
-
-DIRS = \
- AVStreams \
- Bug_1393_Regression \
- Concurrency \
- CosEvent \
- FaultTolerance \
- Event \
- EC_Throughput \
- EC_Multiple \
- EC_Mcast \
- EC_MT_Mcast \
- EC_Custom_Marshal \
- ior_corbaname \
- IOR_MCast \
- LoadBalancing \
- Miop \
- Notify \
- Property \
- Security \
- Simple_Naming \
- Redundant_Naming \
- Time \
- Trading \
- Log \
- RTCosScheduling
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Miop/Makefile.bor b/TAO/orbsvcs/tests/Miop/Makefile.bor
deleted file mode 100644
index 1ac322c2fa5..00000000000
--- a/TAO/orbsvcs/tests/Miop/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building the TAO Miop obsvcs tests
-# $Id$
-#
-
-DIRS = \
- McastHello
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.bor b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.bor b/TAO/orbsvcs/tests/Miop/McastHello/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/orbsvcs/tests/Miop/McastHello/server.bor b/TAO/orbsvcs/tests/Miop/McastHello/server.bor
deleted file mode 100644
index 0a40a9c7279..00000000000
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\McastHello.obj \
- $(OBJDIR)\server.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/orbsvcs/tests/Notify/Basic/Makefile.bor b/TAO/orbsvcs/tests/Notify/Basic/Makefile.bor
deleted file mode 100644
index 11ffedd9f3e..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs basic notify tests
-#
-
-NAMES = \
- AdminProperties \
- ConnectDisconnect \
- Events \
- IdAssignment \
- LifeCycle \
- Simple \
- Updates \
- MultiTypes \
- Filter \
- Sequence
-
-OBJFILES = $(OBJDIR)\$(NAME).obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.bor b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.bor
deleted file mode 100644
index aea60f62fc2..00000000000
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify Blocking test
-# $Id$
-#
-
-MAKEFILES = \
- Structured_Consumer.bor \
- Structured_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.bor
deleted file mode 100644
index 2147641bdd5..00000000000
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Blocking structured_consumer test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Structured_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.bor
deleted file mode 100644
index 04fc6c71b49..00000000000
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Blocking structured_supplier test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.bor b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.bor
deleted file mode 100644
index 635e94008c7..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for building the TAO Notify Discarding test
-# $Id$
-#
-
-MAKEFILES = \
- Sequence_Consumer.bor \
- Sequence_Supplier.bor \
- Structured_Consumer.bor \
- Structured_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.bor
deleted file mode 100644
index dcbb5b39eb0..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Discarding sequence_consumer test
-#
-
-NAME = Sequence_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
- $(OBJDIR)\Sequence_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.bor
deleted file mode 100644
index 613e4d3a244..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Discarding sequence_supplier test
-#
-
-NAME = Sequence_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.bor
deleted file mode 100644
index 7c746cfed23..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Discarding structured_consumer test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Structured_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.bor
deleted file mode 100644
index 39f6112628a..00000000000
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Discarding structured_supplier test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.bor b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.bor
deleted file mode 100644
index f43f302a943..00000000000
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify MT_Dispatching test
-# $Id$
-#
-
-MAKEFILES = \
- Structured_Consumer.bor \
- Structured_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.bor
deleted file mode 100644
index 001b2440b33..00000000000
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify MT_Dispatching structured_consumer test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Structured_Push_Consumer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.bor
deleted file mode 100644
index 573aa8c2b69..00000000000
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify MT_Dispatching structured_supplier test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Supplier.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Makefile.bor b/TAO/orbsvcs/tests/Notify/Makefile.bor
deleted file mode 100644
index 40bd1a3ecb5..00000000000
--- a/TAO/orbsvcs/tests/Notify/Makefile.bor
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Makefile for building the TAO Notify tests
-# $Id$
-#
-
-DIRS = \
- lib \
- Basic \
- Blocking \
- Discarding \
- MT_Dispatching \
- Ordering \
- performance-tests \
- Sequence_Multi_ETCL_Filter \
- Sequence_Multi_Filter \
- Structured_Filter \
- Structured_Multi_Filter \
- RT_lib \
- Test_Filter
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.bor b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.bor
deleted file mode 100644
index 38b6bb44700..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for building the TAO Notify Ordering test
-# $Id$
-#
-
-MAKEFILES = \
- Sequence_Consumer.bor \
- Sequence_Supplier.bor \
- Structured_Consumer.bor \
- Structured_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.bor
deleted file mode 100644
index 709fe92be8a..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify ordering sequence_consumer test
-#
-
-NAME = Sequence_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
- $(OBJDIR)\Sequence_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.bor
deleted file mode 100644
index f922bcafd7a..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify ordering sequence_supplier test
-#
-
-NAME = Sequence_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.bor
deleted file mode 100644
index 3bdd401ca49..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify ordering structured_consumer test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Structured_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.bor
deleted file mode 100644
index 22e22452461..00000000000
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify ordering structured_supplier test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.bor b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.bor
deleted file mode 100644
index 73d4a9bc0b8..00000000000
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.bor
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id$
-# Makefile for building the TAO_RT_NotifyTests library with Borland C++ Builder
-
-NAME = TAO_RT_NotifyTests
-
-OBJFILES = \
- $(OBJDIR)\RT_Application_Command.obj \
- $(OBJDIR)\RT_Factories_Define.obj \
- $(OBJDIR)\RT_POA_Command.obj \
- $(OBJDIR)\RT_Priority_Mapping.obj
-
-EXTERNAL_LIBS =
-
-LFLAGS = \
- -j$(TAO_ROOT)\tao\PortableServer\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao\PortableServer \
- -L$(TAO_ROOT)\tao\PortableServer\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao\PortableServer \
- -j$(TAO_ROOT)\tao\DynamicAny\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao\DynamicAny \
- -L$(TAO_ROOT)\tao\DynamicAny\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao\DynamicAny \
- -j$(TAO_ROOT)\tao\IORTable\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao\IORTable \
- -L$(TAO_ROOT)\tao\IORTable\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao\IORTable \
- -j$(TAO_ROOT)\orbsvcs\orbsvcs\ETCL\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\orbsvcs\orbsvcs\ETCL \
- -L$(TAO_ROOT)\orbsvcs\orbsvcs\ETCL\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\orbsvcs\orbsvcs\ETCL \
- -j$(TAO_ROOT)\tao\RTPortableServer\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao\RTPortableServer \
- -L$(TAO_ROOT)\tao\RTPortableServer\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao\RTPortableServer \
- -j$(TAO_ROOT)\tao\RTCORBA\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao\RTCORBA \
- -L$(TAO_ROOT)\tao\RTCORBA\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao\RTCORBA \
- -j$(TAO_ROOT)\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\orbsvcs\orbsvcs \
- -L$(TAO_ROOT)\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\orbsvcs\orbsvcs \
- -j$(TAO_ROOT)\tao\$(CONFIG_SUBDIR) -j$(TAO_ROOT)\tao \
- -L$(TAO_ROOT)\tao\$(CONFIG_SUBDIR) -L$(TAO_ROOT)\tao \
- -j$(ACE_ROOT)\ace\$(CONFIG_SUBDIR) -j$(ACE_ROOT)\ace \
- -L$(ACE_ROOT)\ace\$(CONFIG_SUBDIR) -L$(ACE_ROOT)\ace \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_NotifyTests$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_CosNotification$(LIB_DECORATOR).lib \
- TAO_ETCL$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(LIB_DECORATOR).lib \
- TAO_DynamicAny$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
- $(EXTERNAL_LIBS)
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS=1 -DACE_AS_STATIC_LIBS=1
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_RT_NOTIFY_TEST_BUILD_DLL=1
-!endif
-
-CFLAGS = \
- -I$(TAO_ROOT)\orbsvcs \
- -I$(TAO_ROOT) \
- -I$(TAO_ROOT)\tao \
- -I$(ACE_ROOT) \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-INCLUDES = \
- RT_Application_Command.h \
- RT_POA_Command.h \
- RT_Priority_Mapping.h
-
-BASE_BINDIR = $(ACE_ROOT)\bin
-
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.bor
deleted file mode 100644
index f66ec4402a9..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify Sequence_Multi_ETCL_Filter test
-# $Id$
-#
-
-MAKEFILES = \
- Sequence_Consumer.bor \
- Sequence_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.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
deleted file mode 100644
index 55d9a0a9340..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.bor
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Sequence_Multi_ETCL_Filter
-# Sequence_Consumer test
-#
-
-NAME = Sequence_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Consumer.obj \
- $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_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
deleted file mode 100644
index eec5e81ee16..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Sequence_Multi_ETCL_Filter
-# Sequence_Supplier test
-#
-
-NAME = Sequence_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.bor
deleted file mode 100644
index d4bbab60c18..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify Sequence_Multi_Filter test
-# $Id$
-#
-
-MAKEFILES = \
- Sequence_Consumer.bor \
- Sequence_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor
deleted file mode 100644
index d7371c02756..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.bor
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Sequence_Multi_Filter
-# Sequence_Consumer test
-#
-
-NAME = Sequence_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Consumer.obj \
- $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_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
deleted file mode 100644
index 3229436ca97..00000000000
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Sequence_Multi_Filter
-# Sequence_Supplier test
-#
-
-NAME = Sequence_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.bor
deleted file mode 100644
index b740fcd51a2..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify Structured_Filter test
-# $Id$
-#
-
-MAKEFILES = \
- Structured_Filter_Consumer.bor \
- Structured_Filter_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
deleted file mode 100644
index 706f64b47ed..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Consumer.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Structured_Filter constumer test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\controlC.obj \
- $(OBJDIR)\controlS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Push_Consumer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\control.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\controlS.cpp $(IDLDIR)\controlC.cpp: $(IDLDIR)\control.idl
- $(TAO_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
deleted file mode 100644
index 3f6a14cc38d..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Filter_Supplier.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Structured_Filter supplier test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\controlC.obj \
- $(OBJDIR)\controlS.obj \
- $(OBJDIR)\Structured_Supplier.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\control.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\controlS.cpp $(IDLDIR)\controlC.cpp: $(IDLDIR)\control.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.bor
deleted file mode 100644
index d5b53a73076..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the TAO Notify Structured_Multi_Filter test
-# $Id$
-#
-
-MAKEFILES = \
- Structured_Filter_Consumer.bor \
- Structured_Filter_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
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
deleted file mode 100644
index d11f0b9c0b4..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Consumer.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Structured_Multi_Filter constumer
-# test
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\controlC.obj \
- $(OBJDIR)\controlS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Push_Consumer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\control.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\controlS.cpp $(IDLDIR)\controlC.cpp: $(IDLDIR)\control.idl
- $(TAO_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
deleted file mode 100644
index 2192a8e44d2..00000000000
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Filter_Supplier.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Structured_Multi_Filter supplier
-# test
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\controlC.obj \
- $(OBJDIR)\controlS.obj \
- $(OBJDIR)\Notify_Push_Supplier.obj \
- $(OBJDIR)\Structured_Supplier.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\control.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\controlS.cpp $(IDLDIR)\controlC.cpp: $(IDLDIR)\control.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.bor
deleted file mode 100644
index 53193ce79f2..00000000000
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile.bor
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id$
-# Makefile for building the TAO_RT_NotifyTests_Filter library with Borland C++ Builder
-
-NAME = TAO_RT_NotifyTests_Filter
-
-OBJFILES = \
- $(OBJDIR)\RT_Test_Filter.obj \
- $(OBJDIR)\RT_Test_FilterFactory.obj
-
-EXTERNAL_LIBS =
-
-LFLAGS = \
- -j..\..\..\..\tao\RTCORBA\$(CONFIG_SUBDIR) -j..\..\..\..\tao\RTCORBA \
- -L..\..\..\..\tao\RTCORBA\$(CONFIG_SUBDIR) -L..\..\..\..\tao\RTCORBA \
- -j..\..\..\..\tao\IORTable\$(CONFIG_SUBDIR) -j..\..\..\..\tao\IORTable \
- -L..\..\..\..\tao\IORTable\$(CONFIG_SUBDIR) -L..\..\..\..\tao\IORTable \
- -j..\..\..\..\tao\PortableServer\$(CONFIG_SUBDIR) -j..\..\..\..\tao\PortableServer \
- -L..\..\..\..\tao\PortableServer\$(CONFIG_SUBDIR) -L..\..\..\..\tao\PortableServer \
- -j..\..\..\..\tao\DynamicAny\$(CONFIG_SUBDIR) -j..\..\..\..\tao\DynamicAny \
- -L..\..\..\..\tao\DynamicAny\$(CONFIG_SUBDIR) -L..\..\..\..\tao\DynamicAny \
- -j..\..\..\..\orbsvcs\orbsvcs\ETCL\$(CONFIG_SUBDIR) -j..\..\..\..\orbsvcs\orbsvcs\ETCL \
- -L..\..\..\..\orbsvcs\orbsvcs\ETCL\$(CONFIG_SUBDIR) -L..\..\..\..\orbsvcs\orbsvcs\ETCL \
- -j..\..\..\..\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -j..\..\..\..\orbsvcs\orbsvcs \
- -L..\..\..\..\orbsvcs\orbsvcs\$(CONFIG_SUBDIR) -L..\..\..\..\orbsvcs\orbsvcs \
- -j..\..\..\..\tao\$(CONFIG_SUBDIR) -j..\..\..\..\tao \
- -L..\..\..\..\tao\$(CONFIG_SUBDIR) -L..\..\..\..\tao \
- -j..\..\..\..\..\ace\$(CONFIG_SUBDIR) -j..\..\..\..\..\ace \
- -L..\..\..\..\..\ace\$(CONFIG_SUBDIR) -L..\..\..\..\..\ace \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_CosNotification$(LIB_DECORATOR).lib \
- TAO_ETCL$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(LIB_DECORATOR).lib \
- TAO_DynamicAny$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
- $(EXTERNAL_LIBS)
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS=1 -DACE_AS_STATIC_LIBS=1
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS = -DTAO_RT_Test_Filter_BUILD_DLL=1
-!endif
-
-CFLAGS = \
- -I..\..\..\..\orbsvcs \
- -I..\..\..\.. \
- -I..\..\..\..\tao \
- -I..\..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-INCLUDES = \
- RT_Test_Filter.h \
- RT_Test_FilterFactory.h
-
-BASE_BINDIR = ..\..\..\..\..\bin
-
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor b/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
deleted file mode 100644
index 3a9b30bb141..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.bor
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id$#
-# Makefile for building the Notify test library
-#
-
-NAME = TAO_NotifyTests
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Direct_Consumer.obj \
- $(OBJDIR)\Direct_Supplier.obj \
- $(OBJDIR)\Relay_Consumer.obj \
- $(OBJDIR)\Peer.obj \
- $(OBJDIR)\StructuredPushConsumer.obj \
- $(OBJDIR)\SequencePushConsumer.obj \
- $(OBJDIR)\PushConsumer.obj \
- $(OBJDIR)\StructuredPushSupplier.obj \
- $(OBJDIR)\SequencePushSupplier.obj \
- $(OBJDIR)\PushSupplier.obj \
- $(OBJDIR)\Activation_ManagerC.obj \
- $(OBJDIR)\Activation_ManagerS.obj \
- $(OBJDIR)\Activation_Manager.obj \
- $(OBJDIR)\Application_Command.obj \
- $(OBJDIR)\Command.obj \
- $(OBJDIR)\Command_Builder.obj \
- $(OBJDIR)\Command_Factory.obj \
- $(OBJDIR)\ConsumerAdmin_Command.obj \
- $(OBJDIR)\Driver.obj \
- $(OBJDIR)\EventChannel_Command.obj \
- $(OBJDIR)\Factories_Define.obj \
- $(OBJDIR)\Filter_Command.obj \
- $(OBJDIR)\LookupManager.obj \
- $(OBJDIR)\Name.obj \
- $(OBJDIR)\Notify_Test_Client.obj \
- $(OBJDIR)\Options_Parser.obj \
- $(OBJDIR)\Periodic_Consumer.obj \
- $(OBJDIR)\Periodic_Consumer_Command.obj \
- $(OBJDIR)\Periodic_Supplier.obj \
- $(OBJDIR)\Periodic_Supplier_Command.obj \
- $(OBJDIR)\Priority_Mapping.obj \
- $(OBJDIR)\StructuredEvent.obj \
- $(OBJDIR)\SupplierAdmin_Command.obj \
- $(OBJDIR)\Task_Stats.obj
-
-EXTERNAL_LIBS = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_DYNAMICANY_LIB)
-
-LFLAGS = \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- $(EXTERNAL_LIBS)
-
-IDLFILES = \
- $(IDLDIR)\Activation_Manager.idl
-
-!ifdef STATIC
-LIB_FLAGS =
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- -DTAO_NOTIFY_TEST_BUILD_DLL
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- Activation_Manager.h \
- Activation_ManagerC.h \
- Activation_ManagerS.h \
- Application_Command.h \
- Command.h \
- Command_Builder.h \
- Command_Factory.h \
- Command_Factory_T.h \
- ConsumerAdmin_Command.h \
- Driver.h \
- Driver_Base.h \
- EventChannel_Command.h \
- Factories_Define.h \
- Filter_Command.h \
- LookupManager.h \
- Name.h \
- Notify_PushConsumer.h \
- Notify_PushSupplier.h \
- Notify_SequencePushConsumer.h \
- Notify_SequencePushSupplier.h \
- Notify_StructuredPushConsumer.h \
- Notify_StructuredPushSupplier.h \
- Notify_Test_Client.h \
- Options_Parser.h \
- Periodic_Consumer.h \
- Periodic_Consumer_Command.h \
- Periodic_Supplier.h \
- Periodic_Supplier_Command.h \
- Priority_Mapping.h \
- StructuredEvent.h \
- SupplierAdmin_Command.h \
- Task_Callback.h \
- Task_Stats.h \
- notify_test_export.h \
- Command_Factory_T.cpp \
- Activation_ManagerC.i \
- Activation_ManagerS.i \
- Task_Stats.inl \
- Activation_Manager.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-all: idl_src_files
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\Activation_ManagerS.cpp $(IDLDIR)\Activation_ManagerC.cpp: $(IDLDIR)\Activation_Manager.idl
- $(TAO_IDL) -Sc $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor
deleted file mode 100644
index 90fc09d919a..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for building the TAO Notify filter performance-tests
-# $Id$
-#
-
-MAKEFILES = \
- Sequence_Consumer.bor \
- Sequence_Supplier.bor \
- Structured_Consumer.bor \
- Structured_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor
deleted file mode 100644
index 1c8f1ec9c2f..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify filter sequence_consumer
-# performance-tests
-#
-
-NAME = Sequence_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
- $(OBJDIR)\Sequence_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor
deleted file mode 100644
index 1ec1fbcde19..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify filter sequence_supplier
-# performance-tests
-#
-
-NAME = Sequence_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Sequence_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor
deleted file mode 100644
index 2af077b921c..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify filter structured_consumer
-# performance-tests
-#
-
-NAME = Structured_Consumer
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Consumer.obj \
- $(OBJDIR)\Notify_Structured_Push_Consumer.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor
deleted file mode 100644
index 00369132fe4..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify filter structured_supplier
-# performance-tests
-#
-
-NAME = Structured_Supplier
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\goC.obj \
- $(OBJDIR)\goS.obj \
- $(OBJDIR)\Structured_Supplier.obj \
- $(OBJDIR)\common.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\go.idl
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor
deleted file mode 100644
index 480df86bbef..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for building the TAO Notify performance-tests
-# $Id$
-#
-
-DIRS = \
- Filter \
- RedGreen \
- Throughput
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.bor
deleted file mode 100644
index 2a876d46f62..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify redgreen performance-tests
-#
-
-NAME = RedGreen_Test
-
-OBJFILES = \
- $(OBJDIR)\RedGreen_Test.obj \
- $(OBJDIR)\main.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_MESSAGING_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor
deleted file mode 100644
index fa9e734ee24..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-# Makefile for building the orbsvcs notify Throughput performance-tests
-#
-
-NAME = Throughput
-
-OBJFILES = \
- $(OBJDIR)\Throughput.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_EVENT_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ETCL_CFLAGS) \
- $(TAO_NOTIFY_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_NOTIFYTESTS_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS)
-
-CPPDIR = .
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_EVENT_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ETCL_LIB) \
- $(TAO_NOTIFY_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_NOTIFYTESTS_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_DYNAMICANY_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Property/Makefile.bor b/TAO/orbsvcs/tests/Property/Makefile.bor
deleted file mode 100644
index 0c0562df7ad..00000000000
--- a/TAO/orbsvcs/tests/Property/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the property test
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/Property/client.bor b/TAO/orbsvcs/tests/Property/client.bor
deleted file mode 100644
index 710dd87f6c0..00000000000
--- a/TAO/orbsvcs/tests/Property/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the property test
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_NAMING_CLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
diff --git a/TAO/orbsvcs/tests/Property/server.bor b/TAO/orbsvcs/tests/Property/server.bor
deleted file mode 100644
index 4f5ea44b2bc..00000000000
--- a/TAO/orbsvcs/tests/Property/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the property test
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_PROPERTY_CFLAGS) \
- $(TAO_NAMING_CLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PROPERTY_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.bor b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.bor
deleted file mode 100644
index cd1694e466b..00000000000
--- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the RTCosScheduling test
-#
-
-MAKEFILES = RTCosScheduling_Client.bor RTCosScheduling_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client.bor b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client.bor
deleted file mode 100644
index 79dbd5307bb..00000000000
--- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client.bor
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id$
-# Makefile for building the client exe with Borland C++ Builder
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\testSchedC.obj \
- $(OBJDIR)\testSchedS.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTCosScheduling$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-IDLFILES = \
- $(IDLDIR)\testSched.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- -I..\..\..\orbsvcs \
- -I..\..\.. \
- -I..\..\..\.. \
- -I..\..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- testSchedC.h \
- testSchedS.h \
- testSchedC.i \
- testSchedS.i \
- testSched.idl
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\testSchedS.cpp $(IDLDIR)\testSchedC.cpp: $(IDLDIR)\testSched.idl
- $(TAO_IDL) -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv $**
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Server.bor b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Server.bor
deleted file mode 100644
index 55b701d3b4a..00000000000
--- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling_Server.bor
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id$
-# Makefile for building the server exe with Borland C++ Builder
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Object1_i.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\testSchedC.obj \
- $(OBJDIR)\testSchedS.obj
-
-LFLAGS = \
- -j..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\lib \
- -L..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTCosScheduling$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_PortableServer$(LIB_DECORATOR).lib \
- TAO_IORInterceptor$(LIB_DECORATOR).lib \
- TAO_Valuetype$(LIB_DECORATOR).lib \
- TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-IDLFILES = \
- $(IDLDIR)\testSched.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- -I..\..\..\orbsvcs \
- -I..\..\.. \
- -I..\..\..\.. \
- -I..\..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- Object1_i.h \
- testSchedC.h \
- testSchedS.h \
- testSchedC.i \
- testSchedS.i \
- testSched.idl
-
-all: idl_src_files
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
-
-# IDL File Directory: .
-$(IDLDIR)\testSchedS.cpp $(IDLDIR)\testSchedC.cpp: $(IDLDIR)\testSched.idl
- $(TAO_IDL) -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv $**
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/makefile.bor b/TAO/orbsvcs/tests/Redundant_Naming/makefile.bor
deleted file mode 100644
index ce8a09cf9b8..00000000000
--- a/TAO/orbsvcs/tests/Redundant_Naming/makefile.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-#
-# Makefile for building the Simple_Naming test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\test_objectC.obj \
- $(OBJDIR)\test_objectS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = test_object.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\test_objectS.cpp $(IDLDIR)\test_objectC.cpp: $(IDLDIR)\test_object.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/orbsvcs/tests/Security/Makefile.bor b/TAO/orbsvcs/tests/Security/Makefile.bor
deleted file mode 100644
index 06013f5317e..00000000000
--- a/TAO/orbsvcs/tests/Security/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building the TAO Security obsvcs tests
-# $Id$
-#
-
-DIRS = \
- Secure_Invocation
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.bor b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.bor
deleted file mode 100644
index 608e1730074..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.bor b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.bor
deleted file mode 100644
index bef6ec3eca8..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-#
-# Makefile for building the Secure_Invocation test
-#
-
-!ifdef SSL_ROOT
-NAME = client
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\FooC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(ACE_SSL_CFLAGS) \
- $(SSL_CFLAGS) \
- $(TAO_SECURITY_CFLAGS) \
- $(TAO_SSLIOP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(ACE_SSL_LIB) \
- $(SSL_LIB) \
- $(TAO_SECURITY_LIB) \
- $(TAO_SSLIOP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Foo.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FooS.cpp $(IDLDIR)\FooC.cpp: $(IDLDIR)\Foo.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.bor b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.bor
deleted file mode 100644
index 8c95db6f228..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id$
-#
-# Makefile for building the Secure_Invocation test
-#
-
-!ifdef SSL_ROOT
-NAME = server
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\FooC.obj \
- $(OBJDIR)\FooS.obj \
- $(OBJDIR)\Foo_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(ACE_SSL_CFLAGS) \
- $(SSL_CFLAGS) \
- $(TAO_SECURITY_CFLAGS) \
- $(TAO_SSLIOP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(ACE_SSL_LIB) \
- $(SSL_LIB) \
- $(TAO_SECURITY_LIB) \
- $(TAO_SSLIOP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Foo.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FooS.cpp $(IDLDIR)\FooC.cpp: $(IDLDIR)\Foo.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Simple_Naming/makefile.bor b/TAO/orbsvcs/tests/Simple_Naming/makefile.bor
deleted file mode 100644
index ce8a09cf9b8..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/makefile.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-#
-# Makefile for building the Simple_Naming test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\test_objectC.obj \
- $(OBJDIR)\test_objectS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = test_object.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\test_objectS.cpp $(IDLDIR)\test_objectC.cpp: $(IDLDIR)\test_object.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/orbsvcs/tests/Time/Makefile.bor b/TAO/orbsvcs/tests/Time/Makefile.bor
deleted file mode 100644
index 56be752d449..00000000000
--- a/TAO/orbsvcs/tests/Time/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the time test
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/Time/client.bor b/TAO/orbsvcs/tests/Time/client.bor
deleted file mode 100644
index 60fafab0a49..00000000000
--- a/TAO/orbsvcs/tests/Time/client.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-#
-# Makefile for building the time test
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\client_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TIME_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TIME_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/orbsvcs/tests/Trading/Makefile.bor b/TAO/orbsvcs/tests/Trading/Makefile.bor
deleted file mode 100644
index 3087c2d1ec2..00000000000
--- a/TAO/orbsvcs/tests/Trading/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- TradingLib.bor \
- colocated_test.bor \
- export_test.bor \
- import_test.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.bor b/TAO/orbsvcs/tests/Trading/TradingLib.bor
deleted file mode 100644
index d8a61b6026a..00000000000
--- a/TAO/orbsvcs/tests/Trading/TradingLib.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $Id$
-#
-
-NAME = TTest
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TTestC.obj \
- $(OBJDIR)\TTestS.obj \
- $(OBJDIR)\TT_Info.obj \
- $(OBJDIR)\Service_Type_Exporter.obj \
- $(OBJDIR)\Offer_Exporter.obj \
- $(OBJDIR)\Offer_Importer.obj \
- $(OBJDIR)\Simple_Dynamic.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TRADING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TRADING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\TTest.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_lib.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TTestS.cpp $(IDLDIR)\TTestC.cpp: $(IDLDIR)\TTest.idl
- $(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.bor b/TAO/orbsvcs/tests/Trading/colocated_test.bor
deleted file mode 100644
index 76da3f1efed..00000000000
--- a/TAO/orbsvcs/tests/Trading/colocated_test.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = colocated_test
-
-OBJFILES = \
- $(OBJDIR)\colocated_test.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TRADING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TRADING_LIB) \
- $(BINDIR)\TTest$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Trading/export_test.bor b/TAO/orbsvcs/tests/Trading/export_test.bor
deleted file mode 100644
index 56641d058e0..00000000000
--- a/TAO/orbsvcs/tests/Trading/export_test.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = export_test
-
-OBJFILES = \
- $(OBJDIR)\export_test.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TRADING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TRADING_LIB) \
- $(BINDIR)\TTest$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/Trading/import_test.bor b/TAO/orbsvcs/tests/Trading/import_test.bor
deleted file mode 100644
index dbc6eede985..00000000000
--- a/TAO/orbsvcs/tests/Trading/import_test.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = import_test
-
-OBJFILES = \
- $(OBJDIR)\import_test.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_TRADING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_DYNAMICANY_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_TRADING_LIB) \
- $(BINDIR)\TTest$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile.bor b/TAO/orbsvcs/tests/ior_corbaname/Makefile.bor
deleted file mode 100644
index 538e3665bc7..00000000000
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# Makefile for building the ior_corbaname test
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.bor b/TAO/orbsvcs/tests/ior_corbaname/client.bor
deleted file mode 100644
index b338352777b..00000000000
--- a/TAO/orbsvcs/tests/ior_corbaname/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-#
-# Makefile for building the ior_corbaname test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\corbanameC.obj \
- $(OBJDIR)\corbanameS.obj \
- $(OBJDIR)\ior_corbaname_client_i.obj \
- $(OBJDIR)\status_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\corbaname.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbanameC.cpp $(IDLDIR)\corbanameS.cpp: $(IDLDIR)\corbaname.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.bor b/TAO/orbsvcs/tests/ior_corbaname/server.bor
deleted file mode 100644
index af325b58caf..00000000000
--- a/TAO/orbsvcs/tests/ior_corbaname/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the ior_corbaname test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\corbanameC.obj \
- $(OBJDIR)\corbanameS.obj \
- $(OBJDIR)\status_i.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\corbaname.idl
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbanameC.cpp $(IDLDIR)\corbanameS.cpp: $(IDLDIR)\corbaname.idl
- $(TAO_IDL) $**
-