summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/examples/AMH/Makefile.bor10
-rw-r--r--TAO/examples/AMH/Sink_Server/Makefile.bor9
-rw-r--r--TAO/examples/AMH/Sink_Server/client.bor52
-rw-r--r--TAO/examples/AMH/Sink_Server/mt_server.bor55
-rw-r--r--TAO/examples/AMH/Sink_Server/st_server.bor53
-rw-r--r--TAO/examples/Buffered_AMI/Makefile.bor9
-rw-r--r--TAO/examples/Buffered_AMI/client.bor51
-rw-r--r--TAO/examples/Buffered_AMI/server.bor51
-rw-r--r--TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor50
-rw-r--r--TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor50
-rw-r--r--TAO/examples/Buffered_Oneways/Makefile.bor12
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor39
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor37
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor38
-rw-r--r--TAO/examples/Callback_Quoter/Makefile.bor13
-rw-r--r--TAO/examples/Content_Server/Makefile.bor10
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Makefile.bor9
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/client.bor54
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/server.bor56
-rw-r--r--TAO/examples/Event_Comm/Makefile.bor9
-rw-r--r--TAO/examples/Event_Comm/consumer.bor32
-rw-r--r--TAO/examples/Event_Comm/notifier.bor31
-rw-r--r--TAO/examples/Event_Comm/supplier.bor32
-rw-r--r--TAO/examples/Load_Balancing/Load_Balancing.bor30
-rw-r--r--TAO/examples/Load_Balancing/Makefile.bor9
-rw-r--r--TAO/examples/Load_Balancing/client.bor33
-rw-r--r--TAO/examples/Load_Balancing/server.bor35
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancing.bor30
-rw-r--r--TAO/examples/Load_Balancing_persistent/Makefile.bor9
-rw-r--r--TAO/examples/Load_Balancing_persistent/client.bor33
-rw-r--r--TAO/examples/Load_Balancing_persistent/server.bor35
-rw-r--r--TAO/examples/Makefile.bor26
-rw-r--r--TAO/examples/OBV/Makefile.bor10
-rw-r--r--TAO/examples/OBV/Typed_Events/Makefile.bor9
-rw-r--r--TAO/examples/OBV/Typed_Events/client.bor51
-rw-r--r--TAO/examples/OBV/Typed_Events/server.bor51
-rw-r--r--TAO/examples/POA/Adapter_Activator/Makefile.bor33
-rw-r--r--TAO/examples/POA/DSI/Makefile.bor9
-rw-r--r--TAO/examples/POA/DSI/client.bor46
-rw-r--r--TAO/examples/POA/DSI/server.bor49
-rw-r--r--TAO/examples/POA/Default_Servant/Makefile.bor9
-rw-r--r--TAO/examples/POA/Default_Servant/client.bor29
-rw-r--r--TAO/examples/POA/Default_Servant/server.bor30
-rw-r--r--TAO/examples/POA/Explicit_Activation/Makefile.bor33
-rw-r--r--TAO/examples/POA/FindPOA/Makefile.bor14
-rw-r--r--TAO/examples/POA/Forwarding/Makefile.bor9
-rw-r--r--TAO/examples/POA/Forwarding/client.bor46
-rw-r--r--TAO/examples/POA/Forwarding/server.bor48
-rw-r--r--TAO/examples/POA/Generic_Servant/Makefile.bor9
-rw-r--r--TAO/examples/POA/Generic_Servant/client.bor46
-rw-r--r--TAO/examples/POA/Generic_Servant/generic_servant.bor41
-rw-r--r--TAO/examples/POA/Loader/Makefile.bor33
-rw-r--r--TAO/examples/POA/Makefile.bor23
-rw-r--r--TAO/examples/POA/NewPOA/Makefile.bor14
-rw-r--r--TAO/examples/POA/On_Demand_Activation/Makefile.bor35
-rw-r--r--TAO/examples/POA/On_Demand_Loading/Makefile.bor36
-rw-r--r--TAO/examples/POA/POA_BiDir/Makefile.bor32
-rw-r--r--TAO/examples/POA/Reference_Counted_Servant/Makefile.bor33
-rw-r--r--TAO/examples/POA/RootPOA/Makefile.bor14
-rw-r--r--TAO/examples/POA/TIE/Makefile.bor9
-rw-r--r--TAO/examples/POA/TIE/client.bor46
-rw-r--r--TAO/examples/POA/TIE/server.bor47
-rw-r--r--TAO/examples/PluggableUDP/Makefile.bor9
-rw-r--r--TAO/examples/PluggableUDP/tests/Basic/Makefile.bor10
-rw-r--r--TAO/examples/PluggableUDP/tests/Basic/client.bor47
-rw-r--r--TAO/examples/PluggableUDP/tests/Basic/server.bor47
-rw-r--r--TAO/examples/PluggableUDP/tests/Makefile.bor9
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/Makefile.bor10
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/client.bor47
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/server.bor47
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.bor10
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/client.bor45
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/server.bor46
-rw-r--r--TAO/examples/Quoter/Client.bor52
-rw-r--r--TAO/examples/Quoter/Factory_finder.bor57
-rw-r--r--TAO/examples/Quoter/Generic_factory.bor57
-rw-r--r--TAO/examples/Quoter/Makefile.bor9
-rw-r--r--TAO/examples/Quoter/Server.bor57
-rw-r--r--TAO/examples/RTCORBA/Activity/Makefile.bor59
-rw-r--r--TAO/examples/RTCORBA/Makefile.bor10
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Starter.bor82
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Test.bor113
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.bor27
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Starter.bor82
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Test.bor113
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/Makefile.bor27
-rw-r--r--TAO/examples/RTScheduling/Makefile.bor11
-rw-r--r--TAO/examples/Simple/Makefile.bor15
-rw-r--r--TAO/examples/Simple/bank/Bank_Client.bor31
-rw-r--r--TAO/examples/Simple/bank/Bank_Server.bor32
-rw-r--r--TAO/examples/Simple/bank/Makefile.bor9
-rw-r--r--TAO/examples/Simple/chat/Chat_Client.bor37
-rw-r--r--TAO/examples/Simple/chat/Chat_Server.bor37
-rw-r--r--TAO/examples/Simple/chat/Makefile.bor9
-rw-r--r--TAO/examples/Simple/echo/Echo_Client.bor31
-rw-r--r--TAO/examples/Simple/echo/Echo_Server.bor31
-rw-r--r--TAO/examples/Simple/echo/Makefile.bor10
-rw-r--r--TAO/examples/Simple/grid/Grid_Client.bor31
-rw-r--r--TAO/examples/Simple/grid/Grid_Server.bor31
-rw-r--r--TAO/examples/Simple/grid/Makefile.bor10
-rw-r--r--TAO/examples/Simple/time-date/Makefile.bor10
-rw-r--r--TAO/examples/Simple/time-date/client.bor47
-rw-r--r--TAO/examples/Simple/time-date/server.bor20
-rw-r--r--TAO/examples/Simple/time-date/time_date.bor44
-rw-r--r--TAO/examples/Simple/time/Makefile.bor10
-rw-r--r--TAO/examples/Simple/time/Time_Client.bor31
-rw-r--r--TAO/examples/Simple/time/Time_Server.bor31
-rw-r--r--TAO/examples/TypeCode_Creation/Makefile.bor42
-rw-r--r--TAO/examples/ior_corbaloc/Makefile.bor9
-rw-r--r--TAO/examples/ior_corbaloc/client.bor49
-rw-r--r--TAO/examples/ior_corbaloc/corbaname_client.bor49
-rw-r--r--TAO/examples/ior_corbaloc/server.bor49
-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
-rw-r--r--TAO/tao/BiDir_GIOP/Makefile.bor32
-rw-r--r--TAO/tao/Domain/Makefile.bor32
-rw-r--r--TAO/tao/DynamicAny/Makefile.bor36
-rw-r--r--TAO/tao/DynamicInterface/Makefile.bor41
-rw-r--r--TAO/tao/IFR_Client/Makefile.bor34
-rw-r--r--TAO/tao/IORInterceptor/Makefile.bor37
-rw-r--r--TAO/tao/IORManipulation/Makefile.bor27
-rw-r--r--TAO/tao/IORTable/Makefile.bor29
-rw-r--r--TAO/tao/Makefile.bor301
-rw-r--r--TAO/tao/Messaging/Makefile.bor49
-rw-r--r--TAO/tao/ObjRefTemplate/Makefile.bor25
-rw-r--r--TAO/tao/PortableServer/Makefile.bor69
-rw-r--r--TAO/tao/RTCORBA/Makefile.bor57
-rw-r--r--TAO/tao/RTPortableServer/Makefile.bor59
-rw-r--r--TAO/tao/RTScheduling/Makefile.bor38
-rw-r--r--TAO/tao/SmartProxies/Makefile.bor30
-rw-r--r--TAO/tao/Strategies/Makefile.bor63
-rw-r--r--TAO/tao/TypeCodeFactory/Makefile.bor44
-rw-r--r--TAO/tao/Valuetype/Makefile.bor31
-rw-r--r--TAO/tests/AMH_Exceptions/Makefile.bor9
-rw-r--r--TAO/tests/AMH_Exceptions/client.bor40
-rw-r--r--TAO/tests/AMH_Exceptions/server.bor47
-rw-r--r--TAO/tests/AMH_Oneway/Makefile.bor9
-rw-r--r--TAO/tests/AMH_Oneway/client.bor46
-rw-r--r--TAO/tests/AMH_Oneway/server.bor46
-rw-r--r--TAO/tests/AMI/Makefile.bor9
-rw-r--r--TAO/tests/AMI/client.bor48
-rw-r--r--TAO/tests/AMI/server.bor49
-rw-r--r--TAO/tests/AMI/simple_client.bor47
-rw-r--r--TAO/tests/AMI_Buffering/Makefile.bor7
-rw-r--r--TAO/tests/AMI_Buffering/admin.bor47
-rw-r--r--TAO/tests/AMI_Buffering/client.bor48
-rw-r--r--TAO/tests/AMI_Buffering/server.bor47
-rw-r--r--TAO/tests/AMI_Timeouts/Makefile.bor9
-rw-r--r--TAO/tests/AMI_Timeouts/client.bor50
-rw-r--r--TAO/tests/AMI_Timeouts/server.bor50
-rw-r--r--TAO/tests/Abstract_Interface/Makefile.bor7
-rw-r--r--TAO/tests/Abstract_Interface/client.bor37
-rw-r--r--TAO/tests/Abstract_Interface/server.bor41
-rw-r--r--TAO/tests/BiDirectional/Makefile.bor9
-rw-r--r--TAO/tests/BiDirectional/client.bor49
-rw-r--r--TAO/tests/BiDirectional/server.bor49
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/Makefile.bor8
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/client.bor48
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/server.bor48
-rw-r--r--TAO/tests/Big_Oneways/Makefile.bor7
-rw-r--r--TAO/tests/Big_Oneways/client.bor47
-rw-r--r--TAO/tests/Big_Oneways/server.bor46
-rw-r--r--TAO/tests/Big_Reply/Makefile.bor8
-rw-r--r--TAO/tests/Big_Reply/client.bor37
-rw-r--r--TAO/tests/Big_Reply/server.bor46
-rw-r--r--TAO/tests/Big_Request_Muxing/Makefile.bor7
-rw-r--r--TAO/tests/Big_Request_Muxing/client.bor47
-rw-r--r--TAO/tests/Big_Request_Muxing/server.bor47
-rw-r--r--TAO/tests/Big_Twoways/Makefile.bor7
-rw-r--r--TAO/tests/Big_Twoways/client.bor47
-rw-r--r--TAO/tests/Big_Twoways/server.bor46
-rw-r--r--TAO/tests/Blocking_Sync_None/Makefile.bor7
-rw-r--r--TAO/tests/Blocking_Sync_None/client.bor43
-rw-r--r--TAO/tests/Blocking_Sync_None/server.bor41
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/server.bor44
-rw-r--r--TAO/tests/Bug_1020_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1020_Regression/client.bor46
-rw-r--r--TAO/tests/Bug_1020_Regression/server.bor48
-rw-r--r--TAO/tests/Bug_1269_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1269_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1269_Regression/server.bor44
-rw-r--r--TAO/tests/Bug_1269_Regression/shutdown.bor42
-rw-r--r--TAO/tests/Bug_1270_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1270_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1270_Regression/server.bor45
-rw-r--r--TAO/tests/Bug_1270_Regression/shutdown.bor42
-rw-r--r--TAO/tests/Bug_1361_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1361_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1361_Regression/server.bor45
-rw-r--r--TAO/tests/Bug_1361_Regression/shutdown.bor42
-rw-r--r--TAO/tests/Bug_1482_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1482_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1482_Regression/server.bor44
-rw-r--r--TAO/tests/Bug_1551_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1551_Regression/client.bor44
-rw-r--r--TAO/tests/Bug_1551_Regression/server.bor44
-rw-r--r--TAO/tests/Bug_1568_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1568_Regression/client.bor41
-rw-r--r--TAO/tests/Bug_1568_Regression/server.bor42
-rw-r--r--TAO/tests/Bug_1670_Regression/Makefile.bor7
-rw-r--r--TAO/tests/Bug_1670_Regression/client.bor41
-rw-r--r--TAO/tests/Bug_1670_Regression/server.bor42
-rw-r--r--TAO/tests/Bug_1693_Test/Makefile.bor8
-rw-r--r--TAO/tests/Bug_1693_Test/client.bor36
-rw-r--r--TAO/tests/CDR/Makefile.bor23
-rw-r--r--TAO/tests/Cache_Growth_Test/Makefile.bor7
-rw-r--r--TAO/tests/Cache_Growth_Test/client.bor35
-rw-r--r--TAO/tests/Cache_Growth_Test/server.bor39
-rw-r--r--TAO/tests/Client_Leaks/Makefile.bor8
-rw-r--r--TAO/tests/Client_Leaks/child.bor39
-rw-r--r--TAO/tests/Client_Leaks/client.bor39
-rw-r--r--TAO/tests/Client_Leaks/server.bor41
-rw-r--r--TAO/tests/CodeSets/Makefile.bor9
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859.bor25
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.bor8
-rw-r--r--TAO/tests/CodeSets/libs/Makefile.bor9
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_Libs_UCS4_UTF16.bor25
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.bor8
-rw-r--r--TAO/tests/CodeSets/simple/Makefile.bor7
-rw-r--r--TAO/tests/CodeSets/simple/client.bor35
-rw-r--r--TAO/tests/CodeSets/simple/server.bor38
-rw-r--r--TAO/tests/Codec/Makefile.bor8
-rw-r--r--TAO/tests/Codec/client.bor36
-rw-r--r--TAO/tests/Collocation/Collocation.bor34
-rw-r--r--TAO/tests/Collocation/Collocation_Test_Stubs.bor43
-rw-r--r--TAO/tests/Collocation/Diamond.bor48
-rw-r--r--TAO/tests/Collocation/Makefile.bor8
-rw-r--r--TAO/tests/Collocation_Opportunities/Makefile.bor42
-rw-r--r--TAO/tests/Collocation_Tests/Collocated_Test.bor41
-rw-r--r--TAO/tests/Collocation_Tests/Makefile.bor7
-rw-r--r--TAO/tests/Connect_Strategy_Test/Makefile.bor7
-rw-r--r--TAO/tests/Connect_Strategy_Test/client.bor35
-rw-r--r--TAO/tests/Connect_Strategy_Test/server.bor39
-rw-r--r--TAO/tests/Connection_Failure/Makefile.bor7
-rw-r--r--TAO/tests/Connection_Failure/client.bor35
-rw-r--r--TAO/tests/Connection_Purging/Makefile.bor8
-rw-r--r--TAO/tests/Connection_Purging/client.bor38
-rw-r--r--TAO/tests/Connection_Purging/server.bor42
-rw-r--r--TAO/tests/Connection_Timeout/Makefile.bor7
-rw-r--r--TAO/tests/Connection_Timeout/client.bor39
-rw-r--r--TAO/tests/Crash_On_Write/Makefile.bor7
-rw-r--r--TAO/tests/Crash_On_Write/client.bor35
-rw-r--r--TAO/tests/Crash_On_Write/server.bor40
-rw-r--r--TAO/tests/Crashed_Callback/Makefile.bor8
-rw-r--r--TAO/tests/Crashed_Callback/client.bor42
-rw-r--r--TAO/tests/Crashed_Callback/server.bor42
-rw-r--r--TAO/tests/DLL_ORB/Makefile.bor8
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module.bor37
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module.bor41
-rw-r--r--TAO/tests/DLL_ORB/client.bor23
-rw-r--r--TAO/tests/DLL_ORB/server.bor22
-rw-r--r--TAO/tests/DSI_Gateway/Makefile.bor8
-rw-r--r--TAO/tests/DSI_Gateway/client.bor36
-rw-r--r--TAO/tests/DSI_Gateway/gateway.bor43
-rw-r--r--TAO/tests/DSI_Gateway/server.bor40
-rw-r--r--TAO/tests/DynAny_Test/Makefile.bor49
-rw-r--r--TAO/tests/Explicit_Event_Loop/Makefile.bor8
-rw-r--r--TAO/tests/Explicit_Event_Loop/client.bor36
-rw-r--r--TAO/tests/Explicit_Event_Loop/server.bor39
-rw-r--r--TAO/tests/Exposed_Policies/Makefile.bor8
-rw-r--r--TAO/tests/Exposed_Policies/client.bor46
-rw-r--r--TAO/tests/Exposed_Policies/server.bor48
-rw-r--r--TAO/tests/FL_Cube/Makefile.bor12
-rw-r--r--TAO/tests/FL_Cube/client.bor43
-rw-r--r--TAO/tests/FL_Cube/server.bor43
-rw-r--r--TAO/tests/Faults/Makefile.bor9
-rw-r--r--TAO/tests/Faults/client.bor41
-rw-r--r--TAO/tests/Faults/middle.bor41
-rw-r--r--TAO/tests/Faults/ping.bor41
-rw-r--r--TAO/tests/Faults/pong.bor40
-rw-r--r--TAO/tests/Faults/server.bor41
-rw-r--r--TAO/tests/File_IO/Makefile.bor9
-rw-r--r--TAO/tests/File_IO/client.bor29
-rw-r--r--TAO/tests/File_IO/server.bor30
-rw-r--r--TAO/tests/Forwarding/Makefile.bor11
-rw-r--r--TAO/tests/Forwarding/client.bor42
-rw-r--r--TAO/tests/Forwarding/server.bor44
-rw-r--r--TAO/tests/Hello/Makefile.bor7
-rw-r--r--TAO/tests/Hello/client.bor35
-rw-r--r--TAO/tests/Hello/server.bor39
-rw-r--r--TAO/tests/ICMG_Any_Bug/Makefile.bor7
-rw-r--r--TAO/tests/ICMG_Any_Bug/client.bor35
-rw-r--r--TAO/tests/ICMG_Any_Bug/server.bor40
-rw-r--r--TAO/tests/IDL_Test/Makefile.bor164
-rw-r--r--TAO/tests/IORManipulation/Makefile.bor16
-rw-r--r--TAO/tests/InterOp-Naming/Makefile.bor8
-rw-r--r--TAO/tests/InterOp-Naming/client.bor41
-rw-r--r--TAO/tests/InterOp-Naming/server.bor47
-rw-r--r--TAO/tests/Leader_Followers/Makefile.bor11
-rw-r--r--TAO/tests/Leader_Followers/client.bor43
-rw-r--r--TAO/tests/Leader_Followers/server.bor44
-rw-r--r--TAO/tests/LongUpcalls/Makefile.bor8
-rw-r--r--TAO/tests/LongUpcalls/ami_client.bor45
-rw-r--r--TAO/tests/LongUpcalls/ami_server.bor44
-rw-r--r--TAO/tests/LongUpcalls/blocking_client.bor44
-rw-r--r--TAO/tests/LongUpcalls/blocking_server.bor44
-rw-r--r--TAO/tests/MProfile/Makefile.bor8
-rw-r--r--TAO/tests/MProfile/client.bor41
-rw-r--r--TAO/tests/MProfile/server.bor40
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/Makefile.bor7
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/client.bor41
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/server.bor40
-rw-r--r--TAO/tests/MProfile_Forwarding/Makefile.bor8
-rw-r--r--TAO/tests/MProfile_Forwarding/client.bor39
-rw-r--r--TAO/tests/MProfile_Forwarding/manager.bor41
-rw-r--r--TAO/tests/MProfile_Forwarding/server.bor40
-rw-r--r--TAO/tests/MT_BiDir/Makefile.bor8
-rw-r--r--TAO/tests/MT_BiDir/client.bor47
-rw-r--r--TAO/tests/MT_BiDir/server.bor48
-rw-r--r--TAO/tests/MT_Client/Makefile.bor7
-rw-r--r--TAO/tests/MT_Client/client.bor35
-rw-r--r--TAO/tests/MT_Client/orb_creation.bor35
-rw-r--r--TAO/tests/MT_Client/server.bor39
-rw-r--r--TAO/tests/MT_Server/Makefile.bor8
-rw-r--r--TAO/tests/MT_Server/client.bor36
-rw-r--r--TAO/tests/MT_Server/server.bor40
-rw-r--r--TAO/tests/MT_Timeout/Makefile.bor7
-rw-r--r--TAO/tests/MT_Timeout/client.bor40
-rw-r--r--TAO/tests/MT_Timeout/server.bor42
-rw-r--r--TAO/tests/Makefile.bor103
-rw-r--r--TAO/tests/Multiple/Makefile.bor11
-rw-r--r--TAO/tests/Multiple/client.bor43
-rw-r--r--TAO/tests/Multiple/server.bor43
-rw-r--r--TAO/tests/Multiple_Inheritance/Makefile.bor11
-rw-r--r--TAO/tests/Multiple_Inheritance/client.bor41
-rw-r--r--TAO/tests/Multiple_Inheritance/server.bor41
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/Makefile.bor8
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/client.bor36
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/server.bor40
-rw-r--r--TAO/tests/Muxing/Makefile.bor8
-rw-r--r--TAO/tests/Muxing/client.bor37
-rw-r--r--TAO/tests/Muxing/server.bor41
-rw-r--r--TAO/tests/Native_Exceptions/Makefile.bor11
-rw-r--r--TAO/tests/Native_Exceptions/client.bor42
-rw-r--r--TAO/tests/Native_Exceptions/server.bor42
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor11
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/client.bor43
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/server.bor42
-rw-r--r--TAO/tests/NestedUpcall/Makefile.bor11
-rw-r--r--TAO/tests/NestedUpcall/Simple/Makefile.bor11
-rw-r--r--TAO/tests/NestedUpcall/Simple/client.bor42
-rw-r--r--TAO/tests/NestedUpcall/Simple/server.bor42
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor12
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/initiator.bor50
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_A.bor42
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_B.bor42
-rw-r--r--TAO/tests/Nested_Event_Loop/Makefile.bor11
-rw-r--r--TAO/tests/Nested_Event_Loop/client.bor44
-rw-r--r--TAO/tests/Nested_Event_Loop/server.bor44
-rw-r--r--TAO/tests/Nested_Upcall_Crash/Makefile.bor9
-rw-r--r--TAO/tests/Nested_Upcall_Crash/client.bor44
-rw-r--r--TAO/tests/Nested_Upcall_Crash/scavenger.bor41
-rw-r--r--TAO/tests/Nested_Upcall_Crash/server.bor44
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/Makefile.bor7
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/client.bor35
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/server.bor39
-rw-r--r--TAO/tests/OBV/Any/Makefile.bor7
-rw-r--r--TAO/tests/OBV/Any/client.bor37
-rw-r--r--TAO/tests/OBV/Any/server.bor45
-rw-r--r--TAO/tests/OBV/Factory/Makefile.bor7
-rw-r--r--TAO/tests/OBV/Factory/client.bor38
-rw-r--r--TAO/tests/OBV/Factory/server.bor46
-rw-r--r--TAO/tests/OBV/Forward/Makefile.bor7
-rw-r--r--TAO/tests/OBV/Forward/client.bor47
-rw-r--r--TAO/tests/OBV/Forward/server.bor58
-rw-r--r--TAO/tests/OBV/Makefile.bor11
-rw-r--r--TAO/tests/OBV/TC_Alignment/Makefile.bor7
-rw-r--r--TAO/tests/OBV/TC_Alignment/client.bor37
-rw-r--r--TAO/tests/OBV/TC_Alignment/server.bor41
-rw-r--r--TAO/tests/ORB_destroy/Makefile.bor24
-rw-r--r--TAO/tests/ORB_init/Portspan/Makefile.bor42
-rw-r--r--TAO/tests/ORB_init/makefile.bor29
-rw-r--r--TAO/tests/ORB_shutdown/Makefile.bor7
-rw-r--r--TAO/tests/ORB_shutdown/server.bor39
-rw-r--r--TAO/tests/ORT/Makefile.bor8
-rw-r--r--TAO/tests/ORT/client.bor36
-rw-r--r--TAO/tests/ORT/server.bor56
-rw-r--r--TAO/tests/Object_Loader/Makefile.bor11
-rw-r--r--TAO/tests/Object_Loader/driver.bor40
-rw-r--r--TAO/tests/Object_Loader/test_dll.bor44
-rw-r--r--TAO/tests/Objref_Sequence_Test/Makefile.bor7
-rw-r--r--TAO/tests/Objref_Sequence_Test/client.bor35
-rw-r--r--TAO/tests/Objref_Sequence_Test/server.bor38
-rw-r--r--TAO/tests/OctetSeq/Makefile.bor8
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.bor39
-rw-r--r--TAO/tests/OctetSeq/client.bor38
-rw-r--r--TAO/tests/OctetSeq/server.bor40
-rw-r--r--TAO/tests/Oneway_Buffering/Makefile.bor7
-rw-r--r--TAO/tests/Oneway_Buffering/admin.bor41
-rw-r--r--TAO/tests/Oneway_Buffering/client.bor39
-rw-r--r--TAO/tests/Oneway_Buffering/server.bor41
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Makefile.bor8
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/client.bor42
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/server.bor41
-rw-r--r--TAO/tests/POA/Current/makefile.bor25
-rw-r--r--TAO/tests/POA/Default_Servant/makefile.bor28
-rw-r--r--TAO/tests/POA/Etherealization/makefile.bor28
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/makefile.bor28
-rw-r--r--TAO/tests/POA/Identity/makefile.bor28
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/makefile.bor28
-rw-r--r--TAO/tests/POA/Makefile.bor22
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/makefile.bor28
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/makefile.bor28
-rw-r--r--TAO/tests/POA/Object_Reactivation/makefile.bor28
-rw-r--r--TAO/tests/POA/POA_Destruction/makefile.bor28
-rw-r--r--TAO/tests/POA/Persistent_ID/Makefile.bor8
-rw-r--r--TAO/tests/POA/Persistent_ID/client.bor38
-rw-r--r--TAO/tests/POA/Persistent_ID/server.bor39
-rw-r--r--TAO/tests/POA/Policies/makefile.bor25
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/makefile.bor28
-rw-r--r--TAO/tests/POA/wait_for_completion/makefile.bor28
-rw-r--r--TAO/tests/Param_Test/Makefile.bor11
-rw-r--r--TAO/tests/Param_Test/anyop.bor41
-rw-r--r--TAO/tests/Param_Test/client.bor82
-rw-r--r--TAO/tests/Param_Test/server.bor41
-rw-r--r--TAO/tests/Policies/Makefile.bor44
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/Makefile.bor9
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/client.bor47
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/server.bor48
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.bor38
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server.bor38
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client.bor36
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server.bor39
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/client.bor39
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/server.bor44
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/client.bor38
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/server.bor44
-rw-r--r--TAO/tests/Portable_Interceptors/Makefile.bor17
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/client.bor37
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/server.bor44
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/client.bor39
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/server.bor45
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.bor40
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.bor45
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.bor8
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.bor36
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.bor39
-rw-r--r--TAO/tests/QtTests/Makefile.bor9
-rw-r--r--TAO/tests/QtTests/client.bor39
-rw-r--r--TAO/tests/QtTests/server.bor41
-rw-r--r--TAO/tests/Queued_Message_Test/makefile.bor17
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/client.bor39
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/server.bor44
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/client.bor41
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/server.bor44
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/client.bor41
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/server.bor46
-rw-r--r--TAO/tests/RTCORBA/Collocation/Makefile.bor39
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor28
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/client.bor41
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/server.bor46
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/Makefile.bor8
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/client.bor38
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/server.bor43
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.bor8
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor40
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor45
-rw-r--r--TAO/tests/RTCORBA/Makefile.bor27
-rw-r--r--TAO/tests/RTCORBA/ORB_init/Makefile.bor28
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor8
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/client.bor37
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/server.bor43
-rw-r--r--TAO/tests/RTCORBA/Policies/makefile.bor27
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor8
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/client.bor38
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/server.bor43
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.bor39
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.bor45
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/client.bor39
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/server.bor44
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.bor41
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.bor46
-rw-r--r--TAO/tests/RTCORBA/RTMutex/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/RTMutex/server.bor30
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/client.bor39
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/server.bor44
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/client.bor41
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server.bor46
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/Makefile.bor9
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/client.bor39
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/server.bor45
-rw-r--r--TAO/tests/RTScheduling/Current/Current.bor48
-rw-r--r--TAO/tests/RTScheduling/Current/Makefile.bor23
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.bor46
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/Makefile.bor23
-rw-r--r--TAO/tests/RTScheduling/Makefile.bor13
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.bor26
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Client.bor68
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Server.bor76
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Makefile.bor21
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.bor46
-rw-r--r--TAO/tests/RTScheduling/VoidData/Makefile.bor23
-rw-r--r--TAO/tests/RTScheduling/VoidData/VoidData.bor66
-rw-r--r--TAO/tests/Reliable_Oneways/Makefile.bor7
-rw-r--r--TAO/tests/Reliable_Oneways/client.bor39
-rw-r--r--TAO/tests/Reliable_Oneways/server.bor42
-rw-r--r--TAO/tests/Server_Leaks/Makefile.bor8
-rw-r--r--TAO/tests/Server_Leaks/client.bor37
-rw-r--r--TAO/tests/Server_Leaks/server.bor41
-rw-r--r--TAO/tests/Single_Read/Makefile.bor8
-rw-r--r--TAO/tests/Single_Read/client.bor38
-rw-r--r--TAO/tests/Single_Read/server.bor40
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Makefile.bor8
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.bor42
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/server.bor41
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor34
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Collocation.bor30
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond.bor34
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Makefile.bor8
-rw-r--r--TAO/tests/Smart_Proxies/Makefile.bor12
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Makefile.bor8
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/client.bor43
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/server.bor41
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Makefile.bor8
-rw-r--r--TAO/tests/Smart_Proxies/Policy/client.bor42
-rw-r--r--TAO/tests/Smart_Proxies/Policy/server.bor41
-rw-r--r--TAO/tests/Stack_Recursion/Makefile.bor8
-rw-r--r--TAO/tests/Stack_Recursion/client.bor38
-rw-r--r--TAO/tests/Stack_Recursion/server.bor42
-rw-r--r--TAO/tests/Strategies/Makefile.bor8
-rw-r--r--TAO/tests/Strategies/client.bor40
-rw-r--r--TAO/tests/Strategies/server.bor42
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/Makefile.bor11
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/client.bor44
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/server.bor44
-rw-r--r--TAO/tests/Timeout/Makefile.bor8
-rw-r--r--TAO/tests/Timeout/client.bor42
-rw-r--r--TAO/tests/Timeout/server.bor43
-rw-r--r--TAO/tests/Two_Objects/Makefile.bor7
-rw-r--r--TAO/tests/Two_Objects/client.bor35
-rw-r--r--TAO/tests/Two_Objects/server.bor42
-rw-r--r--TAO/tests/UNKNOWN_Exception/Makefile.bor25
-rw-r--r--TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Client.bor67
-rw-r--r--TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Server.bor73
782 files changed, 0 insertions, 27090 deletions
diff --git a/TAO/examples/AMH/Makefile.bor b/TAO/examples/AMH/Makefile.bor
deleted file mode 100644
index 69ba92a54dc..00000000000
--- a/TAO/examples/AMH/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH examples
-#
-
-DIRS = \
- Sink_Server
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/AMH/Sink_Server/Makefile.bor b/TAO/examples/AMH/Sink_Server/Makefile.bor
deleted file mode 100644
index 89d196a4c55..00000000000
--- a/TAO/examples/AMH/Sink_Server/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH Sink_Server test executables
-#
-
-MAKEFILES = st_server.bor mt_server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/AMH/Sink_Server/client.bor b/TAO/examples/AMH/Sink_Server/client.bor
deleted file mode 100644
index 9528de7946c..00000000000
--- a/TAO/examples/AMH/Sink_Server/client.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH Sink_Server client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/AMH/Sink_Server/mt_server.bor b/TAO/examples/AMH/Sink_Server/mt_server.bor
deleted file mode 100644
index c2751be9d20..00000000000
--- a/TAO/examples/AMH/Sink_Server/mt_server.bor
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH Sink_Server mt_server
-#
-
-NAME = mt_server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\mt_server.obj \
- $(OBJDIR)\MT_AMH_Server.obj \
- $(OBJDIR)\Base_Server.obj \
- $(OBJDIR)\AMH_Servant.obj \
- $(OBJDIR)\Timer_Handler.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/AMH/Sink_Server/st_server.bor b/TAO/examples/AMH/Sink_Server/st_server.bor
deleted file mode 100644
index 267fd80fab3..00000000000
--- a/TAO/examples/AMH/Sink_Server/st_server.bor
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH Sink_Server st_server
-#
-
-NAME = st_server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\st_server.obj \
- $(OBJDIR)\Base_Server.obj \
- $(OBJDIR)\AMH_Servant.obj \
- $(OBJDIR)\Timer_Handler.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/Buffered_AMI/Makefile.bor b/TAO/examples/Buffered_AMI/Makefile.bor
deleted file mode 100644
index 8f12a096d82..00000000000
--- a/TAO/examples/Buffered_AMI/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the buffered_ami example
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Buffered_AMI/client.bor b/TAO/examples/Buffered_AMI/client.bor
deleted file mode 100644
index bed049895c4..00000000000
--- a/TAO/examples/Buffered_AMI/client.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the buffered_ami example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/Buffered_AMI/server.bor b/TAO/examples/Buffered_AMI/server.bor
deleted file mode 100644
index e593a674c19..00000000000
--- a/TAO/examples/Buffered_AMI/server.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the buffered_ami example
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/Buffered_Oneways/Buffered_Oneways_client.bor b/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor
deleted file mode 100644
index 6a9f7059056..00000000000
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways_client.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Buffered_Oneways_client example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestC.cpp $(IDLDIR)\TestS.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor b/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor
deleted file mode 100644
index c8c0a610838..00000000000
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways_server.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Buffered_Oneways example
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestC.cpp $(IDLDIR)\TestS.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Buffered_Oneways/Makefile.bor b/TAO/examples/Buffered_Oneways/Makefile.bor
deleted file mode 100644
index 183180aed00..00000000000
--- a/TAO/examples/Buffered_Oneways/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Buffered_Oneways example
-#
-
-MAKEFILES = \
- Buffered_Oneways_client.bor \
- Buffered_Oneways_server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor
deleted file mode 100644
index ff4eb41fa26..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Consumer.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Callback_Quoter example
-#
-
-NAME = Callback_Quoter_Consumer
-
-OBJFILES = \
- $(OBJDIR)\ConsumerC.obj \
- $(OBJDIR)\ConsumerS.obj \
- $(OBJDIR)\NotifierC.obj \
- $(OBJDIR)\NotifierS.obj \
- $(OBJDIR)\consumer.obj \
- $(OBJDIR)\Consumer_Input_Handler.obj \
- $(OBJDIR)\Consumer_Signal_Handler.obj \
- $(OBJDIR)\Consumer_Handler.obj \
- $(OBJDIR)\Consumer_i.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- Consumer.idl \
- Notifier.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor
deleted file mode 100644
index 71de4923593..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Notifier.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Callback_Quoter example
-#
-
-NAME = Callback_Quoter_Notifier
-
-OBJFILES = \
- $(OBJDIR)\ConsumerC.obj \
- $(OBJDIR)\ConsumerS.obj \
- $(OBJDIR)\NotifierC.obj \
- $(OBJDIR)\NotifierS.obj \
- $(OBJDIR)\notifier.obj \
- $(OBJDIR)\Notifier_i.obj \
- $(OBJDIR)\Notifier_Input_Handler.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- Consumer.idl \
- Notifier.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor b/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor
deleted file mode 100644
index 075170bfb09..00000000000
--- a/TAO/examples/Callback_Quoter/Callback_Quoter_Supplier.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Callback_Quoter example
-#
-
-NAME = Callback_Quoter_Supplier
-
-OBJFILES = \
- $(OBJDIR)\ConsumerC.obj \
- $(OBJDIR)\ConsumerS.obj \
- $(OBJDIR)\NotifierC.obj \
- $(OBJDIR)\NotifierS.obj \
- $(OBJDIR)\supplier.obj \
- $(OBJDIR)\Supplier_i.obj \
- $(OBJDIR)\Supplier_Timer_Handler.obj \
- $(OBJDIR)\Consumer_i.obj
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- Consumer.idl \
- Notifier.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ConsumerC.cpp $(IDLDIR)\ConsumerS.cpp: $(IDLDIR)\Consumer.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\NotifierC.cpp $(IDLDIR)\NotifierS.cpp: $(IDLDIR)\Notifier.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Callback_Quoter/Makefile.bor b/TAO/examples/Callback_Quoter/Makefile.bor
deleted file mode 100644
index a3b0b134b9a..00000000000
--- a/TAO/examples/Callback_Quoter/Makefile.bor
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Callback Quoter example
-#
-
-MAKEFILES = \
- Callback_Quoter_Notifier.bor \
- Callback_Quoter_Consumer.bor \
- Callback_Quoter_Supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Content_Server/Makefile.bor b/TAO/examples/Content_Server/Makefile.bor
deleted file mode 100644
index 2414fc229b8..00000000000
--- a/TAO/examples/Content_Server/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Content_Server examples
-#
-
-DIRS = \
- SMI_Iterator
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.bor b/TAO/examples/Content_Server/SMI_Iterator/Makefile.bor
deleted file mode 100644
index cdedad339e7..00000000000
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Content_Server SMI_Iterator example
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.bor b/TAO/examples/Content_Server/SMI_Iterator/client.bor
deleted file mode 100644
index b4a646b87a8..00000000000
--- a/TAO/examples/Content_Server/SMI_Iterator/client.bor
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Content_Server SMI_Iterator example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Web_ServerC.obj \
- $(OBJDIR)\Web_ServerS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_MESSAGING_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_IORTABLE_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Web_Server.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Web_ServerS.cpp $(IDLDIR)\Web_ServerC.cpp: $(IDLDIR)\Web_Server.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.bor b/TAO/examples/Content_Server/SMI_Iterator/server.bor
deleted file mode 100644
index 022ccca9491..00000000000
--- a/TAO/examples/Content_Server/SMI_Iterator/server.bor
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Content_Server SMI_Iterator example
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Web_ServerC.obj \
- $(OBJDIR)\Web_ServerS.obj \
- $(OBJDIR)\Content_Iterator_i.obj \
- $(OBJDIR)\Iterator_Factory_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_MESSAGING_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_IORTABLE_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Web_Server.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Web_ServerS.cpp $(IDLDIR)\Web_ServerC.cpp: $(IDLDIR)\Web_Server.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/Event_Comm/Makefile.bor b/TAO/examples/Event_Comm/Makefile.bor
deleted file mode 100644
index 30b70622af4..00000000000
--- a/TAO/examples/Event_Comm/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Event_Comm example
-#
-
-MAKEFILES = notifier.bor consumer.bor supplier.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Event_Comm/consumer.bor b/TAO/examples/Event_Comm/consumer.bor
deleted file mode 100644
index 1652c1ef959..00000000000
--- a/TAO/examples/Event_Comm/consumer.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Event_Comm example
-#
-
-NAME = consumer
-
-OBJFILES = \
- $(OBJDIR)\Event_CommC.obj \
- $(OBJDIR)\Event_CommS.obj \
- $(OBJDIR)\Consumer_Handler.obj \
- $(OBJDIR)\Consumer_Input_Handler.obj \
- $(OBJDIR)\Event_Comm_i.obj \
- $(OBJDIR)\consumer.obj
-
-IDLFILES = \
- $(IDLDIR)\Event_Comm.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Event_CommC.cpp $(IDLDIR)\Event_CommS.cpp: $(IDLDIR)\Event_Comm.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Event_Comm/notifier.bor b/TAO/examples/Event_Comm/notifier.bor
deleted file mode 100644
index 356ecf034b2..00000000000
--- a/TAO/examples/Event_Comm/notifier.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Event_Comm example
-#
-
-NAME = notifier
-
-OBJFILES = \
- $(OBJDIR)\Event_CommC.obj \
- $(OBJDIR)\Event_CommS.obj \
- $(OBJDIR)\Notifier_Server.obj \
- $(OBJDIR)\Event_Comm_i.obj \
- $(OBJDIR)\notifier.obj
-
-IDLFILES = \
- $(IDLDIR)\Event_Comm.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Event_CommC.cpp $(IDLDIR)\Event_CommS.cpp: $(IDLDIR)\Event_Comm.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Event_Comm/supplier.bor b/TAO/examples/Event_Comm/supplier.bor
deleted file mode 100644
index d1cfbe438bd..00000000000
--- a/TAO/examples/Event_Comm/supplier.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Event_Comm example
-#
-
-NAME = supplier
-
-OBJFILES = \
- $(OBJDIR)\Event_CommC.obj \
- $(OBJDIR)\Event_CommS.obj \
- $(OBJDIR)\Supplier_Input_Handler.obj \
- $(OBJDIR)\Event_Comm_i.obj \
- $(OBJDIR)\Notifier_Handler.obj \
- $(OBJDIR)\supplier.obj
-
-IDLFILES = \
- $(IDLDIR)\Event_Comm.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Event_CommC.cpp $(IDLDIR)\Event_CommS.cpp: $(IDLDIR)\Event_Comm.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.bor b/TAO/examples/Load_Balancing/Load_Balancing.bor
deleted file mode 100644
index 53263590e81..00000000000
--- a/TAO/examples/Load_Balancing/Load_Balancing.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = load_balancer
-
-OBJFILES = \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\Load_BalancerS.obj \
- $(OBJDIR)\Load_Balancer_i.obj \
- $(OBJDIR)\Load_Balancing_Service.obj
-
-IDLFILES = \
- $(IDLDIR)\Load_Balancer.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing/Makefile.bor b/TAO/examples/Load_Balancing/Makefile.bor
deleted file mode 100644
index d4c9bc9df1d..00000000000
--- a/TAO/examples/Load_Balancing/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-MAKEFILES = Load_Balancing.bor server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Load_Balancing/client.bor b/TAO/examples/Load_Balancing/client.bor
deleted file mode 100644
index d0f277a986e..00000000000
--- a/TAO/examples/Load_Balancing/client.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\IdentityC.obj \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\Identity_Client.obj
-
-IDLFILES = \
- $(IDLDIR)\Identity.idl \
- $(IDLDIR)\Load_Balancer.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\IdentityC.cpp $(IDLDIR)\IdentityS.cpp: $(IDLDIR)\Identity.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing/server.bor b/TAO/examples/Load_Balancing/server.bor
deleted file mode 100644
index f8d47150e64..00000000000
--- a/TAO/examples/Load_Balancing/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\IdentityC.obj \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\IdentityS.obj \
- $(OBJDIR)\Identity_Server.obj \
- $(OBJDIR)\Identity_i.obj
-
-IDLFILES = \
- $(IDLDIR)\Load_Balancer.idl \
- $(IDLDIR)\Identity.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\IdentityC.cpp $(IDLDIR)\IdentityS.cpp: $(IDLDIR)\Identity.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing.bor b/TAO/examples/Load_Balancing_persistent/Load_Balancing.bor
deleted file mode 100644
index 53263590e81..00000000000
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = load_balancer
-
-OBJFILES = \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\Load_BalancerS.obj \
- $(OBJDIR)\Load_Balancer_i.obj \
- $(OBJDIR)\Load_Balancing_Service.obj
-
-IDLFILES = \
- $(IDLDIR)\Load_Balancer.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing_persistent/Makefile.bor b/TAO/examples/Load_Balancing_persistent/Makefile.bor
deleted file mode 100644
index d4c9bc9df1d..00000000000
--- a/TAO/examples/Load_Balancing_persistent/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-MAKEFILES = Load_Balancing.bor server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Load_Balancing_persistent/client.bor b/TAO/examples/Load_Balancing_persistent/client.bor
deleted file mode 100644
index d0f277a986e..00000000000
--- a/TAO/examples/Load_Balancing_persistent/client.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\IdentityC.obj \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\Identity_Client.obj
-
-IDLFILES = \
- $(IDLDIR)\Identity.idl \
- $(IDLDIR)\Load_Balancer.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\IdentityC.cpp $(IDLDIR)\IdentityS.cpp: $(IDLDIR)\Identity.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Load_Balancing_persistent/server.bor b/TAO/examples/Load_Balancing_persistent/server.bor
deleted file mode 100644
index f8d47150e64..00000000000
--- a/TAO/examples/Load_Balancing_persistent/server.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Load_Balancing example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\IdentityC.obj \
- $(OBJDIR)\Load_BalancerC.obj \
- $(OBJDIR)\IdentityS.obj \
- $(OBJDIR)\Identity_Server.obj \
- $(OBJDIR)\Identity_i.obj
-
-IDLFILES = \
- $(IDLDIR)\Load_Balancer.idl \
- $(IDLDIR)\Identity.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Load_BalancerC.cpp $(IDLDIR)\Load_BalancerS.cpp: $(IDLDIR)\Load_Balancer.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\IdentityC.cpp $(IDLDIR)\IdentityS.cpp: $(IDLDIR)\Identity.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Makefile.bor b/TAO/examples/Makefile.bor
deleted file mode 100644
index ce0cb3b55b0..00000000000
--- a/TAO/examples/Makefile.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO examples
-#
-
-DIRS = \
- AMH \
- Buffered_AMI \
- Buffered_Oneways \
- Callback_Quoter Simple \
- Content_Server \
- Event_Comm \
- ior_corbaloc \
- Load_Balancing \
- Load_Balancing_persistent \
- OBV \
- PluggableUDP \
- POA \
- Quoter \
- RTCORBA \
- RTScheduling \
- Simple \
- TypeCode_Creation
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/OBV/Makefile.bor b/TAO/examples/OBV/Makefile.bor
deleted file mode 100644
index 2a4368d3a36..00000000000
--- a/TAO/examples/OBV/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO OBV examples
-#
-
-DIRS = \
- Typed_Events
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/OBV/Typed_Events/Makefile.bor b/TAO/examples/OBV/Typed_Events/Makefile.bor
deleted file mode 100644
index 668c93df544..00000000000
--- a/TAO/examples/OBV/Typed_Events/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the OBV Typed_Events example
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/OBV/Typed_Events/client.bor b/TAO/examples/OBV/Typed_Events/client.bor
deleted file mode 100644
index 08f4363fc23..00000000000
--- a/TAO/examples/OBV/Typed_Events/client.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the OBV Typed_Events executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Event_TypesC.obj \
- $(OBJDIR)\Event_TypesS.obj \
- $(OBJDIR)\Event_Types_impl.obj \
- $(OBJDIR)\Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Event_Types.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Event_TypesS.cpp $(IDLDIR)\Event_TypesC.cpp: $(IDLDIR)\Event_Types.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/OBV/Typed_Events/server.bor b/TAO/examples/OBV/Typed_Events/server.bor
deleted file mode 100644
index c049e108f34..00000000000
--- a/TAO/examples/OBV/Typed_Events/server.bor
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the OBV Typed_Events executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Event_TypesC.obj \
- $(OBJDIR)\Event_TypesS.obj \
- $(OBJDIR)\Server_i.obj \
- $(OBJDIR)\Event_Types_impl.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Event_Types.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Event_TypesS.cpp $(IDLDIR)\Event_TypesC.cpp: $(IDLDIR)\Event_Types.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile.bor b/TAO/examples/POA/Adapter_Activator/Makefile.bor
deleted file mode 100644
index 38f1b2973d3..00000000000
--- a/TAO/examples/POA/Adapter_Activator/Makefile.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Adapter_activator executable
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -I..\Generic_Servant \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Generic_Servant$(LIB_DECORATOR).lib \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/DSI/Makefile.bor b/TAO/examples/POA/DSI/Makefile.bor
deleted file mode 100644
index e41a39868a4..00000000000
--- a/TAO/examples/POA/DSI/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA DSI examples
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/DSI/client.bor b/TAO/examples/POA/DSI/client.bor
deleted file mode 100644
index a630376bf05..00000000000
--- a/TAO/examples/POA/DSI/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA DSI executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\DatabaseC.obj \
- $(OBJDIR)\DatabaseS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Database.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DatabaseS.cpp $(IDLDIR)\DatabaseC.cpp: $(IDLDIR)\Database.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/POA/DSI/server.bor b/TAO/examples/POA/DSI/server.bor
deleted file mode 100644
index 11f19c76af6..00000000000
--- a/TAO/examples/POA/DSI/server.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA DSI executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\DatabaseC.obj \
- $(OBJDIR)\DatabaseS.obj \
- $(OBJDIR)\Database_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICINTERFACE_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICINTERFACE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Database.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DatabaseS.cpp $(IDLDIR)\DatabaseC.cpp: $(IDLDIR)\Database.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/POA/Default_Servant/Makefile.bor b/TAO/examples/POA/Default_Servant/Makefile.bor
deleted file mode 100644
index d956e8fda76..00000000000
--- a/TAO/examples/POA/Default_Servant/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default_servant example
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/Default_Servant/client.bor b/TAO/examples/POA/Default_Servant/client.bor
deleted file mode 100644
index c39959738f0..00000000000
--- a/TAO/examples/POA/Default_Servant/client.bor
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default servant example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\FileC.obj \
- $(OBJDIR)\FileS.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\File.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/POA/Default_Servant/server.bor b/TAO/examples/POA/Default_Servant/server.bor
deleted file mode 100644
index b3ff62c8a9f..00000000000
--- a/TAO/examples/POA/Default_Servant/server.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default servant example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\FileC.obj \
- $(OBJDIR)\FileS.obj \
- $(OBJDIR)\File_i.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\File.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile.bor b/TAO/examples/POA/Explicit_Activation/Makefile.bor
deleted file mode 100644
index df5a807b209..00000000000
--- a/TAO/examples/POA/Explicit_Activation/Makefile.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Explicit_Activation executable
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -I..\Generic_Servant \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Generic_Servant$(LIB_DECORATOR).lib \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/FindPOA/Makefile.bor b/TAO/examples/POA/FindPOA/Makefile.bor
deleted file mode 100644
index 18fdc6331fc..00000000000
--- a/TAO/examples/POA/FindPOA/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the FindPOA example
-#
-
-NAME = FindPOA
-
-OBJFILES = \
- $(OBJDIR)\FindPOA.obj
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
diff --git a/TAO/examples/POA/Forwarding/Makefile.bor b/TAO/examples/POA/Forwarding/Makefile.bor
deleted file mode 100644
index aca47565dfc..00000000000
--- a/TAO/examples/POA/Forwarding/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Forwarding examples
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/Forwarding/client.bor b/TAO/examples/POA/Forwarding/client.bor
deleted file mode 100644
index 4cd7b5e8a8f..00000000000
--- a/TAO/examples/POA/Forwarding/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Forwarding executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/POA/Forwarding/server.bor b/TAO/examples/POA/Forwarding/server.bor
deleted file mode 100644
index 7f4477ce86d..00000000000
--- a/TAO/examples/POA/Forwarding/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Forwarding executable
-#
-
-NAME = server
-
-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)\Servant_Activator.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/POA/Generic_Servant/Makefile.bor b/TAO/examples/POA/Generic_Servant/Makefile.bor
deleted file mode 100644
index daf6988ab5f..00000000000
--- a/TAO/examples/POA/Generic_Servant/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Generic_Servant examples
-#
-
-MAKEFILES = client.bor generic_servant.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/Generic_Servant/client.bor b/TAO/examples/POA/Generic_Servant/client.bor
deleted file mode 100644
index 0c8ebb2ac35..00000000000
--- a/TAO/examples/POA/Generic_Servant/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Forwarding executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/POA/Generic_Servant/generic_servant.bor b/TAO/examples/POA/Generic_Servant/generic_servant.bor
deleted file mode 100644
index 80b5540e98f..00000000000
--- a/TAO/examples/POA/Generic_Servant/generic_servant.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA generic_Servant lib
-#
-
-NAME = generic_servant
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/POA/Loader/Makefile.bor b/TAO/examples/POA/Loader/Makefile.bor
deleted file mode 100644
index 39d6595e3d4..00000000000
--- a/TAO/examples/POA/Loader/Makefile.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Loader executable
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\servant_activator.obj \
- $(OBJDIR)\servant_locator.obj \
- $(OBJDIR)\server_manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/Makefile.bor b/TAO/examples/POA/Makefile.bor
deleted file mode 100644
index e1e79872d82..00000000000
--- a/TAO/examples/POA/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO POA examples
-
-DIRS = \
- Default_Servant \
- DSI \
- FindPOA \
- Forwarding \
- Generic_Servant \
- Adapter_Activator \
- Explicit_Activation \
- On_Demand_Activation \
- On_Demand_Loading \
- Reference_Counted_Servant \
- Loader \
- NewPOA \
- POA_BiDir \
- RootPOA \
- TIE
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/NewPOA/Makefile.bor b/TAO/examples/POA/NewPOA/Makefile.bor
deleted file mode 100644
index b3b34a8b7ca..00000000000
--- a/TAO/examples/POA/NewPOA/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the NewPOA example
-#
-
-NAME = NewPOA
-
-OBJFILES = \
- $(OBJDIR)\NewPOA.obj
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.bor b/TAO/examples/POA/On_Demand_Activation/Makefile.bor
deleted file mode 100644
index bdc9123c900..00000000000
--- a/TAO/examples/POA/On_Demand_Activation/Makefile.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA On_Demand_Activation executable
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\servant_activator.obj \
- $(OBJDIR)\servant_locator.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -I..\Generic_Servant \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Generic_Servant$(LIB_DECORATOR).lib \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile.bor b/TAO/examples/POA/On_Demand_Loading/Makefile.bor
deleted file mode 100644
index 4b871fabc9b..00000000000
--- a/TAO/examples/POA/On_Demand_Loading/Makefile.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA On_Demand_Loading executable
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\servant_activator.obj \
- $(OBJDIR)\servant_locator.obj \
- $(OBJDIR)\server_manager.obj \
- $(OBJDIR)\servant_manager.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -I..\Generic_Servant \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Generic_Servant$(LIB_DECORATOR).lib \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/POA_BiDir/Makefile.bor b/TAO/examples/POA/POA_BiDir/Makefile.bor
deleted file mode 100644
index 75757987f18..00000000000
--- a/TAO/examples/POA/POA_BiDir/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA_BiDir example
-#
-
-NAME = POA_BiDir
-
-OBJFILES = \
- $(OBJDIR)\POA_BiDir.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.bor b/TAO/examples/POA/Reference_Counted_Servant/Makefile.bor
deleted file mode 100644
index 97dcb16482d..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.bor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA Reference_Counted_Servant executable
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -I..\Generic_Servant \
- -DGENERIC_SERVANT_BUILD_DLL=$(DLL_FLAG) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Generic_Servant$(LIB_DECORATOR).lib \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/POA/RootPOA/Makefile.bor b/TAO/examples/POA/RootPOA/Makefile.bor
deleted file mode 100644
index 0da5d85a583..00000000000
--- a/TAO/examples/POA/RootPOA/Makefile.bor
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the RootPOA example
-#
-
-NAME = RootPOA
-
-OBJFILES = \
- $(OBJDIR)\RootPOA.obj
-
-CPPDIR = .;..
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
diff --git a/TAO/examples/POA/TIE/Makefile.bor b/TAO/examples/POA/TIE/Makefile.bor
deleted file mode 100644
index 2a93be87b5d..00000000000
--- a/TAO/examples/POA/TIE/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA TIE examples
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/POA/TIE/client.bor b/TAO/examples/POA/TIE/client.bor
deleted file mode 100644
index d60364fcdc1..00000000000
--- a/TAO/examples/POA/TIE/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA TIE executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/POA/TIE/server.bor b/TAO/examples/POA/TIE/server.bor
deleted file mode 100644
index 72271dc3d16..00000000000
--- a/TAO/examples/POA/TIE/server.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the POA TIE executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/PluggableUDP/Makefile.bor b/TAO/examples/PluggableUDP/Makefile.bor
deleted file mode 100644
index 378958088ab..00000000000
--- a/TAO/examples/PluggableUDP/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Pluggable UDP examples
-#
-
-DIRS = tests
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Makefile.bor b/TAO/examples/PluggableUDP/tests/Basic/Makefile.bor
deleted file mode 100644
index 21f821f7fd6..00000000000
--- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PluggableUDP tests example
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.bor b/TAO/examples/PluggableUDP/tests/Basic/client.bor
deleted file mode 100644
index 0c100e9f740..00000000000
--- a/TAO/examples/PluggableUDP/tests/Basic/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\UDPC.obj \
- $(OBJDIR)\UDPS.obj \
- $(OBJDIR)\UDP_i.obj \
- $(OBJDIR)\UDP_Client_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\UDP.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\UDPS.cpp $(IDLDIR)\UDPC.cpp: $(IDLDIR)\UDP.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.bor b/TAO/examples/PluggableUDP/tests/Basic/server.bor
deleted file mode 100644
index 07659b1c955..00000000000
--- a/TAO/examples/PluggableUDP/tests/Basic/server.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\UDPC.obj \
- $(OBJDIR)\UDPS.obj \
- $(OBJDIR)\UDP_i.obj \
- $(OBJDIR)\UDP_Client_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\UDP.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\UDPS.cpp $(IDLDIR)\UDPC.cpp: $(IDLDIR)\UDP.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/PluggableUDP/tests/Makefile.bor b/TAO/examples/PluggableUDP/tests/Makefile.bor
deleted file mode 100644
index 062e877dbc3..00000000000
--- a/TAO/examples/PluggableUDP/tests/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Pluggable UDP tests
-#
-
-DIRS = Basic Performance SimplePerformance
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.bor b/TAO/examples/PluggableUDP/tests/Performance/Makefile.bor
deleted file mode 100644
index 21f821f7fd6..00000000000
--- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PluggableUDP tests example
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.bor b/TAO/examples/PluggableUDP/tests/Performance/client.bor
deleted file mode 100644
index d9da0411c53..00000000000
--- a/TAO/examples/PluggableUDP/tests/Performance/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\UDPC.obj \
- $(OBJDIR)\UDPS.obj \
- $(OBJDIR)\UDP_i.obj \
- $(OBJDIR)\UDP_PerformanceClient.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\UDP.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\UDPS.cpp $(IDLDIR)\UDPC.cpp: $(IDLDIR)\UDP.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.bor b/TAO/examples/PluggableUDP/tests/Performance/server.bor
deleted file mode 100644
index fad112a7e9e..00000000000
--- a/TAO/examples/PluggableUDP/tests/Performance/server.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\UDPC.obj \
- $(OBJDIR)\UDPS.obj \
- $(OBJDIR)\UDP_i.obj \
- $(OBJDIR)\UDP_PerformanceClient.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\UDP.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\UDPS.cpp $(IDLDIR)\UDPC.cpp: $(IDLDIR)\UDP.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.bor b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.bor
deleted file mode 100644
index 21f821f7fd6..00000000000
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PluggableUDP tests example
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.bor b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.bor
deleted file mode 100644
index 8215f90c2bc..00000000000
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/PluggableUDP/tests/SimplePerformance/server.bor b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.bor
deleted file mode 100644
index 655f5ac86ad..00000000000
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Sp -Sd
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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/examples/Quoter/Client.bor b/TAO/examples/Quoter/Client.bor
deleted file mode 100644
index e1d1e915f77..00000000000
--- a/TAO/examples/Quoter/Client.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Quoter example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\QuoterC.obj \
- $(OBJDIR)\QuoterS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_LIFECYCLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Quoter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\QuoterC.cpp $(IDLDIR)\QuoterS.cpp: $(IDLDIR)\Quoter.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Quoter/Factory_finder.bor b/TAO/examples/Quoter/Factory_finder.bor
deleted file mode 100644
index ca64e4a8b88..00000000000
--- a/TAO/examples/Quoter/Factory_finder.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Quoter example
-#
-
-NAME = factory_finder
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\QuoterC.obj \
- $(OBJDIR)\QuoterS.obj \
- $(OBJDIR)\Factory_Finder.obj \
- $(OBJDIR)\Factory_Finder_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_LIFECYCLE_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Quoter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\QuoterC.cpp $(IDLDIR)\QuoterS.cpp: $(IDLDIR)\Quoter.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Quoter/Generic_factory.bor b/TAO/examples/Quoter/Generic_factory.bor
deleted file mode 100644
index 56afdef3e05..00000000000
--- a/TAO/examples/Quoter/Generic_factory.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Quoter example
-#
-
-NAME = generic_factory
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\QuoterC.obj \
- $(OBJDIR)\QuoterS.obj \
- $(OBJDIR)\Generic_Factory.obj \
- $(OBJDIR)\Generic_Factory_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_LIFECYCLE_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Quoter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\QuoterC.cpp $(IDLDIR)\QuoterS.cpp: $(IDLDIR)\Quoter.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Quoter/Makefile.bor b/TAO/examples/Quoter/Makefile.bor
deleted file mode 100644
index fb526f37435..00000000000
--- a/TAO/examples/Quoter/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Quoter example
-#
-
-MAKEFILES = Client.bor Factory_finder.bor Generic_factory.bor Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Quoter/Server.bor b/TAO/examples/Quoter/Server.bor
deleted file mode 100644
index d5f10c1a1ec..00000000000
--- a/TAO/examples/Quoter/Server.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Quoter example
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\QuoterC.obj \
- $(OBJDIR)\QuoterS.obj \
- $(OBJDIR)\Quoter_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_LIFECYCLE_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_LIFECYCLE_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Quoter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\QuoterC.cpp $(IDLDIR)\QuoterS.cpp: $(IDLDIR)\Quoter.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/RTCORBA/Activity/Makefile.bor b/TAO/examples/RTCORBA/Activity/Makefile.bor
deleted file mode 100644
index 7f653dfabf6..00000000000
--- a/TAO/examples/RTCORBA/Activity/Makefile.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Activity RTCorba example
-#
-
-NAME = activity
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\JobC.obj \
- $(OBJDIR)\JobS.obj \
- $(OBJDIR)\Periodic_Task.obj \
- $(OBJDIR)\Thread_Task.obj \
- $(OBJDIR)\Activity.obj \
- $(OBJDIR)\Builder.obj \
- $(OBJDIR)\POA_Holder.obj \
- $(OBJDIR)\Job_i.obj \
- $(OBJDIR)\Task_Stats.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Job.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\JobC.cpp $(IDLDIR)\JobS.cpp: $(IDLDIR)\Job.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/RTCORBA/Makefile.bor b/TAO/examples/RTCORBA/Makefile.bor
deleted file mode 100644
index d2d21df11b0..00000000000
--- a/TAO/examples/RTCORBA/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO RTCorba examples
-#
-
-DIRS = \
- Activity
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Starter.bor b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Starter.bor
deleted file mode 100644
index 4b60fbecaf2..00000000000
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Starter.bor
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Starter exe with Borland C++ Builder
-
-NAME = Starter
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Starter.obj \
- $(OBJDIR)\SynchC.obj \
- $(OBJDIR)\SynchS.obj \
- $(OBJDIR)\Synch_i.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_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(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)\Synch.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)
-
-CPPDIR = .;..
-
-IDLDIR = ..
-
-INCLUDES = \
- ..\Starter.h \
- ..\SynchC.h \
- ..\SynchS.h \
- ..\Synch_i.h \
- ..\SynchC.i \
- ..\SynchS.i \
- ..\Synch.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: ..
-..\SynchS.cpp ..\SynchC.cpp: ..\Synch.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Test.bor b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Test.bor
deleted file mode 100644
index b97a1fd203b..00000000000
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler_Test.bor
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the test exe with Borland C++ Builder
-
-NAME = test
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\DT_Creator.obj \
- $(OBJDIR)\FP_SchedulingC.obj \
- $(OBJDIR)\JobC.obj \
- $(OBJDIR)\JobS.obj \
- $(OBJDIR)\Job_i.obj \
- $(OBJDIR)\POA_Holder.obj \
- $(OBJDIR)\SynchC.obj \
- $(OBJDIR)\SynchS.obj \
- $(OBJDIR)\Synch_i.obj \
- $(OBJDIR)\Task_Stats.obj \
- $(OBJDIR)\Thread_Task.obj \
- $(OBJDIR)\FP_DT_Creator.obj \
- $(OBJDIR)\FP_Scheduler.obj \
- $(OBJDIR)\FP_Task.obj \
- $(OBJDIR)\test.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(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)\Job.idl \
- $(IDLDIR)\Synch.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)
-
-CPPDIR = .;..
-
-IDLDIR = ..
-
-INCLUDES = \
- ..\DT_Creator.h \
- ..\FP_SchedulingC.h \
- ..\JobC.h \
- ..\JobS.h \
- ..\Job_i.h \
- ..\POA_Holder.h \
- ..\SynchC.h \
- ..\SynchS.h \
- ..\Synch_i.h \
- ..\Task_Stats.h \
- ..\Thread_Task.h \
- FP_DT_Creator.h \
- FP_Scheduler.h \
- FP_Task.h \
- test.h \
- ..\FP_SchedulingC.i \
- ..\JobC.i \
- ..\JobS.i \
- ..\SynchC.i \
- ..\SynchS.i \
- ..\Task_Stats.inl \
- ..\Job.idl \
- ..\Synch.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: ..
-..\JobS.cpp ..\JobC.cpp: ..\Job.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
-# IDL File Directory: ..
-..\SynchS.cpp ..\SynchC.cpp: ..\Synch.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.bor b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.bor
deleted file mode 100644
index 09983595373..00000000000
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Starter.bor all
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Test.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Starter.bor clean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Test.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Starter.bor realclean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Test.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Starter.bor install
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Fixed_Priority_Scheduler_Test.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Starter.bor b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Starter.bor
deleted file mode 100644
index 0717006ed8c..00000000000
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Starter.bor
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Starter exe with Borland C++ Builder
-
-NAME = Starter
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Starter.obj \
- $(OBJDIR)\SynchC.obj \
- $(OBJDIR)\SynchS.obj \
- $(OBJDIR)\Synch_i.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(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)\Synch.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)
-
-CPPDIR = .;..
-
-IDLDIR = ..
-
-INCLUDES = \
- ..\Starter.h \
- ..\SynchC.h \
- ..\SynchS.h \
- ..\Synch_i.h \
- ..\SynchC.i \
- ..\SynchS.i \
- ..\Synch.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: ..
-..\SynchS.cpp ..\SynchC.cpp: ..\Synch.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Test.bor b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Test.bor
deleted file mode 100644
index db09bff9e23..00000000000
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler_Test.bor
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the test exe with Borland C++ Builder
-
-NAME = test
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\DT_Creator.obj \
- $(OBJDIR)\JobC.obj \
- $(OBJDIR)\JobS.obj \
- $(OBJDIR)\Job_i.obj \
- $(OBJDIR)\MIF_SchedulingC.obj \
- $(OBJDIR)\POA_Holder.obj \
- $(OBJDIR)\SynchC.obj \
- $(OBJDIR)\SynchS.obj \
- $(OBJDIR)\Synch_i.obj \
- $(OBJDIR)\Task_Stats.obj \
- $(OBJDIR)\Thread_Task.obj \
- $(OBJDIR)\MIF_DT_Creator.obj \
- $(OBJDIR)\MIF_Scheduler.obj \
- $(OBJDIR)\MIF_Task.obj \
- $(OBJDIR)\test.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_Messaging$(LIB_DECORATOR).lib \
- TAO_RTPortableServer$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO_CosNaming$(LIB_DECORATOR).lib \
- TAO_Svc_Utils$(LIB_DECORATOR).lib \
- TAO_IORTable$(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)\Job.idl \
- $(IDLDIR)\Synch.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)
-
-CPPDIR = .;..
-
-IDLDIR = ..
-
-INCLUDES = \
- ..\DT_Creator.h \
- ..\JobC.h \
- ..\JobS.h \
- ..\Job_i.h \
- ..\MIF_SchedulingC.h \
- ..\POA_Holder.h \
- ..\SynchC.h \
- ..\SynchS.h \
- ..\Synch_i.h \
- ..\Task_Stats.h \
- ..\Thread_Task.h \
- MIF_DT_Creator.h \
- MIF_Scheduler.h \
- MIF_Task.h \
- test.h \
- ..\JobC.i \
- ..\JobS.i \
- ..\MIF_SchedulingC.i \
- ..\SynchC.i \
- ..\SynchS.i \
- ..\Task_Stats.inl \
- ..\Job.idl \
- ..\Synch.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: ..
-..\JobS.cpp ..\JobC.cpp: ..\Job.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
-# IDL File Directory: ..
-..\SynchS.cpp ..\SynchC.cpp: ..\Synch.idl
- $(TAO_IDL) -o .. -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.bor b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.bor
deleted file mode 100644
index 908199d64df..00000000000
--- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Starter.bor all
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Test.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Starter.bor clean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Test.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Starter.bor realclean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Test.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Starter.bor install
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f MIF_Scheduler_Test.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/examples/RTScheduling/Makefile.bor b/TAO/examples/RTScheduling/Makefile.bor
deleted file mode 100644
index 898d4fe7ab7..00000000000
--- a/TAO/examples/RTScheduling/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TAO RTScheduling examples
-#
-
-DIRS = \
- Fixed_Priority_Scheduler \
- MIF_Scheduler
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Simple/Makefile.bor b/TAO/examples/Simple/Makefile.bor
deleted file mode 100644
index e3e61decfe9..00000000000
--- a/TAO/examples/Simple/Makefile.bor
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the simple examples
-#
-
-DIRS = \
- bank \
- chat \
- echo \
- grid \
- time \
- time-date
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Simple/bank/Bank_Client.bor b/TAO/examples/Simple/bank/Bank_Client.bor
deleted file mode 100644
index 5e34ce6dd80..00000000000
--- a/TAO/examples/Simple/bank/Bank_Client.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Bank example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\BankC.obj \
- $(OBJDIR)\BankS.obj \
- $(OBJDIR)\Bank_Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\Bank.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BankC.cpp $(IDLDIR)\BankS.cpp: $(IDLDIR)\Bank.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/bank/Bank_Server.bor b/TAO/examples/Simple/bank/Bank_Server.bor
deleted file mode 100644
index b59364a397e..00000000000
--- a/TAO/examples/Simple/bank/Bank_Server.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Bank example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\BankC.obj \
- $(OBJDIR)\BankS.obj \
- $(OBJDIR)\Account_i.obj \
- $(OBJDIR)\AccountManager_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\Bank.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BankC.cpp $(IDLDIR)\BankS.cpp: $(IDLDIR)\Bank.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/bank/Makefile.bor b/TAO/examples/Simple/bank/Makefile.bor
deleted file mode 100644
index 6d96676d820..00000000000
--- a/TAO/examples/Simple/bank/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Bank example
-#
-
-MAKEFILES = Bank_Client.bor Bank_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Simple/chat/Chat_Client.bor b/TAO/examples/Simple/chat/Chat_Client.bor
deleted file mode 100644
index df8b751fb2b..00000000000
--- a/TAO/examples/Simple/chat/Chat_Client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Chat example
-#
-
-NAME = Chat_Client
-
-OBJFILES = \
- $(OBJDIR)\ReceiverC.obj \
- $(OBJDIR)\ReceiverS.obj \
- $(OBJDIR)\BroadcasterC.obj \
- $(OBJDIR)\BroadcasterS.obj \
- $(OBJDIR)\Receiver_i.obj \
- $(OBJDIR)\Client_i.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\Broadcaster.idl \
- $(IDLDIR)\Receiver.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BroadcasterC.cpp $(IDLDIR)\BroadcasterS.cpp: $(IDLDIR)\Broadcaster.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\ReceiverC.cpp $(IDLDIR)\ReceiverS.cpp: $(IDLDIR)\Receiver.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/chat/Chat_Server.bor b/TAO/examples/Simple/chat/Chat_Server.bor
deleted file mode 100644
index b3637814838..00000000000
--- a/TAO/examples/Simple/chat/Chat_Server.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Chat example
-#
-
-NAME = Chat_Server
-
-OBJFILES = \
- $(OBJDIR)\ReceiverC.obj \
- $(OBJDIR)\ReceiverS.obj \
- $(OBJDIR)\BroadcasterC.obj \
- $(OBJDIR)\BroadcasterS.obj \
- $(OBJDIR)\Broadcaster_i.obj \
- $(OBJDIR)\Server_i.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\Broadcaster.idl \
- $(IDLDIR)\Receiver.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\BroadcasterC.cpp $(IDLDIR)\BroadcasterS.cpp: $(IDLDIR)\Broadcaster.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\ReceiverC.cpp $(IDLDIR)\ReceiverS.cpp: $(IDLDIR)\Receiver.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/chat/Makefile.bor b/TAO/examples/Simple/chat/Makefile.bor
deleted file mode 100644
index eeb57d49dca..00000000000
--- a/TAO/examples/Simple/chat/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Chat example
-#
-
-MAKEFILES = Chat_Client.bor Chat_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Simple/echo/Echo_Client.bor b/TAO/examples/Simple/echo/Echo_Client.bor
deleted file mode 100644
index ef4fe97ff13..00000000000
--- a/TAO/examples/Simple/echo/Echo_Client.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Echo example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\EchoC.obj \
- $(OBJDIR)\EchoS.obj \
- $(OBJDIR)\Echo_Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\Echo.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\EchoC.cpp $(IDLDIR)\EchoS.cpp: $(IDLDIR)\Echo.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/echo/Echo_Server.bor b/TAO/examples/Simple/echo/Echo_Server.bor
deleted file mode 100644
index 58e43ce801c..00000000000
--- a/TAO/examples/Simple/echo/Echo_Server.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Echo example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\EchoC.obj \
- $(OBJDIR)\EchoS.obj \
- $(OBJDIR)\Echo_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\Echo.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\EchoC.cpp $(IDLDIR)\EchoS.cpp: $(IDLDIR)\Echo.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/echo/Makefile.bor b/TAO/examples/Simple/echo/Makefile.bor
deleted file mode 100644
index 743aec85178..00000000000
--- a/TAO/examples/Simple/echo/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Echo example
-#
-
-MAKEFILES = Echo_Client.bor Echo_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Simple/grid/Grid_Client.bor b/TAO/examples/Simple/grid/Grid_Client.bor
deleted file mode 100644
index f84655f5283..00000000000
--- a/TAO/examples/Simple/grid/Grid_Client.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Grid example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\GridC.obj \
- $(OBJDIR)\GridS.obj \
- $(OBJDIR)\Grid_Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\Grid.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\GridC.cpp $(IDLDIR)\GridS.cpp: $(IDLDIR)\Grid.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/grid/Grid_Server.bor b/TAO/examples/Simple/grid/Grid_Server.bor
deleted file mode 100644
index 2bd7873e8d1..00000000000
--- a/TAO/examples/Simple/grid/Grid_Server.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Grid example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\GridC.obj \
- $(OBJDIR)\GridS.obj \
- $(OBJDIR)\Grid_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\Grid.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\GridC.cpp $(IDLDIR)\GridS.cpp: $(IDLDIR)\Grid.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/grid/Makefile.bor b/TAO/examples/Simple/grid/Makefile.bor
deleted file mode 100644
index f5bde94a75d..00000000000
--- a/TAO/examples/Simple/grid/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Grid example
-#
-
-MAKEFILES = Grid_Client.bor Grid_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Simple/time-date/Makefile.bor b/TAO/examples/Simple/time-date/Makefile.bor
deleted file mode 100644
index 7deabf519a8..00000000000
--- a/TAO/examples/Simple/time-date/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time-date example
-#
-
-MAKEFILES = time_date.bor client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Simple/time-date/client.bor b/TAO/examples/Simple/time-date/client.bor
deleted file mode 100644
index 050fb34b75d..00000000000
--- a/TAO/examples/Simple/time-date/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time-date example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\Time_DateC.obj \
- $(OBJDIR)\Time_DateS.obj \
- $(OBJDIR)\Time_Date_Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_COSNAMING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_COSNAMING_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Time_Date.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Time_DateC.cpp $(IDLDIR)\Time_DateS.cpp: $(IDLDIR)\Time_Date.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/time-date/server.bor b/TAO/examples/Simple/time-date/server.bor
deleted file mode 100644
index 8d8e1ed9002..00000000000
--- a/TAO/examples/Simple/time-date/server.bor
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time-date example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(BINDIR)\TimeDate$(LIB_DECORATOR).lib
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
diff --git a/TAO/examples/Simple/time-date/time_date.bor b/TAO/examples/Simple/time-date/time_date.bor
deleted file mode 100644
index 6e0335f12f4..00000000000
--- a/TAO/examples/Simple/time-date/time_date.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the time-date library
-#
-
-NAME = Time_Date
-
-TARGET = .\$(NAME).dll
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Time_DateS.obj \
- $(OBJDIR)\Time_Date.obj \
- $(OBJDIR)\Time_Date_i.obj \
- $(OBJDIR)\Time_DateC.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Time_Date.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Time_DateC.cpp $(IDLDIR)\Time_DateS.cpp: $(IDLDIR)\Time_Date.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/time/Makefile.bor b/TAO/examples/Simple/time/Makefile.bor
deleted file mode 100644
index 8544fa538e2..00000000000
--- a/TAO/examples/Simple/time/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time example
-#
-
-MAKEFILES = Time_Client.bor Time_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/Simple/time/Time_Client.bor b/TAO/examples/Simple/time/Time_Client.bor
deleted file mode 100644
index 862ea1e5259..00000000000
--- a/TAO/examples/Simple/time/Time_Client.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\TimeC.obj \
- $(OBJDIR)\TimeS.obj \
- $(OBJDIR)\Time_Client_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\Time.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TimeC.cpp $(IDLDIR)\TimeS.cpp: $(IDLDIR)\Time.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/Simple/time/Time_Server.bor b/TAO/examples/Simple/time/Time_Server.bor
deleted file mode 100644
index 3a16103874a..00000000000
--- a/TAO/examples/Simple/time/Time_Server.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Time example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\TimeC.obj \
- $(OBJDIR)\TimeS.obj \
- $(OBJDIR)\Time_i.obj \
- $(OBJDIR)\Simple_util.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\Time.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TimeC.cpp $(IDLDIR)\TimeS.cpp: $(IDLDIR)\Time.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/TypeCode_Creation/Makefile.bor b/TAO/examples/TypeCode_Creation/Makefile.bor
deleted file mode 100644
index 4117ebda306..00000000000
--- a/TAO/examples/TypeCode_Creation/Makefile.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the TypeCode_Creation example
-#
-
-NAME = create_tc
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\main.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_TYPECODEFACTORY_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_TYPECODEFACTORY_LIB)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestC.cpp : $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/examples/ior_corbaloc/Makefile.bor b/TAO/examples/ior_corbaloc/Makefile.bor
deleted file mode 100644
index b663c645f5c..00000000000
--- a/TAO/examples/ior_corbaloc/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ior_corbaloc test executables
-#
-
-MAKEFILES = server.bor client.bor corbaname_client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/ior_corbaloc/client.bor b/TAO/examples/ior_corbaloc/client.bor
deleted file mode 100644
index 6c48e83425c..00000000000
--- a/TAO/examples/ior_corbaloc/client.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ior_corbaloc client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\corbalocS.obj \
- $(OBJDIR)\corbalocC.obj \
- $(OBJDIR)\ior_corbaloc_client_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.bor b/TAO/examples/ior_corbaloc/corbaname_client.bor
deleted file mode 100644
index d8d7a1f7f7b..00000000000
--- a/TAO/examples/ior_corbaloc/corbaname_client.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ior_corbaloc corbaname_client
-#
-
-NAME = corbaname_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\corbalocS.obj \
- $(OBJDIR)\corbalocC.obj \
- $(OBJDIR)\ior_corbaloc_client_i.obj \
- $(OBJDIR)\corbaname_client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
- $(TAO_IDL) $**
diff --git a/TAO/examples/ior_corbaloc/server.bor b/TAO/examples/ior_corbaloc/server.bor
deleted file mode 100644
index 4cb5917f038..00000000000
--- a/TAO/examples/ior_corbaloc/server.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ior_corbaloc server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\corbalocS.obj \
- $(OBJDIR)\corbalocC.obj \
- $(OBJDIR)\status_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
- $(TAO_IDL) $**
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) $**
-
diff --git a/TAO/tao/BiDir_GIOP/Makefile.bor b/TAO/tao/BiDir_GIOP/Makefile.bor
deleted file mode 100644
index 9bb43340e71..00000000000
--- a/TAO/tao/BiDir_GIOP/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO BiDirGIOP library
-#
-
-NAME = TAO_BiDirGIOP
-
-OBJFILES = \
- $(OBJDIR)\BiDirGIOP.obj \
- $(OBJDIR)\BiDirPolicyC.obj \
- $(OBJDIR)\BiDirPolicy_Validator.obj \
- $(OBJDIR)\BiDir_ORBInitializer.obj \
- $(OBJDIR)\BiDir_PolicyFactory.obj \
- $(OBJDIR)\BiDir_Policy_i.obj
-
-RESOURCE = $(OBJDIR)\TAO_BiDir_GIOP.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_BIDIRGIOP_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_BIDIRGIOP_CFLAGS) \
- -DTAO_BIDIRGIOP_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\BiDir_GIOP
-INCLUDES = *.h *.i *.inl BiDirPolicy.pidl
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Domain/Makefile.bor b/TAO/tao/Domain/Makefile.bor
deleted file mode 100644
index 843589e7186..00000000000
--- a/TAO/tao/Domain/Makefile.bor
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Domain library
-#
-
-NAME = TAO_Domain
-
-OBJFILES = \
- $(OBJDIR)\DomainS.obj
-
-RESOURCE = $(OBJDIR)\TAO_Domain.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DOMAIN_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DOMAIN_CFLAGS) \
- -DTAO_DOMAIN_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\Domain
-INCLUDES = \
- *.h *.i
-
-LIBFILES = \
- $(TAO_IFR_CLIENT_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/DynamicAny/Makefile.bor b/TAO/tao/DynamicAny/Makefile.bor
deleted file mode 100644
index 8173f9b8a7e..00000000000
--- a/TAO/tao/DynamicAny/Makefile.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO DynamicAny library
-#
-
-NAME = TAO_DynamicAny
-
-OBJFILES = \
- $(OBJDIR)\DynamicAny.obj \
- $(OBJDIR)\DynamicAnyC.obj \
- $(OBJDIR)\DynCommon.obj \
- $(OBJDIR)\DynAny_i.obj \
- $(OBJDIR)\DynAnyFactory.obj \
- $(OBJDIR)\DynArray_i.obj \
- $(OBJDIR)\DynEnum_i.obj \
- $(OBJDIR)\DynSequence_i.obj \
- $(OBJDIR)\DynStruct_i.obj \
- $(OBJDIR)\DynUnion_i.obj
-
-RESOURCE = $(OBJDIR)\TAO_DynamicAny.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICANY_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICANY_CFLAGS) \
- -DTAO_DYNAMICANY_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\DynamicAny
-INCLUDES = *.h *.i DynamicAny.pidl
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/DynamicInterface/Makefile.bor b/TAO/tao/DynamicInterface/Makefile.bor
deleted file mode 100644
index 1f324f0b696..00000000000
--- a/TAO/tao/DynamicInterface/Makefile.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO DynamicInterface library
-#
-
-NAME = TAO_DynamicInterface
-
-OBJFILES = \
- $(OBJDIR)\Context.obj \
- $(OBJDIR)\DII_Arguments.obj \
- $(OBJDIR)\DII_Invocation.obj \
- $(OBJDIR)\DII_Invocation_Adapter.obj \
- $(OBJDIR)\DII_Reply_Dispatcher.obj \
- $(OBJDIR)\Dynamic_Adapter_Impl.obj \
- $(OBJDIR)\Dynamic_Implementation.obj \
- $(OBJDIR)\ExceptionList.obj \
- $(OBJDIR)\Request.obj \
- $(OBJDIR)\Server_Request.obj \
- $(OBJDIR)\Unknown_User_Exception.obj
-
-RESOURCE = $(OBJDIR)\TAO_DynamicInterface.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) $(TAO_MESSAGING_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) $(TAO_MESSAGING_CFLAGS) \
- -DTAO_DYNAMICINTERFACE_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\DynamicInterface
-INCLUDES = *.h *.inl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/IFR_Client/Makefile.bor b/TAO/tao/IFR_Client/Makefile.bor
deleted file mode 100644
index f279e112f3e..00000000000
--- a/TAO/tao/IFR_Client/Makefile.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO IFR Client library
-#
-
-NAME = TAO_IFR_Client
-
-OBJFILES = \
- $(OBJDIR)\IFR_BaseC.obj \
- $(OBJDIR)\IFR_BasicC.obj \
- $(OBJDIR)\IFR_ExtendedC.obj \
- $(OBJDIR)\IFR_ComponentsC.obj \
- $(OBJDIR)\IFR_Client_Adapter_Impl.obj
-
-RESOURCE = $(OBJDIR)\TAO_IFR_Client.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IFR_CLIENT_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IFR_CLIENT_CFLAGS) \
- -DTAO_IFR_CLIENT_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\IFR_Client
-INCLUDES = \
- *.h *.i *.pidl
-
-LIBFILES = \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/IORInterceptor/Makefile.bor b/TAO/tao/IORInterceptor/Makefile.bor
deleted file mode 100644
index c9f126590fa..00000000000
--- a/TAO/tao/IORInterceptor/Makefile.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO IORInterceptor library
-#
-
-NAME = TAO_IORInterceptor
-
-OBJFILES = \
- $(OBJDIR)\IORInterceptorC.obj \
- $(OBJDIR)\IORInterceptor_List.obj \
- $(OBJDIR)\IORInterceptor_Adapter_Impl.obj \
- $(OBJDIR)\IORInterceptor_Adapter_Factory_Impl.obj
-
-RESOURCE = $(OBJDIR)\TAO_IORInterceptor.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- -DTAO_IORINTERCEPTOR_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\IORInterceptor
-INCLUDES = \
- *.h *.i \
- IORInterceptor.pidl
-
-LIBFILES = \
- $(TAO_LIB) \
- $(ACE_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_ORT_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/IORManipulation/Makefile.bor b/TAO/tao/IORManipulation/Makefile.bor
deleted file mode 100644
index 0c348a02b40..00000000000
--- a/TAO/tao/IORManipulation/Makefile.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO IORManipulation library
-#
-
-NAME = TAO_IORManip
-
-OBJFILES = \
- $(OBJDIR)\IORC.obj \
- $(OBJDIR)\IORManip_Loader.obj \
- $(OBJDIR)\IORManipulation.obj \
-
-RESOURCE = $(OBJDIR)\TAO_IORManip.res
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORMANIP_CFLAGS) \
- -DTAO_IORMANIP_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\IORManipulation
-INCLUDES = \
- *.h *.i
-
-LIBFILES = $(TAO_LIB) $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/IORTable/Makefile.bor b/TAO/tao/IORTable/Makefile.bor
deleted file mode 100644
index 51330ec7fda..00000000000
--- a/TAO/tao/IORTable/Makefile.bor
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO IORTable library
-#
-
-NAME = TAO_IORTable
-
-OBJFILES = \
- $(OBJDIR)\IORTable.obj \
- $(OBJDIR)\IORTableC.obj \
- $(OBJDIR)\Table_Adapter.obj \
- $(OBJDIR)\IOR_Table_Impl.obj
-
-RESOURCE = $(OBJDIR)\TAO_IORTable.res
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORTABLE_CFLAGS) \
- -DTAO_IORTABLE_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\IORTable
-INCLUDES = \
- *.h *.i \
- IORTable.pidl
-
-LIBFILES = $(TAO_LIB) $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
deleted file mode 100644
index da6d84c583f..00000000000
--- a/TAO/tao/Makefile.bor
+++ /dev/null
@@ -1,301 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO library
-#
-
-NAME = TAO
-
-DIRS = \
- Valuetype \
- ObjRefTemplate \
- IORInterceptor \
- PortableServer \
- Messaging \
- DynamicAny \
- DynamicInterface \
- BiDir_GIOP \
- IORTable \
- IORManipulation \
- Strategies \
- IFR_Client \
- Domain \
- TypeCodeFactory \
- SmartProxies \
- RTCORBA \
- RTPortableServer \
- RTScheduling
-
-OBJFILES = \
- $(OBJDIR)\Abstract_Servant_Base.obj \
- $(OBJDIR)\Acceptor_Filter.obj \
- $(OBJDIR)\Acceptor_Registry.obj \
- $(OBJDIR)\Adapter.obj \
- $(OBJDIR)\Any.obj \
- $(OBJDIR)\Any_Basic_Impl.obj \
- $(OBJDIR)\Any_Impl.obj \
- $(OBJDIR)\Any_Unknown_IDL_Type.obj \
- $(OBJDIR)\Any_SystemException.obj \
- $(OBJDIR)\Argument.obj \
- $(OBJDIR)\Asynch_Queued_Message.obj \
- $(OBJDIR)\Asynch_Reply_Dispatcher_Base.obj \
- $(OBJDIR)\Base_Transport_Property.obj \
- $(OBJDIR)\Basic_Arguments.obj \
- $(OBJDIR)\BiDir_Adapter.obj \
- $(OBJDIR)\Bind_Dispatcher_Guard.obj \
- $(OBJDIR)\Block_Flushing_Strategy.obj \
- $(OBJDIR)\Blocked_Connect_Strategy.obj \
- $(OBJDIR)\BoundsC.obj \
- $(OBJDIR)\BoundsA.obj \
- $(OBJDIR)\Buffering_Constraint_Policy.obj \
- $(OBJDIR)\CDR.obj \
- $(OBJDIR)\CDR_Encaps_Codec.obj \
- $(OBJDIR)\Collocated_Invocation.obj \
- $(OBJDIR)\CONV_FRAMEC.obj \
- $(OBJDIR)\CONV_FRAMEA.obj \
- $(OBJDIR)\CORBALOC_Parser.obj \
- $(OBJDIR)\CORBANAME_Parser.obj \
- $(OBJDIR)\CORBA_String.obj \
- $(OBJDIR)\Cache_Entries.obj \
- $(OBJDIR)\Cleanup_Func_Registry.obj \
- $(OBJDIR)\ClientRequestInterceptor_Adapter.obj \
- $(OBJDIR)\ClientRequestInfo.obj \
- $(OBJDIR)\ClientRequestInfo_i.obj \
- $(OBJDIR)\Client_Strategy_Factory.obj \
- $(OBJDIR)\CodecFactory.obj \
- $(OBJDIR)\CodecFactory_ORBInitializer.obj \
- $(OBJDIR)\Codeset_Manager.obj \
- $(OBJDIR)\Codeset_Translator_Factory.obj \
- $(OBJDIR)\Collocation_Resolver.obj \
- $(OBJDIR)\Connect_Strategy.obj \
- $(OBJDIR)\Default_Collocation_Resolver.obj \
- $(OBJDIR)\Connection_Purging_Strategy.obj \
- $(OBJDIR)\Connection_Handler.obj \
- $(OBJDIR)\Thread_Per_Connection_Handler.obj \
- $(OBJDIR)\Connector_Impl.obj \
- $(OBJDIR)\Connector_Registry.obj \
- $(OBJDIR)\CurrentC.obj \
- $(OBJDIR)\CurrentA.obj \
- $(OBJDIR)\DLL_ORB.obj \
- $(OBJDIR)\DLL_Parser.obj \
- $(OBJDIR)\Default_Endpoint_Selector_Factory.obj \
- $(OBJDIR)\Default_Protocols_Hooks.obj \
- $(OBJDIR)\Default_Stub_Factory.obj \
- $(OBJDIR)\Default_Thread_Lane_Resources_Manager.obj \
- $(OBJDIR)\DomainC.obj \
- $(OBJDIR)\DomainA.obj \
- $(OBJDIR)\DynamicC.obj \
- $(OBJDIR)\DynamicA.obj \
- $(OBJDIR)\Dynamic_Adapter.obj \
- $(OBJDIR)\Dynamic_ParameterC.obj \
- $(OBJDIR)\Dynamic_ParameterA.obj \
- $(OBJDIR)\Encodable.obj \
- $(OBJDIR)\Endpoint.obj \
- $(OBJDIR)\Endpoint_Selector_Factory.obj \
- $(OBJDIR)\Environment.obj \
- $(OBJDIR)\Exception.obj \
- $(OBJDIR)\Exclusive_TMS.obj \
- $(OBJDIR)\FILE_Parser.obj \
- $(OBJDIR)\Fault_Tolerance_Service.obj \
- $(OBJDIR)\Flushing_Strategy.obj \
- $(OBJDIR)\GIOPC.obj \
- $(OBJDIR)\GIOPA.obj \
- $(OBJDIR)\GIOP_Message_Base.obj \
- $(OBJDIR)\GIOP_Message_Generator_Parser.obj \
- $(OBJDIR)\GIOP_Message_Generator_Parser_10.obj \
- $(OBJDIR)\GIOP_Message_Generator_Parser_11.obj \
- $(OBJDIR)\GIOP_Message_Generator_Parser_12.obj \
- $(OBJDIR)\GIOP_Message_Generator_Parser_Impl.obj \
- $(OBJDIR)\GIOP_Message_Lite.obj \
- $(OBJDIR)\GIOP_Message_Locate_Header.obj \
- $(OBJDIR)\GIOP_Message_State.obj \
- $(OBJDIR)\GIOP_Message_Version.obj \
- $(OBJDIR)\GIOP_Utils.obj \
- $(OBJDIR)\IFR_Client_Adapter.obj \
- $(OBJDIR)\IIOPC.obj \
- $(OBJDIR)\IIOPA.obj \
- $(OBJDIR)\IOP_CodecC.obj \
- $(OBJDIR)\IOP_CodecA.obj \
- $(OBJDIR)\IOP_IORC.obj \
- $(OBJDIR)\IOP_IORA.obj \
- $(OBJDIR)\IIOP_Acceptor.obj \
- $(OBJDIR)\IIOP_Connection_Handler.obj \
- $(OBJDIR)\IIOP_Connector.obj \
- $(OBJDIR)\IIOP_Endpoint.obj \
- $(OBJDIR)\IIOP_EndpointsC.obj \
- $(OBJDIR)\IIOP_EndpointsA.obj \
- $(OBJDIR)\IIOP_Factory.obj \
- $(OBJDIR)\IIOP_Lite_Factory.obj \
- $(OBJDIR)\IIOP_Profile.obj \
- $(OBJDIR)\IIOP_Transport.obj \
- $(OBJDIR)\IOPC.obj \
- $(OBJDIR)\IORInterceptor_Adapter.obj \
- $(OBJDIR)\IORInterceptor_Adapter_Factory.obj \
- $(OBJDIR)\IOR_Parser.obj \
- $(OBJDIR)\Incoming_Message_Queue.obj \
- $(OBJDIR)\Interceptor_List.obj \
- $(OBJDIR)\Invocation_Adapter.obj \
- $(OBJDIR)\Invocation_Base.obj \
- $(OBJDIR)\Invocation_Endpoint_Selectors.obj \
- $(OBJDIR)\LF_Event.obj \
- $(OBJDIR)\LF_Invocation_Event.obj \
- $(OBJDIR)\LF_CH_Event.obj \
- $(OBJDIR)\LF_Event_Binder.obj \
- $(OBJDIR)\LF_Event_Loop_Thread_Helper.obj \
- $(OBJDIR)\LF_Follower.obj \
- $(OBJDIR)\LF_Follower_Auto_Adder.obj \
- $(OBJDIR)\LF_Follower_Auto_Ptr.obj \
- $(OBJDIR)\LF_Connect_Strategy.obj \
- $(OBJDIR)\LF_Strategy.obj \
- $(OBJDIR)\LF_Strategy_Complete.obj \
- $(OBJDIR)\LRU_Connection_Purging_Strategy.obj \
- $(OBJDIR)\Leader_Follower.obj \
- $(OBJDIR)\Leader_Follower_Flushing_Strategy.obj \
- $(OBJDIR)\LocalObject.obj \
- $(OBJDIR)\LocateRequest_Invocation.obj \
- $(OBJDIR)\LocateRequest_Invocation_Adapter.obj \
- $(OBJDIR)\MProfile.obj \
- $(OBJDIR)\Managed_Types.obj \
- $(OBJDIR)\Marshal.obj \
- $(OBJDIR)\MCAST_Parser.obj \
- $(OBJDIR)\Messaging_PolicyValueC.obj \
- $(OBJDIR)\Messaging_PolicyValueA.obj \
- $(OBJDIR)\Messaging_SyncScopeC.obj \
- $(OBJDIR)\Muxed_TMS.obj \
- $(OBJDIR)\NVList.obj \
- $(OBJDIR)\ORB.obj \
- $(OBJDIR)\ORBInitInfo.obj \
- $(OBJDIR)\ORBInitializer_Registry.obj \
- $(OBJDIR)\ORB_Core.obj \
- $(OBJDIR)\ORB_Core_Auto_Ptr.obj \
- $(OBJDIR)\ORB_Table.obj \
- $(OBJDIR)\Object.obj \
- $(OBJDIR)\ObjectIdListC.obj \
- $(OBJDIR)\ObjectKey_Table.obj \
- $(OBJDIR)\Object_KeyC.obj \
- $(OBJDIR)\Object_Loader.obj \
- $(OBJDIR)\Object_Proxy_Broker.obj \
- $(OBJDIR)\Object_Proxy_Impl.obj \
- $(OBJDIR)\Object_Ref_Table.obj \
- $(OBJDIR)\ParameterMode.obj \
- $(OBJDIR)\Parser_Registry.obj \
- $(OBJDIR)\PICurrent.obj \
- $(OBJDIR)\PICurrent_Copy_Callback.obj \
- $(OBJDIR)\PICurrent_ORBInitializer.obj \
- $(OBJDIR)\PI_ForwardC.obj \
- $(OBJDIR)\Pluggable_Messaging.obj \
- $(OBJDIR)\Pluggable_Messaging_Utils.obj \
- $(OBJDIR)\Policy_ForwardC.obj \
- $(OBJDIR)\Policy_ForwardA.obj \
- $(OBJDIR)\PolicyC.obj \
- $(OBJDIR)\PolicyA.obj \
- $(OBJDIR)\PolicyFactory_Registry.obj \
- $(OBJDIR)\Policy_Manager.obj \
- $(OBJDIR)\Policy_Set.obj \
- $(OBJDIR)\Policy_Validator.obj \
- $(OBJDIR)\PollableC.obj \
- $(OBJDIR)\PortableInterceptorC.obj \
- $(OBJDIR)\PortableInterceptorA.obj \
- $(OBJDIR)\PredefinedType_Seq_Tmplinst.obj \
- $(OBJDIR)\Principal.obj \
- $(OBJDIR)\Profile.obj \
- $(OBJDIR)\Profile_Transport_Resolver.obj \
- $(OBJDIR)\Protocol_Factory.obj \
- $(OBJDIR)\Protocols_Hooks.obj \
- $(OBJDIR)\Queued_Message.obj \
- $(OBJDIR)\Reactive_Connect_Strategy.obj \
- $(OBJDIR)\Reactive_Flushing_Strategy.obj \
- $(OBJDIR)\Refcounted_ObjectKey.obj \
- $(OBJDIR)\Remote_Invocation.obj \
- $(OBJDIR)\Remote_Object_Proxy_Broker.obj \
- $(OBJDIR)\Reply_Dispatcher.obj \
- $(OBJDIR)\RequestInfo_Util.obj \
- $(OBJDIR)\Request_Dispatcher.obj \
- $(OBJDIR)\Resource_Factory.obj \
- $(OBJDIR)\Resume_Handle.obj \
- $(OBJDIR)\Sequence.obj \
- $(OBJDIR)\Server_Strategy_Factory.obj \
- $(OBJDIR)\Service_Callbacks.obj \
- $(OBJDIR)\Service_Context.obj \
- $(OBJDIR)\ServicesC.obj \
- $(OBJDIR)\ServicesA.obj \
- $(OBJDIR)\Services_Activate.obj \
- $(OBJDIR)\Special_Basic_Arguments.obj \
- $(OBJDIR)\BooleanSeqC.obj \
- $(OBJDIR)\BooleanSeqA.obj \
- $(OBJDIR)\FloatSeqC.obj \
- $(OBJDIR)\FloatSeqA.obj \
- $(OBJDIR)\OctetSeqC.obj \
- $(OBJDIR)\OctetSeqA.obj \
- $(OBJDIR)\ShortSeqC.obj \
- $(OBJDIR)\ShortSeqA.obj \
- $(OBJDIR)\StringSeqC.obj \
- $(OBJDIR)\StringSeqA.obj \
- $(OBJDIR)\ULongSeqC.obj \
- $(OBJDIR)\ULongSeqA.obj \
- $(OBJDIR)\UShortSeqC.obj \
- $(OBJDIR)\UShortSeqA.obj \
- $(OBJDIR)\Stub.obj \
- $(OBJDIR)\Stub_Factory.obj \
- $(OBJDIR)\Sync_Strategies.obj \
- $(OBJDIR)\Synch_Invocation.obj \
- $(OBJDIR)\Synch_Queued_Message.obj \
- $(OBJDIR)\Synch_Refcountable.obj \
- $(OBJDIR)\Synch_Reply_Dispatcher.obj \
- $(OBJDIR)\TAOC.obj \
- $(OBJDIR)\TAOA.obj \
- $(OBJDIR)\TAO_Internal.obj \
- $(OBJDIR)\TAO_Server_Request.obj \
- $(OBJDIR)\TAO_Singleton_Manager.obj \
- $(OBJDIR)\TSS_Resources.obj \
- $(OBJDIR)\Tagged_Components.obj \
- $(OBJDIR)\Tagged_Profile.obj \
- $(OBJDIR)\Thread_Lane_Resources.obj \
- $(OBJDIR)\Thread_Lane_Resources_Manager.obj \
- $(OBJDIR)\TimeBaseC.obj \
- $(OBJDIR)\TimeBaseA.obj \
- $(OBJDIR)\Transport.obj \
- $(OBJDIR)\Transport_Acceptor.obj \
- $(OBJDIR)\Transport_Cache_Manager.obj \
- $(OBJDIR)\Transport_Connector.obj \
- $(OBJDIR)\Transport_Descriptor_Interface.obj \
- $(OBJDIR)\Transport_Mux_Strategy.obj \
- $(OBJDIR)\Transport_Timer.obj \
- $(OBJDIR)\TypeCodeFactory_Adapter.obj \
- $(OBJDIR)\Typecode.obj \
- $(OBJDIR)\Typecode_Constants.obj \
- $(OBJDIR)\UB_String_Arguments.obj \
- $(OBJDIR)\Valuetype_Adapter.obj \
- $(OBJDIR)\Wait_On_Leader_Follower.obj \
- $(OBJDIR)\Wait_On_Reactor.obj \
- $(OBJDIR)\Wait_On_Read.obj \
- $(OBJDIR)\Wait_Strategy.obj \
- $(OBJDIR)\WrongTransactionC.obj \
- $(OBJDIR)\WrongTransactionA.obj \
- $(OBJDIR)\append.obj \
- $(OBJDIR)\debug.obj \
- $(OBJDIR)\default_client.obj \
- $(OBJDIR)\default_resource.obj \
- $(OBJDIR)\default_server.obj \
- $(OBJDIR)\operation_details.obj \
- $(OBJDIR)\operation_details.obj \
- $(OBJDIR)\params.obj \
- $(OBJDIR)\skip.obj \
- $(OBJDIR)\target_specification.obj
-
-RESOURCE = $(OBJDIR)\tao.res
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DTAO_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao
-INCLUDES = \
- *.h *.i *.inl *_T.cpp *.pidl \
- TAO_Singleton.cpp \
- Condition.cpp \
- orb.idl
-
-LIBFILES = $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/Messaging/Makefile.bor b/TAO/tao/Messaging/Makefile.bor
deleted file mode 100644
index 19149239011..00000000000
--- a/TAO/tao/Messaging/Makefile.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Messaging library
-#
-
-NAME = TAO_Messaging
-
-OBJFILES = \
- $(OBJDIR)\Messaging.obj \
- $(OBJDIR)\MessagingC.obj \
- $(OBJDIR)\Messaging_RT_PolicyC.obj \
- $(OBJDIR)\Messaging_SyncScope_PolicyC.obj \
- $(OBJDIR)\Messaging_No_ImplC.obj \
- $(OBJDIR)\MessagingS.obj \
- $(OBJDIR)\MessagingS_T.obj \
- $(OBJDIR)\Asynch_Reply_Dispatcher.obj \
- $(OBJDIR)\Asynch_Timeout_Handler.obj \
- $(OBJDIR)\Asynch_Invocation_Adapter.obj \
- $(OBJDIR)\Asynch_Invocation.obj \
- $(OBJDIR)\Connection_Timeout_Policy_i.obj \
- $(OBJDIR)\Messaging_ORBInitializer.obj \
- $(OBJDIR)\Messaging_PolicyFactory.obj \
- $(OBJDIR)\Messaging_Policy_i.obj \
- $(OBJDIR)\TAO_ExtC.obj
-
-RESOURCE = $(OBJDIR)\TAO_Messaging.res
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- -DTAO_MESSAGING_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\Messaging
-INCLUDES = \
- *.h *.i *_T.cpp\
- Messaging.pidl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/ObjRefTemplate/Makefile.bor b/TAO/tao/ObjRefTemplate/Makefile.bor
deleted file mode 100644
index c56c4359f4c..00000000000
--- a/TAO/tao/ObjRefTemplate/Makefile.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO ObjRefTemplate library
-#
-
-NAME = TAO_ObjRefTemplate
-
-OBJFILES = \
- $(OBJDIR)\ObjectReferenceTemplateC.obj
-
-RESOURCE = $(OBJDIR)\TAO_ObjRefTemplate.res
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_ORT_CFLAGS) $(TAO_VALUETYPE_CFLAGS) \
- -DTAO_ORT_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\ObjRefTemplate
-INCLUDES = \
- *.h *.i \
- ObjectReferenceTemplate.pidl
-
-LIBFILES = $(TAO_VALUETYPE_LIB) $(TAO_LIB) $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
deleted file mode 100644
index 5cccd912126..00000000000
--- a/TAO/tao/PortableServer/Makefile.bor
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO PortableServer library
-#
-
-NAME = TAO_PortableServer
-
-OBJFILES = \
- $(OBJDIR)\Active_Object_Map.obj \
- $(OBJDIR)\AMH_Response_handler.obj \
- $(OBJDIR)\Collocated_Object_Proxy_Broker.obj \
- $(OBJDIR)\Default_Acceptor_Filter.obj \
- $(OBJDIR)\Default_Policy_Validator.obj \
- $(OBJDIR)\Default_ORTC.obj \
- $(OBJDIR)\Default_Servant_Dispatcher.obj \
- $(OBJDIR)\Direct_Object_Proxy_Impl.obj \
- $(OBJDIR)\ImR_LocatorC.obj \
- $(OBJDIR)\ImR_LocatorS.obj \
- $(OBJDIR)\ImplRepoC.obj \
- $(OBJDIR)\ImplRepoS.obj \
- $(OBJDIR)\IORInfo.obj \
- $(OBJDIR)\Key_Adapters.obj \
- $(OBJDIR)\Object_Adapter.obj \
- $(OBJDIR)\ObjectReferenceTemplate.obj \
- $(OBJDIR)\Operation_Table.obj \
- $(OBJDIR)\ORB_Manager.obj \
- $(OBJDIR)\ImplRepo_i.obj \
- $(OBJDIR)\PICurrent_Guard.obj \
- $(OBJDIR)\POA.obj \
- $(OBJDIR)\POAManager.obj \
- $(OBJDIR)\POA_Cached_Policies.obj \
- $(OBJDIR)\POA_Policies.obj \
- $(OBJDIR)\POA_Policy_Set.obj \
- $(OBJDIR)\PolicyS.obj \
- $(OBJDIR)\PortableGroup_Hooks.obj \
- $(OBJDIR)\PortableServer.obj \
- $(OBJDIR)\PortableServerC.obj \
- $(OBJDIR)\PortableServer_PolicyFactory.obj \
- $(OBJDIR)\PortableServer_ORBInitializer.obj \
- $(OBJDIR)\Servant_Base.obj \
- $(OBJDIR)\Servant_Dispatcher.obj \
- $(OBJDIR)\ServerInterceptorAdapter.obj \
- $(OBJDIR)\ServerRequestInfo.obj \
- $(OBJDIR)\ThruPOA_Object_Proxy_Impl.obj
-
-RESOURCE = $(OBJDIR)\TAO_PortableServer.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) $(TAO_ORT_CFLAGS) $(TAO_VALUETYPE_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) -DTAO_PORTABLESERVER_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\PortableServer
-INCLUDES = *.h *.i *.inl *_T.cpp PortableServer.pidl ImplRepo.pidl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/RTCORBA/Makefile.bor b/TAO/tao/RTCORBA/Makefile.bor
deleted file mode 100644
index edcff4f91b1..00000000000
--- a/TAO/tao/RTCORBA/Makefile.bor
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO RTCorba library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_RTCORBA
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\Continuous_Priority_Mapping.obj \
- $(OBJDIR)\Direct_Priority_Mapping.obj \
- $(OBJDIR)\Linear_Priority_Mapping.obj \
- $(OBJDIR)\RT_Thread_Lane_Resources_Manager.obj \
- $(OBJDIR)\Priority_Mapping.obj \
- $(OBJDIR)\Priority_Mapping_Manager.obj \
- $(OBJDIR)\Linear_Network_Priority_Mapping.obj \
- $(OBJDIR)\Network_Priority_Mapping.obj \
- $(OBJDIR)\Network_Priority_Mapping_Manager.obj \
- $(OBJDIR)\RT_Transport_Descriptor.obj \
- $(OBJDIR)\RT_Transport_Descriptor_Property.obj \
- $(OBJDIR)\RTCORBA.obj \
- $(OBJDIR)\RTCORBAC.obj \
- $(OBJDIR)\RT_Current.obj \
- $(OBJDIR)\RT_Endpoint_Selector_Factory.obj \
- $(OBJDIR)\RT_Endpoint_Utils.obj \
- $(OBJDIR)\RT_Invocation_Endpoint_Selectors.obj \
- $(OBJDIR)\RT_Mutex.obj \
- $(OBJDIR)\RT_ORB.obj \
- $(OBJDIR)\RT_ORBInitializer.obj \
- $(OBJDIR)\RT_ORB_Loader.obj \
- $(OBJDIR)\RT_PolicyFactory.obj \
- $(OBJDIR)\RT_Policy_i.obj \
- $(OBJDIR)\RT_Protocols_Hooks.obj \
- $(OBJDIR)\RT_Stub.obj \
- $(OBJDIR)\RT_Stub_Factory.obj \
- $(OBJDIR)\Thread_Pool.obj
-
-RESOURCE = $(OBJDIR)\TAO_RTCORBA.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS) \
- -DTAO_RTCORBA_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\RTCORBA
-INCLUDES = *.h *.i *.inl *.pidl
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/RTPortableServer/Makefile.bor b/TAO/tao/RTPortableServer/Makefile.bor
deleted file mode 100644
index a1718e4838f..00000000000
--- a/TAO/tao/RTPortableServer/Makefile.bor
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO RTPortableServer library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_RTPortableServer
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\RTPortableServer.obj \
- $(OBJDIR)\RTPortableServerC.obj \
- $(OBJDIR)\RTPortableServerA.obj \
- $(OBJDIR)\RT_Acceptor_Filters.obj \
- $(OBJDIR)\RT_Collocation_Resolver.obj \
- $(OBJDIR)\RT_Object_Adapter_Factory.obj \
- $(OBJDIR)\RT_POA.obj \
- $(OBJDIR)\RT_Policy_Validator.obj \
- $(OBJDIR)\RT_Servant_Dispatcher.obj
-
-RESOURCE = $(OBJDIR)\TAO_RTPortableServer.res
-
-!ifdef STATIC
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-!else
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS) \
- -DTAO_RTPORTABLESERVER_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\RTPortableServer
-INCLUDES = *.h *.i *.pidl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/RTScheduling/Makefile.bor b/TAO/tao/RTScheduling/Makefile.bor
deleted file mode 100644
index d44615a10cc..00000000000
--- a/TAO/tao/RTScheduling/Makefile.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO RTCorba library
-#
-
-!ifndef MINIMUM_CORBA
-NAME = TAO_RTScheduler
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\RTScheduler.obj \
- $(OBJDIR)\RTSchedulerC.obj \
- $(OBJDIR)\RTScheduler_Loader.obj \
- $(OBJDIR)\RTScheduler_Initializer.obj \
- $(OBJDIR)\RTScheduler_Manager.obj \
- $(OBJDIR)\Current.obj \
- $(OBJDIR)\Request_Interceptor.obj \
- $(OBJDIR)\Distributable_Thread.obj
-
-RESOURCE = $(OBJDIR)\TAO_RTScheduler.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) $(TAO_RTSCHEDULER_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTCORBA_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) $(TAO_RTSCHEDULER_CFLAGS) \
- -DTAO_RTSCHEDULER_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\RTScheduler
-INCLUDES = *.h *.i *.pidl
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_RTCORBA_LIB) $(TAO_PORTABLESERVER_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/SmartProxies/Makefile.bor b/TAO/tao/SmartProxies/Makefile.bor
deleted file mode 100644
index 154a38f79c3..00000000000
--- a/TAO/tao/SmartProxies/Makefile.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Smart Proxies library
-#
-
-NAME = TAO_SmartProxies
-
-OBJFILES = \
- $(OBJDIR)\Smart_Proxies.obj
-
-RESOURCE = $(OBJDIR)\SmartProxies.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) \
- -DTAO_SMARTPROXIES_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\SmartProxies
-INCLUDES = \
- *.h *.inl
-
-LIBFILES = \
- $(TAO_LIB) \
- $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Strategies/Makefile.bor b/TAO/tao/Strategies/Makefile.bor
deleted file mode 100644
index 64042780bbe..00000000000
--- a/TAO/tao/Strategies/Makefile.bor
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Strategies library
-#
-
-NAME = TAO_Strategies
-
-OBJFILES = \
- $(OBJDIR)\UIOP_Factory.obj \
- $(OBJDIR)\UIOP_Lite_Factory.obj \
- $(OBJDIR)\UIOP_Profile.obj \
- $(OBJDIR)\UIOP_Transport.obj \
- $(OBJDIR)\UIOP_Connector.obj \
- $(OBJDIR)\UIOP_Acceptor.obj \
- $(OBJDIR)\UIOP_Connection_Handler.obj \
- $(OBJDIR)\UIOP_Endpoint.obj \
- $(OBJDIR)\SHMIOP_Factory.obj \
- $(OBJDIR)\SHMIOP_Profile.obj \
- $(OBJDIR)\SHMIOP_Transport.obj \
- $(OBJDIR)\SHMIOP_Connector.obj \
- $(OBJDIR)\SHMIOP_Acceptor.obj \
- $(OBJDIR)\SHMIOP_Connection_Handler.obj \
- $(OBJDIR)\SHMIOP_Endpoint.obj \
- $(OBJDIR)\DIOP_Factory.obj \
- $(OBJDIR)\DIOP_Profile.obj \
- $(OBJDIR)\DIOP_Transport.obj \
- $(OBJDIR)\DIOP_Connector.obj \
- $(OBJDIR)\DIOP_Acceptor.obj \
- $(OBJDIR)\DIOP_Connection_Handler.obj \
- $(OBJDIR)\DIOP_Endpoint.obj \
- $(OBJDIR)\uiop_endpoints.obj \
- $(OBJDIR)\SCIOP_Acceptor.obj \
- $(OBJDIR)\SCIOP_Connection_Handler.obj \
- $(OBJDIR)\SCIOP_Connector.obj \
- $(OBJDIR)\SCIOP_Endpoint.obj \
- $(OBJDIR)\SCIOP_Factory.obj \
- $(OBJDIR)\SCIOP_Lite_Factory.obj \
- $(OBJDIR)\SCIOP_Profile.obj \
- $(OBJDIR)\SCIOP_Transport.obj \
- $(OBJDIR)\sciop_endpoints.obj \
- $(OBJDIR)\advanced_resource.obj \
- $(OBJDIR)\FIFO_Connection_Purging_Strategy.obj \
- $(OBJDIR)\LFU_Connection_Purging_Strategy.obj \
- $(OBJDIR)\NULL_Connection_Purging_Strategy.obj \
- $(OBJDIR)\LF_Strategy_Null.obj
-
-RESOURCE = $(OBJDIR)\TAO_Strategies.res
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_STRATEGIES_CFLAGS)
-!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_STRATEGIES_CFLAGS) \
- -DTAO_STRATEGIES_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\Strategies
-INCLUDES = *.h *.i *.inl *.pidl
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/TypeCodeFactory/Makefile.bor b/TAO/tao/TypeCodeFactory/Makefile.bor
deleted file mode 100644
index 3c0c575e0db..00000000000
--- a/TAO/tao/TypeCodeFactory/Makefile.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the TypeCodeFactory library
-#
-
-NAME = TAO_TypeCodeFactory
-
-OBJFILES = \
- $(OBJDIR)\TypeCodeFactoryC.obj \
- $(OBJDIR)\TypeCodeFactory_i.obj \
- $(OBJDIR)\TypeCodeFactory_Loader.obj \
- $(OBJDIR)\TypeCodeFactory_Adapter_Impl.obj
-
-RESOURCE = $(OBJDIR)\TypeCodeFactory.res
-
-!ifdef STATIC
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_TYPECODEFACTORY_CFLAGS)
-!else
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IFR_CLIENT_CFLAGS) \
- $(TAO_TYPECODEFACTORY_CFLAGS) \
- -DTAO_TYPECODEFACTORY_BUILD_DLL=1
-!endif
-
-CPPDIR = .
-
-INCDIR_NAME = tao\TypeCodeFactory
-INCLUDES = *.h *.inl *.pidl
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IFR_CLIENT_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Valuetype/Makefile.bor b/TAO/tao/Valuetype/Makefile.bor
deleted file mode 100644
index ed9fe7d9ce2..00000000000
--- a/TAO/tao/Valuetype/Makefile.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Valuetype library
-#
-
-NAME = TAO_Valuetype
-
-OBJFILES = \
- $(OBJDIR)\ValueBase.obj \
- $(OBJDIR)\AbstractBase.obj \
- $(OBJDIR)\ValueFactory.obj \
- $(OBJDIR)\ValueFactory_Map.obj \
- $(OBJDIR)\Valuetype_Adapter_Impl.obj \
- $(OBJDIR)\AbstractBase_Invocation_Adapter.obj \
- $(OBJDIR)\Seq_Tmplinst.obj
-
-RESOURCE = $(OBJDIR)\TAO_Valuetype.res
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_VALUETYPE_CFLAGS) \
- -DTAO_VALUETYPE_BUILD_DLL
-
-CPPDIR = .
-
-INCDIR_NAME = tao\Valuetype
-INCLUDES = \
- *.h *.inl *_T.cpp
-
-LIBFILES = $(TAO_LIB) $(ACE_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMH_Exceptions/Makefile.bor b/TAO/tests/AMH_Exceptions/Makefile.bor
deleted file mode 100644
index 7907e7472ab..00000000000
--- a/TAO/tests/AMH_Exceptions/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Exceptions test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMH_Exceptions/client.bor b/TAO/tests/AMH_Exceptions/client.bor
deleted file mode 100644
index 430d33d3ea8..00000000000
--- a/TAO/tests/AMH_Exceptions/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Exceptions client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_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/tests/AMH_Exceptions/server.bor b/TAO/tests/AMH_Exceptions/server.bor
deleted file mode 100644
index 794a07cc0dd..00000000000
--- a/TAO/tests/AMH_Exceptions/server.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Exceptions server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMH_Oneway/Makefile.bor b/TAO/tests/AMH_Oneway/Makefile.bor
deleted file mode 100644
index 9b2f7a6c8e3..00000000000
--- a/TAO/tests/AMH_Oneway/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Oneway test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMH_Oneway/client.bor b/TAO/tests/AMH_Oneway/client.bor
deleted file mode 100644
index 4e9061af02d..00000000000
--- a/TAO/tests/AMH_Oneway/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Oneway client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMH_Oneway/server.bor b/TAO/tests/AMH_Oneway/server.bor
deleted file mode 100644
index acc4d7a93e2..00000000000
--- a/TAO/tests/AMH_Oneway/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMH_Oneway server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMI/Makefile.bor b/TAO/tests/AMI/Makefile.bor
deleted file mode 100644
index d60753afc0c..00000000000
--- a/TAO/tests/AMI/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI test executables
-#
-
-MAKEFILES = server.bor client.bor simple_client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMI/client.bor b/TAO/tests/AMI/client.bor
deleted file mode 100644
index eabc44c6b3c..00000000000
--- a/TAO/tests/AMI/client.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\ami_testS.obj \
- $(OBJDIR)\ami_testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\ami_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ami_testS.cpp $(IDLDIR)\ami_testC.cpp: $(IDLDIR)\ami_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMI/server.bor b/TAO/tests/AMI/server.bor
deleted file mode 100644
index b6469a22785..00000000000
--- a/TAO/tests/AMI/server.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\ami_testS.obj \
- $(OBJDIR)\ami_testC.obj \
- $(OBJDIR)\ami_test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\ami_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ami_testS.cpp $(IDLDIR)\ami_testC.cpp: $(IDLDIR)\ami_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMI/simple_client.bor b/TAO/tests/AMI/simple_client.bor
deleted file mode 100644
index 62811f03d78..00000000000
--- a/TAO/tests/AMI/simple_client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-#
-# Makefile for building the AMI simple_client
-#
-
-NAME = simple_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\ami_testS.obj \
- $(OBJDIR)\ami_testC.obj \
- $(OBJDIR)\simple_client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\ami_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ami_testS.cpp $(IDLDIR)\ami_testC.cpp: $(IDLDIR)\ami_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMI_Buffering/Makefile.bor b/TAO/tests/AMI_Buffering/Makefile.bor
deleted file mode 100644
index ebf90391f43..00000000000
--- a/TAO/tests/AMI_Buffering/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = admin.bor server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMI_Buffering/admin.bor b/TAO/tests/AMI_Buffering/admin.bor
deleted file mode 100644
index a601c4b45fa..00000000000
--- a/TAO/tests/AMI_Buffering/admin.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = admin
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\AMI_Buffering_Admin.obj \
- $(OBJDIR)\admin.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_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) -GC $**
diff --git a/TAO/tests/AMI_Buffering/client.bor b/TAO/tests/AMI_Buffering/client.bor
deleted file mode 100644
index 5f2c2a0b8ed..00000000000
--- a/TAO/tests/AMI_Buffering/client.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Reply_Handler.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_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) -GC $**
diff --git a/TAO/tests/AMI_Buffering/server.bor b/TAO/tests/AMI_Buffering/server.bor
deleted file mode 100644
index 981331e5130..00000000000
--- a/TAO/tests/AMI_Buffering/server.bor
+++ /dev/null
@@ -1,47 +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)\AMI_Buffering.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_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) -GC $**
diff --git a/TAO/tests/AMI_Timeouts/Makefile.bor b/TAO/tests/AMI_Timeouts/Makefile.bor
deleted file mode 100644
index 2fb916fa941..00000000000
--- a/TAO/tests/AMI_Timeouts/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI timeout test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMI_Timeouts/client.bor b/TAO/tests/AMI_Timeouts/client.bor
deleted file mode 100644
index 994bba1a51e..00000000000
--- a/TAO/tests/AMI_Timeouts/client.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI timeout client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\timeoutS.obj \
- $(OBJDIR)\timeoutC.obj \
- $(OBJDIR)\timeout_i.obj \
- $(OBJDIR)\timeout_client.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\timeout.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\timeoutS.cpp $(IDLDIR)\timeoutC.cpp: $(IDLDIR)\timeout.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/AMI_Timeouts/server.bor b/TAO/tests/AMI_Timeouts/server.bor
deleted file mode 100644
index 1a096d3b4dc..00000000000
--- a/TAO/tests/AMI_Timeouts/server.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the AMI timeout server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\timeoutS.obj \
- $(OBJDIR)\timeoutC.obj \
- $(OBJDIR)\timeout_i.obj \
- $(OBJDIR)\timeout_client.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\timeout.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\timeoutS.cpp $(IDLDIR)\timeoutC.cpp: $(IDLDIR)\timeout.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Abstract_Interface/Makefile.bor b/TAO/tests/Abstract_Interface/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Abstract_Interface/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/tests/Abstract_Interface/client.bor b/TAO/tests/Abstract_Interface/client.bor
deleted file mode 100644
index 64dca39ee06..00000000000
--- a/TAO/tests/Abstract_Interface/client.bor
+++ /dev/null
@@ -1,37 +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) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/tests/Abstract_Interface/server.bor b/TAO/tests/Abstract_Interface/server.bor
deleted file mode 100644
index 8d2e753fd5d..00000000000
--- a/TAO/tests/Abstract_Interface/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)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_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/tests/BiDirectional/Makefile.bor b/TAO/tests/BiDirectional/Makefile.bor
deleted file mode 100644
index b4ad73c05ba..00000000000
--- a/TAO/tests/BiDirectional/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/BiDirectional/client.bor b/TAO/tests/BiDirectional/client.bor
deleted file mode 100644
index 73ecaf49542..00000000000
--- a/TAO/tests/BiDirectional/client.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the BiDirectional client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/BiDirectional/server.bor b/TAO/tests/BiDirectional/server.bor
deleted file mode 100644
index 4043eced926..00000000000
--- a/TAO/tests/BiDirectional/server.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the BiDirectional server
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor b/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor
deleted file mode 100644
index 01b587d0aba..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the BiDirectional_NestedUpcall test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.bor b/TAO/tests/BiDirectional_NestedUpcall/client.bor
deleted file mode 100644
index 6e315d203e6..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/client.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Makefile for building the BiDirectional_NestedUpcall client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.bor b/TAO/tests/BiDirectional_NestedUpcall/server.bor
deleted file mode 100644
index 11d3a96f64f..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Makefile for building the BiDirectional_NestedUpCall server
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Oneways/Makefile.bor b/TAO/tests/Big_Oneways/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Big_Oneways/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/tests/Big_Oneways/client.bor b/TAO/tests/Big_Oneways/client.bor
deleted file mode 100644
index 4bd5cc59755..00000000000
--- a/TAO/tests/Big_Oneways/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Peer.obj \
- $(OBJDIR)\Session.obj \
- $(OBJDIR)\Session_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Oneways/server.bor b/TAO/tests/Big_Oneways/server.bor
deleted file mode 100644
index 9abb1dd1854..00000000000
--- a/TAO/tests/Big_Oneways/server.bor
+++ /dev/null
@@ -1,46 +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)\Coordinator.obj \
- $(OBJDIR)\Session_Control.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Reply/Makefile.bor b/TAO/tests/Big_Reply/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Big_Reply/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Big_Reply/client.bor b/TAO/tests/Big_Reply/client.bor
deleted file mode 100644
index 166e95da035..00000000000
--- a/TAO/tests/Big_Reply/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\Client_Task.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/tests/Big_Reply/server.bor b/TAO/tests/Big_Reply/server.bor
deleted file mode 100644
index 5d67a2482cf..00000000000
--- a/TAO/tests/Big_Reply/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Big_Reply_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Request_Muxing/Makefile.bor b/TAO/tests/Big_Request_Muxing/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Big_Request_Muxing/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/tests/Big_Request_Muxing/client.bor b/TAO/tests/Big_Request_Muxing/client.bor
deleted file mode 100644
index 202ebbfcc34..00000000000
--- a/TAO/tests/Big_Request_Muxing/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Request_Muxing/server.bor b/TAO/tests/Big_Request_Muxing/server.bor
deleted file mode 100644
index 5377e736130..00000000000
--- a/TAO/tests/Big_Request_Muxing/server.bor
+++ /dev/null
@@ -1,47 +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)\Payload_Receiver.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Twoways/Makefile.bor b/TAO/tests/Big_Twoways/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Big_Twoways/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/tests/Big_Twoways/client.bor b/TAO/tests/Big_Twoways/client.bor
deleted file mode 100644
index 4bd5cc59755..00000000000
--- a/TAO/tests/Big_Twoways/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Peer.obj \
- $(OBJDIR)\Session.obj \
- $(OBJDIR)\Session_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Big_Twoways/server.bor b/TAO/tests/Big_Twoways/server.bor
deleted file mode 100644
index 9abb1dd1854..00000000000
--- a/TAO/tests/Big_Twoways/server.bor
+++ /dev/null
@@ -1,46 +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)\Coordinator.obj \
- $(OBJDIR)\Session_Control.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Blocking_Sync_None/Makefile.bor b/TAO/tests/Blocking_Sync_None/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Blocking_Sync_None/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/tests/Blocking_Sync_None/client.bor b/TAO/tests/Blocking_Sync_None/client.bor
deleted file mode 100644
index eb6a75a3d0b..00000000000
--- a/TAO/tests/Blocking_Sync_None/client.bor
+++ /dev/null
@@ -1,43 +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) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Blocking_Sync_None/server.bor b/TAO/tests/Blocking_Sync_None/server.bor
deleted file mode 100644
index aff8f1b6356..00000000000
--- a/TAO/tests/Blocking_Sync_None/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)\Blocking_Sync_None.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Makefile.bor b/TAO/tests/Bug_1020_Basic_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1020_Basic_Regression/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/tests/Bug_1020_Basic_Regression/client.bor b/TAO/tests/Bug_1020_Basic_Regression/client.bor
deleted file mode 100644
index f51f9216dcd..00000000000
--- a/TAO/tests/Bug_1020_Basic_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.bor b/TAO/tests/Bug_1020_Basic_Regression/server.bor
deleted file mode 100644
index 2452da1db77..00000000000
--- a/TAO/tests/Bug_1020_Basic_Regression/server.bor
+++ /dev/null
@@ -1,44 +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)\Echo_Caller.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1020_Regression/Makefile.bor b/TAO/tests/Bug_1020_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1020_Regression/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/tests/Bug_1020_Regression/client.bor b/TAO/tests/Bug_1020_Regression/client.bor
deleted file mode 100644
index 05d86e3943d..00000000000
--- a/TAO/tests/Bug_1020_Regression/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1020_Regression/server.bor b/TAO/tests/Bug_1020_Regression/server.bor
deleted file mode 100644
index a2df9cae0e1..00000000000
--- a/TAO/tests/Bug_1020_Regression/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo_Callback.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\Server_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1269_Regression/Makefile.bor b/TAO/tests/Bug_1269_Regression/Makefile.bor
deleted file mode 100644
index 345078a29b8..00000000000
--- a/TAO/tests/Bug_1269_Regression/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor shutdown.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Bug_1269_Regression/client.bor b/TAO/tests/Bug_1269_Regression/client.bor
deleted file mode 100644
index 52180f171c1..00000000000
--- a/TAO/tests/Bug_1269_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1269_Regression/server.bor b/TAO/tests/Bug_1269_Regression/server.bor
deleted file mode 100644
index 24628a3c30e..00000000000
--- a/TAO/tests/Bug_1269_Regression/server.bor
+++ /dev/null
@@ -1,44 +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)\Echo_Caller.obj \
- $(OBJDIR)\Server_Timer.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.bor b/TAO/tests/Bug_1269_Regression/shutdown.bor
deleted file mode 100644
index 90311894c8d..00000000000
--- a/TAO/tests/Bug_1269_Regression/shutdown.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = shutdown
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\shutdown.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1270_Regression/Makefile.bor b/TAO/tests/Bug_1270_Regression/Makefile.bor
deleted file mode 100644
index 345078a29b8..00000000000
--- a/TAO/tests/Bug_1270_Regression/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor shutdown.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Bug_1270_Regression/client.bor b/TAO/tests/Bug_1270_Regression/client.bor
deleted file mode 100644
index 52180f171c1..00000000000
--- a/TAO/tests/Bug_1270_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1270_Regression/server.bor b/TAO/tests/Bug_1270_Regression/server.bor
deleted file mode 100644
index 0059968aa06..00000000000
--- a/TAO/tests/Bug_1270_Regression/server.bor
+++ /dev/null
@@ -1,45 +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)\Echo_Caller.obj \
- $(OBJDIR)\Server_Timer.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.bor b/TAO/tests/Bug_1270_Regression/shutdown.bor
deleted file mode 100644
index 90311894c8d..00000000000
--- a/TAO/tests/Bug_1270_Regression/shutdown.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = shutdown
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\shutdown.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1361_Regression/Makefile.bor b/TAO/tests/Bug_1361_Regression/Makefile.bor
deleted file mode 100644
index 345078a29b8..00000000000
--- a/TAO/tests/Bug_1361_Regression/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor shutdown.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Bug_1361_Regression/client.bor b/TAO/tests/Bug_1361_Regression/client.bor
deleted file mode 100644
index 52180f171c1..00000000000
--- a/TAO/tests/Bug_1361_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1361_Regression/server.bor b/TAO/tests/Bug_1361_Regression/server.bor
deleted file mode 100644
index f4d3dd495ff..00000000000
--- a/TAO/tests/Bug_1361_Regression/server.bor
+++ /dev/null
@@ -1,45 +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)\Echo_Caller.obj \
- $(OBJDIR)\Server_Thread_Pool.obj \
- $(OBJDIR)\ORB_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.bor b/TAO/tests/Bug_1361_Regression/shutdown.bor
deleted file mode 100644
index 90311894c8d..00000000000
--- a/TAO/tests/Bug_1361_Regression/shutdown.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = shutdown
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\shutdown.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_SVC_UTILS_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1482_Regression/Makefile.bor b/TAO/tests/Bug_1482_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1482_Regression/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/tests/Bug_1482_Regression/client.bor b/TAO/tests/Bug_1482_Regression/client.bor
deleted file mode 100644
index 9021426daa1..00000000000
--- a/TAO/tests/Bug_1482_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\Reply_Handler.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1482_Regression/server.bor b/TAO/tests/Bug_1482_Regression/server.bor
deleted file mode 100644
index 402e9a84e1f..00000000000
--- a/TAO/tests/Bug_1482_Regression/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Hello.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1551_Regression/Makefile.bor b/TAO/tests/Bug_1551_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1551_Regression/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/tests/Bug_1551_Regression/client.bor b/TAO/tests/Bug_1551_Regression/client.bor
deleted file mode 100644
index 9021426daa1..00000000000
--- a/TAO/tests/Bug_1551_Regression/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\Reply_Handler.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1551_Regression/server.bor b/TAO/tests/Bug_1551_Regression/server.bor
deleted file mode 100644
index 402e9a84e1f..00000000000
--- a/TAO/tests/Bug_1551_Regression/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Hello.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Bug_1568_Regression/Makefile.bor b/TAO/tests/Bug_1568_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1568_Regression/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/tests/Bug_1568_Regression/client.bor b/TAO/tests/Bug_1568_Regression/client.bor
deleted file mode 100644
index 2bff9858124..00000000000
--- a/TAO/tests/Bug_1568_Regression/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1568_Regression/server.bor b/TAO/tests/Bug_1568_Regression/server.bor
deleted file mode 100644
index 156c619a9dc..00000000000
--- a/TAO/tests/Bug_1568_Regression/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1670_Regression/Makefile.bor b/TAO/tests/Bug_1670_Regression/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Bug_1670_Regression/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/tests/Bug_1670_Regression/client.bor b/TAO/tests/Bug_1670_Regression/client.bor
deleted file mode 100644
index 2bff9858124..00000000000
--- a/TAO/tests/Bug_1670_Regression/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1670_Regression/server.bor b/TAO/tests/Bug_1670_Regression/server.bor
deleted file mode 100644
index 156c619a9dc..00000000000
--- a/TAO/tests/Bug_1670_Regression/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -GH -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_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/tests/Bug_1693_Test/Makefile.bor b/TAO/tests/Bug_1693_Test/Makefile.bor
deleted file mode 100644
index d4f5ea99fd7..00000000000
--- a/TAO/tests/Bug_1693_Test/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Bug_1693_Test test executables
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Bug_1693_Test/client.bor b/TAO/tests/Bug_1693_Test/client.bor
deleted file mode 100644
index e56b46d5e20..00000000000
--- a/TAO/tests/Bug_1693_Test/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Codec test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -I../.. -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)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/CDR/Makefile.bor b/TAO/tests/CDR/Makefile.bor
deleted file mode 100644
index 660ebc62b5d..00000000000
--- a/TAO/tests/CDR/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-#
-# Makefile for building the CDR tests
-#
-
-NAMES = \
- alignment \
- allocator \
- basic_types \
- growth \
- octet_sequence \
- tc
-
-OBJFILES = $(OBJDIR)\$(NAME).obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/Cache_Growth_Test/Makefile.bor b/TAO/tests/Cache_Growth_Test/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Cache_Growth_Test/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/tests/Cache_Growth_Test/client.bor b/TAO/tests/Cache_Growth_Test/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/Cache_Growth_Test/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/tests/Cache_Growth_Test/server.bor b/TAO/tests/Cache_Growth_Test/server.bor
deleted file mode 100644
index a197d764296..00000000000
--- a/TAO/tests/Cache_Growth_Test/server.bor
+++ /dev/null
@@ -1,39 +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)\Hello.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Client_Leaks/Makefile.bor b/TAO/tests/Client_Leaks/Makefile.bor
deleted file mode 100644
index 736f36c7ba6..00000000000
--- a/TAO/tests/Client_Leaks/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor child.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Client_Leaks/child.bor b/TAO/tests/Client_Leaks/child.bor
deleted file mode 100644
index 76b9f20c497..00000000000
--- a/TAO/tests/Client_Leaks/child.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-
-NAME = child
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Process.obj \
- $(OBJDIR)\child.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Client_Leaks/client.bor b/TAO/tests/Client_Leaks/client.bor
deleted file mode 100644
index f23f14dc4af..00000000000
--- a/TAO/tests/Client_Leaks/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Client_Leaks/server.bor b/TAO/tests/Client_Leaks/server.bor
deleted file mode 100644
index 2ad4a9af68e..00000000000
--- a/TAO/tests/Client_Leaks/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)\Process_Factory.obj \
- $(OBJDIR)\Startup_Callback.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/CodeSets/Makefile.bor b/TAO/tests/CodeSets/Makefile.bor
deleted file mode 100644
index 65f536b14dc..00000000000
--- a/TAO/tests/CodeSets/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-DIRS = \
- simple \
- libs
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859.bor b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859.bor
deleted file mode 100644
index adbfa323c8c..00000000000
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the IBM1047_ISO8859 library
-#
-
-NAME = IBM1047_ISO8859
-
-OBJFILES = \
- $(OBJDIR)\Char_IBM1047_ISO8859_Factory.obj \
- $(OBJDIR)\Char_IBM1047_ISO8859_Translator.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- -DOLT_BUILD_DLL=1
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.bor b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.bor
deleted file mode 100644
index 24b38f6f072..00000000000
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- IBM1047_ISO8859.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/CodeSets/libs/Makefile.bor b/TAO/tests/CodeSets/libs/Makefile.bor
deleted file mode 100644
index 5882e6a3e1e..00000000000
--- a/TAO/tests/CodeSets/libs/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-DIRS = \
- IBM1047_ISO8859 \
- UCS4_UTF16
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_Libs_UCS4_UTF16.bor b/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_Libs_UCS4_UTF16.bor
deleted file mode 100644
index 24dbc3b255b..00000000000
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_Libs_UCS4_UTF16.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the UCS4_UTF16 library
-#
-
-NAME = UCS4_UTF16
-
-OBJFILES = \
- $(OBJDIR)\WUCS4_UTF16_Factory.obj \
- $(OBJDIR)\WUCS4_UTF16.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- -DUCS4_UTF16_BUILD_DLL=1
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.bor b/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.bor
deleted file mode 100644
index b893bb3abab..00000000000
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = \
- CodeSets_Libs_UCS4_UTF16.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/CodeSets/simple/Makefile.bor b/TAO/tests/CodeSets/simple/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/CodeSets/simple/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/tests/CodeSets/simple/client.bor b/TAO/tests/CodeSets/simple/client.bor
deleted file mode 100644
index 0936197c09b..00000000000
--- a/TAO/tests/CodeSets/simple/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)\simpleC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\simple.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\simpleS.cpp $(IDLDIR)\simpleC.cpp: $(IDLDIR)\simple.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/CodeSets/simple/server.bor b/TAO/tests/CodeSets/simple/server.bor
deleted file mode 100644
index f8f858f7868..00000000000
--- a/TAO/tests/CodeSets/simple/server.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\simpleC.obj \
- $(OBJDIR)\simpleS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\simple.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\simpleS.cpp $(IDLDIR)\simpleC.cpp: $(IDLDIR)\simple.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Codec/Makefile.bor b/TAO/tests/Codec/Makefile.bor
deleted file mode 100644
index 8faf5999337..00000000000
--- a/TAO/tests/Codec/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Codec test executables
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Codec/client.bor b/TAO/tests/Codec/client.bor
deleted file mode 100644
index e56b46d5e20..00000000000
--- a/TAO/tests/Codec/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Codec test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -I../.. -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)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor
deleted file mode 100644
index 95abaeeeba8..00000000000
--- a/TAO/tests/Collocation/Collocation.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation test
-#
-
-!ifndef STATIC
-NAME = Collocation
-!else
-!undef NAME
-!endif
-
-OBJFILES = \
- $(OBJDIR)\Collocation_Tester.obj \
- $(OBJDIR)\Collocation.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- -DDIAMOND_HAS_DLL=$(DLL_FLAG) \
- -DMY_STUB_HAS_DLL=$(DLL_FLAG)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(CORE_BINDIR)\Diamond$(LIB_DECORATOR).lib \
- $(CORE_BINDIR)\Collocation_Test_Stubs$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/Collocation/Collocation_Test_Stubs.bor b/TAO/tests/Collocation/Collocation_Test_Stubs.bor
deleted file mode 100644
index 1eff90ac224..00000000000
--- a/TAO/tests/Collocation/Collocation_Test_Stubs.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation_Test_Stubs library
-#
-
-!ifndef STATIC
-NAME = Collocation_Test_Stubs
-!else
-!undef NAME
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
- -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
- -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
-
-OBJFILES = \
- $(OBJDIR)\DiamondC.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- -DMY_STUB_HAS_DLL=$(DLL_FLAG) \
- -DMY_STUB_BUILD_DLL
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Diamond.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DiamondS.cpp $(IDLDIR)\DiamondC.cpp: $(IDLDIR)\Diamond.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Collocation/Diamond.bor b/TAO/tests/Collocation/Diamond.bor
deleted file mode 100644
index 237098df19f..00000000000
--- a/TAO/tests/Collocation/Diamond.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Makefile for building the Diamond library
-#
-
-!ifndef STATIC
-NAME = Diamond
-!else
-!undef NAME
-!endif
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
- -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
- -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
-
-OBJFILES = \
- $(OBJDIR)\DiamondS.obj \
- $(OBJDIR)\Diamond_i.obj \
- $(OBJDIR)\DiamondS_T.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -DDIAMOND_HAS_DLL=$(DLL_FLAG) \
- -DDIAMOND_BUILD_DLL \
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(CORE_BINDIR)\Collocation_Test_Stubs$(LIB_DECORATOR).lib
-
-IDLFILES = \
- $(IDLDIR)\Diamond.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DiamondS.cpp $(IDLDIR)\DiamondC.cpp: $(IDLDIR)\Diamond.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Collocation/Makefile.bor b/TAO/tests/Collocation/Makefile.bor
deleted file mode 100644
index 844d0d3b654..00000000000
--- a/TAO/tests/Collocation/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation test executables and libraries
-#
-
-MAKEFILES = Collocation_Test_Stubs.bor Diamond.bor Collocation.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Collocation_Opportunities/Makefile.bor b/TAO/tests/Collocation_Opportunities/Makefile.bor
deleted file mode 100644
index 675cf690775..00000000000
--- a/TAO/tests/Collocation_Opportunities/Makefile.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation_Opportunities test
-#
-
-NAME = Collocation_Opportunities
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Collocation_Opportunities.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
-
-
diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.bor b/TAO/tests/Collocation_Tests/Collocated_Test.bor
deleted file mode 100644
index b7d7cdcd9ae..00000000000
--- a/TAO/tests/Collocation_Tests/Collocated_Test.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-NAME = Collocated_Test
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Hello.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\Collocated_Test.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Collocation_Tests/Makefile.bor b/TAO/tests/Collocation_Tests/Makefile.bor
deleted file mode 100644
index 70024ed8116..00000000000
--- a/TAO/tests/Collocation_Tests/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = Collocated_Test.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Connect_Strategy_Test/Makefile.bor b/TAO/tests/Connect_Strategy_Test/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Connect_Strategy_Test/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/tests/Connect_Strategy_Test/client.bor b/TAO/tests/Connect_Strategy_Test/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/Connect_Strategy_Test/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/tests/Connect_Strategy_Test/server.bor b/TAO/tests/Connect_Strategy_Test/server.bor
deleted file mode 100644
index a197d764296..00000000000
--- a/TAO/tests/Connect_Strategy_Test/server.bor
+++ /dev/null
@@ -1,39 +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)\Hello.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Connection_Failure/Makefile.bor b/TAO/tests/Connection_Failure/Makefile.bor
deleted file mode 100644
index e321e32567a..00000000000
--- a/TAO/tests/Connection_Failure/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Connection_Failure/client.bor b/TAO/tests/Connection_Failure/client.bor
deleted file mode 100644
index 04225c59cea..00000000000
--- a/TAO/tests/Connection_Failure/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/tests/Connection_Purging/Makefile.bor b/TAO/tests/Connection_Purging/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Connection_Purging/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Connection_Purging/client.bor b/TAO/tests/Connection_Purging/client.bor
deleted file mode 100644
index 3ead82b04f0..00000000000
--- a/TAO/tests/Connection_Purging/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_STRATEGIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Connection_Purging/server.bor b/TAO/tests/Connection_Purging/server.bor
deleted file mode 100644
index 79097b68416..00000000000
--- a/TAO/tests/Connection_Purging/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Connection_Timeout/Makefile.bor b/TAO/tests/Connection_Timeout/Makefile.bor
deleted file mode 100644
index e321e32567a..00000000000
--- a/TAO/tests/Connection_Timeout/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Connection_Timeout/client.bor b/TAO/tests/Connection_Timeout/client.bor
deleted file mode 100644
index 8b924eb42df..00000000000
--- a/TAO/tests/Connection_Timeout/client.bor
+++ /dev/null
@@ -1,39 +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) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_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/tests/Crash_On_Write/Makefile.bor b/TAO/tests/Crash_On_Write/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Crash_On_Write/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/tests/Crash_On_Write/client.bor b/TAO/tests/Crash_On_Write/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/Crash_On_Write/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/tests/Crash_On_Write/server.bor b/TAO/tests/Crash_On_Write/server.bor
deleted file mode 100644
index e1ea4698580..00000000000
--- a/TAO/tests/Crash_On_Write/server.bor
+++ /dev/null
@@ -1,40 +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)\Oneway_Receiver.obj \
- $(OBJDIR)\Crash_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Crashed_Callback/Makefile.bor b/TAO/tests/Crashed_Callback/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Crashed_Callback/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Crashed_Callback/client.bor b/TAO/tests/Crashed_Callback/client.bor
deleted file mode 100644
index 4f97795e61e..00000000000
--- a/TAO/tests/Crashed_Callback/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Crashed_Callback.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Crashed_Callback/server.bor b/TAO/tests/Crashed_Callback/server.bor
deleted file mode 100644
index 8ccfa9c8013..00000000000
--- a/TAO/tests/Crashed_Callback/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Service.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/DLL_ORB/Makefile.bor b/TAO/tests/DLL_ORB/Makefile.bor
deleted file mode 100644
index c372611943b..00000000000
--- a/TAO/tests/DLL_ORB/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the DLL_Orb test executables
-#
-
-MAKEFILES = test_client_module.bor test_server_module.bor server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.bor b/TAO/tests/DLL_ORB/Test_Client_Module.bor
deleted file mode 100644
index f199f5b3f9e..00000000000
--- a/TAO/tests/DLL_ORB/Test_Client_Module.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the test_client_module
-#
-
-NAME = Test_Client_Module
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\Test_Client_Module.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- -DTEST_CLIENT_MODULE_BUILD_DLL
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.bor b/TAO/tests/DLL_ORB/Test_Server_Module.bor
deleted file mode 100644
index 555bb428819..00000000000
--- a/TAO/tests/DLL_ORB/Test_Server_Module.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the test_server_module
-#
-
-NAME = Test_Server_Module
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Test_Server_Module.obj \
- $(OBJDIR)\Test_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -DTEST_SERVER_MODULE_BUILD_DLL
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/DLL_ORB/client.bor b/TAO/tests/DLL_ORB/client.bor
deleted file mode 100644
index e85ac8d529e..00000000000
--- a/TAO/tests/DLL_ORB/client.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-#
-# Makefile for building the client
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(CORE_BINDIR)\Test_Client_Module$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/tests/DLL_ORB/server.bor b/TAO/tests/DLL_ORB/server.bor
deleted file mode 100644
index 430a390988b..00000000000
--- a/TAO/tests/DLL_ORB/server.bor
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id$
-#
-# Makefile for building the server
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(CORE_BINDIR)\Test_Server_Module$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/DSI_Gateway/Makefile.bor b/TAO/tests/DSI_Gateway/Makefile.bor
deleted file mode 100644
index e93e7c9100f..00000000000
--- a/TAO/tests/DSI_Gateway/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the DSI_Gateway test executables
-#
-
-MAKEFILES = server.bor client.bor gateway.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/DSI_Gateway/client.bor b/TAO/tests/DSI_Gateway/client.bor
deleted file mode 100644
index b40eb1ae627..00000000000
--- a/TAO/tests/DSI_Gateway/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the DSI_Gateway client
-#
-
-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/tests/DSI_Gateway/gateway.bor b/TAO/tests/DSI_Gateway/gateway.bor
deleted file mode 100644
index ac6fb776c77..00000000000
--- a/TAO/tests/DSI_Gateway/gateway.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the DSI_Gateway gateway
-#
-
-NAME = gateway
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\test_dsi.obj \
- $(OBJDIR)\gateway.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICINTERFACE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICINTERFACE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/DSI_Gateway/server.bor b/TAO/tests/DSI_Gateway/server.bor
deleted file mode 100644
index 40b7b8d6103..00000000000
--- a/TAO/tests/DSI_Gateway/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the DSI_Gateway server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/DynAny_Test/Makefile.bor b/TAO/tests/DynAny_Test/Makefile.bor
deleted file mode 100644
index 3e86f5091f7..00000000000
--- a/TAO/tests/DynAny_Test/Makefile.bor
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# Makefile for building the DynAny test
-#
-
-NAME = basic_test
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\da_testsC.obj \
- $(OBJDIR)\data.obj \
- $(OBJDIR)\analyzer.obj \
- $(OBJDIR)\driver.obj \
- $(OBJDIR)\test_dynany.obj \
- $(OBJDIR)\test_dynarray.obj \
- $(OBJDIR)\test_dynenum.obj \
- $(OBJDIR)\test_dynsequence.obj \
- $(OBJDIR)\test_dynstruct.obj \
- $(OBJDIR)\test_dynunion.obj \
- $(OBJDIR)\test_wrapper.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICANY_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICANY_LIB)
-
-IDLFILES = \
- $(IDLDIR)\da_tests.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\da_testsC.cpp: $(IDLDIR)\da_tests.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.bor b/TAO/tests/Explicit_Event_Loop/Makefile.bor
deleted file mode 100644
index 736710584af..00000000000
--- a/TAO/tests/Explicit_Event_Loop/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Explicit_Event_Loop test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Explicit_Event_Loop/client.bor b/TAO/tests/Explicit_Event_Loop/client.bor
deleted file mode 100644
index 67a5f302361..00000000000
--- a/TAO/tests/Explicit_Event_Loop/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Explicit_Event_Loop client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\timeC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\time.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\timeS.cpp $(IDLDIR)\timeC.cpp: $(IDLDIR)\time.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Explicit_Event_Loop/server.bor b/TAO/tests/Explicit_Event_Loop/server.bor
deleted file mode 100644
index 0f95bb75720..00000000000
--- a/TAO/tests/Explicit_Event_Loop/server.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the Explicit_Event_Loop server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\timeS.obj \
- $(OBJDIR)\timeC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\time.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\timeS.cpp $(IDLDIR)\timeC.cpp: $(IDLDIR)\time.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Exposed_Policies/Makefile.bor b/TAO/tests/Exposed_Policies/Makefile.bor
deleted file mode 100644
index 9724463cecc..00000000000
--- a/TAO/tests/Exposed_Policies/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Exposed_Policies test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Exposed_Policies/client.bor b/TAO/tests/Exposed_Policies/client.bor
deleted file mode 100644
index 90697c94113..00000000000
--- a/TAO/tests/Exposed_Policies/client.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-#
-# Makefile for building the Exposed_Policies client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\CounterC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Policy_Tester.obj \
- $(OBJDIR)\Policy_Verifier.obj \
- $(OBJDIR)\RT_Properties.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTPORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Counter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\CounterS.cpp $(IDLDIR)\CounterC.cpp: $(IDLDIR)\Counter.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Exposed_Policies/server.bor b/TAO/tests/Exposed_Policies/server.bor
deleted file mode 100644
index 6c62f505a45..00000000000
--- a/TAO/tests/Exposed_Policies/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Makefile for building the Exposed_Policies server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\CounterS.obj \
- $(OBJDIR)\CounterC.obj \
- $(OBJDIR)\Counter_i.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\Policy_Tester.obj \
- $(OBJDIR)\Policy_Verifier.obj \
- $(OBJDIR)\RT_Properties.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTPORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Counter.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\CounterS.cpp $(IDLDIR)\CounterC.cpp: $(IDLDIR)\Counter.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/FL_Cube/Makefile.bor b/TAO/tests/FL_Cube/Makefile.bor
deleted file mode 100644
index ce2ab2ba278..00000000000
--- a/TAO/tests/FL_Cube/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the FL_Cube example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/FL_Cube/client.bor b/TAO/tests/FL_Cube/client.bor
deleted file mode 100644
index 72b7505dcbf..00000000000
--- a/TAO/tests/FL_Cube/client.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the FL_Cube_client example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/FL_Cube/server.bor b/TAO/tests/FL_Cube/server.bor
deleted file mode 100644
index 8431a24150e..00000000000
--- a/TAO/tests/FL_Cube/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the FL_Cube example
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Faults/Makefile.bor b/TAO/tests/Faults/Makefile.bor
deleted file mode 100644
index 61002cb1da6..00000000000
--- a/TAO/tests/Faults/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor middle.bor client.bor ping.bor pong.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Faults/client.bor b/TAO/tests/Faults/client.bor
deleted file mode 100644
index ff836846880..00000000000
--- a/TAO/tests/Faults/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Faults/middle.bor b/TAO/tests/Faults/middle.bor
deleted file mode 100644
index 83c471641cd..00000000000
--- a/TAO/tests/Faults/middle.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults middle executable
-#
-
-NAME = middle
-
-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)\middle.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Faults/ping.bor b/TAO/tests/Faults/ping.bor
deleted file mode 100644
index 539f2d66640..00000000000
--- a/TAO/tests/Faults/ping.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-NAME = ping
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\pingC.obj \
- $(OBJDIR)\pingS.obj \
- $(OBJDIR)\ping_i.obj \
- $(OBJDIR)\ping.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\ping.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\pingS.cpp $(IDLDIR)\pingC.cpp: $(IDLDIR)\ping.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Faults/pong.bor b/TAO/tests/Faults/pong.bor
deleted file mode 100644
index ee6aac700a9..00000000000
--- a/TAO/tests/Faults/pong.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults pong executable
-#
-
-NAME = pong
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\pingC.obj \
- $(OBJDIR)\pingS.obj \
- $(OBJDIR)\ping_i.obj \
- $(OBJDIR)\pong.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\ping.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\pingS.cpp $(IDLDIR)\pingC.cpp: $(IDLDIR)\ping.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Faults/server.bor b/TAO/tests/Faults/server.bor
deleted file mode 100644
index 92898c8f86d..00000000000
--- a/TAO/tests/Faults/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults server
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/File_IO/Makefile.bor b/TAO/tests/File_IO/Makefile.bor
deleted file mode 100644
index d956e8fda76..00000000000
--- a/TAO/tests/File_IO/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default_servant example
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/File_IO/client.bor b/TAO/tests/File_IO/client.bor
deleted file mode 100644
index c39959738f0..00000000000
--- a/TAO/tests/File_IO/client.bor
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default servant example
-#
-
-NAME = client
-
-OBJFILES = \
- $(OBJDIR)\FileC.obj \
- $(OBJDIR)\FileS.obj \
- $(OBJDIR)\client.obj
-
-IDLFILES = \
- $(IDLDIR)\File.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/File_IO/server.bor b/TAO/tests/File_IO/server.bor
deleted file mode 100644
index b3ff62c8a9f..00000000000
--- a/TAO/tests/File_IO/server.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the poa default servant example
-#
-
-NAME = server
-
-OBJFILES = \
- $(OBJDIR)\FileC.obj \
- $(OBJDIR)\FileS.obj \
- $(OBJDIR)\File_i.obj \
- $(OBJDIR)\server.obj
-
-IDLFILES = \
- $(IDLDIR)\File.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FileC.cpp $(IDLDIR)\FileS.cpp: $(IDLDIR)\File.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Forwarding/Makefile.bor b/TAO/tests/Forwarding/Makefile.bor
deleted file mode 100644
index 046222a4a37..00000000000
--- a/TAO/tests/Forwarding/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the forwarding example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Forwarding/client.bor b/TAO/tests/Forwarding/client.bor
deleted file mode 100644
index b3d05d7550e..00000000000
--- a/TAO/tests/Forwarding/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the forwarding example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Forwarding/server.bor b/TAO/tests/Forwarding/server.bor
deleted file mode 100644
index 852305efa07..00000000000
--- a/TAO/tests/Forwarding/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Forwarding example
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORTABLE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Hello/Makefile.bor b/TAO/tests/Hello/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Hello/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/tests/Hello/client.bor b/TAO/tests/Hello/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/Hello/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/tests/Hello/server.bor b/TAO/tests/Hello/server.bor
deleted file mode 100644
index a197d764296..00000000000
--- a/TAO/tests/Hello/server.bor
+++ /dev/null
@@ -1,39 +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)\Hello.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/ICMG_Any_Bug/Makefile.bor b/TAO/tests/ICMG_Any_Bug/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/ICMG_Any_Bug/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/tests/ICMG_Any_Bug/client.bor b/TAO/tests/ICMG_Any_Bug/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/ICMG_Any_Bug/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/tests/ICMG_Any_Bug/server.bor b/TAO/tests/ICMG_Any_Bug/server.bor
deleted file mode 100644
index 1ff6f2cdff6..00000000000
--- a/TAO/tests/ICMG_Any_Bug/server.bor
+++ /dev/null
@@ -1,40 +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)\Hello.obj \
- $(OBJDIR)\HelloWorld.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/IDL_Test/Makefile.bor b/TAO/tests/IDL_Test/Makefile.bor
deleted file mode 100644
index da7b8e338ac..00000000000
--- a/TAO/tests/IDL_Test/Makefile.bor
+++ /dev/null
@@ -1,164 +0,0 @@
-# $Id$
-#
-# Makefile for building the IDL test
-#
-
-NAME = main
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\anonymousC.obj \
- $(OBJDIR)\anonymousS.obj \
- $(OBJDIR)\arrayC.obj \
- $(OBJDIR)\arrayS.obj \
- $(OBJDIR)\constantsC.obj \
- $(OBJDIR)\constantsS.obj \
- $(OBJDIR)\enum_in_structC.obj \
- $(OBJDIR)\enum_in_structS.obj \
- $(OBJDIR)\fullC.obj \
- $(OBJDIR)\fullS.obj \
- $(OBJDIR)\fwdC.obj \
- $(OBJDIR)\fwdS.obj \
- $(OBJDIR)\generic_objectC.obj \
- $(OBJDIR)\generic_objectS.obj \
- $(OBJDIR)\gperfC.obj \
- $(OBJDIR)\gperfS.obj \
- $(OBJDIR)\includedC.obj \
- $(OBJDIR)\includedS.obj \
- $(OBJDIR)\includingC.obj \
- $(OBJDIR)\includingS.obj \
- $(OBJDIR)\interfaceC.obj \
- $(OBJDIR)\interfaceS.obj \
- $(OBJDIR)\keywordsC.obj \
- $(OBJDIR)\keywordsS.obj \
- $(OBJDIR)\paramsC.obj \
- $(OBJDIR)\paramsS.obj \
- $(OBJDIR)\pragmaC.obj \
- $(OBJDIR)\pragmaS.obj \
- $(OBJDIR)\reopen_include1C.obj \
- $(OBJDIR)\reopen_include1S.obj \
- $(OBJDIR)\reopen_include2C.obj \
- $(OBJDIR)\reopen_include2S.obj \
- $(OBJDIR)\reopened_modulesC.obj \
- $(OBJDIR)\reopened_modulesS.obj \
- $(OBJDIR)\repo_id_modC.obj \
- $(OBJDIR)\repo_id_modS.obj \
- $(OBJDIR)\sequenceC.obj \
- $(OBJDIR)\sequenceS.obj \
- $(OBJDIR)\typedefC.obj \
- $(OBJDIR)\typedefS.obj \
- $(OBJDIR)\unionC.obj \
- $(OBJDIR)\unionS.obj \
- $(OBJDIR)\nested_scopeC.obj \
- $(OBJDIR)\nested_scopeS.obj \
- $(OBJDIR)\main.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\anonymous.idl \
- $(IDLDIR)\array.idl \
- $(IDLDIR)\constants.idl \
- $(IDLDIR)\enum_in_struct.idl \
- $(IDLDIR)\full.idl \
- $(IDLDIR)\fwd.idl \
- $(IDLDIR)\generic_object.idl \
- $(IDLDIR)\gperf.idl \
- $(IDLDIR)\included.idl \
- $(IDLDIR)\including.idl \
- $(IDLDIR)\interface.idl \
- $(IDLDIR)\keywords.idl \
- $(IDLDIR)\params.idl \
- $(IDLDIR)\pragma.idl \
- $(IDLDIR)\repo_id_mod.idl \
- $(IDLDIR)\sequence.idl \
- $(IDLDIR)\typedef.idl \
- $(IDLDIR)\union.idl \
- $(IDLDIR)\nested_scope.idl \
- $(IDLDIR)\reopened_modules.idl \
- $(IDLDIR)\reopen_include1.idl \
- $(IDLDIR)\reopen_include2.idl
-
-IDLDIR = .
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\anonymousC.cpp $(IDLDIR)\anonymousS.cpp: $(IDLDIR)\anonymous.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\arrayC.cpp $(IDLDIR)\arrayS.cpp: $(IDLDIR)\array.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\constantsC.cpp $(IDLDIR)\constantsS.cpp: $(IDLDIR)\constants.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\enum_in_structC.cpp $(IDLDIR)\enum_in_structS.cpp: $(IDLDIR)\enum_in_struct.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\fullC.cpp $(IDLDIR)\fullS.cpp: $(IDLDIR)\full.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\fwdC.cpp $(IDLDIR)\fwdS.cpp: $(IDLDIR)\fwd.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\generic_objectC.cpp $(IDLDIR)\generic_objectS.cpp: $(IDLDIR)\generic_object.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\gperfC.cpp $(IDLDIR)\gperfS.cpp: $(IDLDIR)\gperf.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\includedC.cpp $(IDLDIR)\includedS.cpp: $(IDLDIR)\included.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\includingC.cpp $(IDLDIR)\includingS.cpp: $(IDLDIR)\including.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\interfaceC.cpp $(IDLDIR)\interfaceS.cpp: $(IDLDIR)\interface.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\keywordsC.cpp $(IDLDIR)\keywordsS.cpp: $(IDLDIR)\keywords.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\paramsC.cpp $(IDLDIR)\paramsS.cpp: $(IDLDIR)\params.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\pragmaC.cpp $(IDLDIR)\pragmaS.cpp: $(IDLDIR)\pragma.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\repo_id_modC.cpp $(IDLDIR)\repo_id_modS.cpp: $(IDLDIR)\repo_id_mod.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\sequenceC.cpp $(IDLDIR)\sequenceS.cpp: $(IDLDIR)\sequence.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\typedefC.cpp $(IDLDIR)\typedefS.cpp: $(IDLDIR)\typedef.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\unionC.cpp $(IDLDIR)\unionS.cpp: $(IDLDIR)\union.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\nested_scopeC.cpp $(IDLDIR)\nested_scopeS.cpp: $(IDLDIR)\nested_scope.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\reopened_modulesC.cpp $(IDLDIR)\reopened_modulesS.cpp: $(IDLDIR)\reopened_modules.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\reopen_include1C.cpp $(IDLDIR)\reopen_include1S.cpp: $(IDLDIR)\reopen_include1.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\reopen_include2C.cpp $(IDLDIR)\reopen_include2S.cpp: $(IDLDIR)\reopen_include2.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/IORManipulation/Makefile.bor b/TAO/tests/IORManipulation/Makefile.bor
deleted file mode 100644
index 1a8790edd54..00000000000
--- a/TAO/tests/IORManipulation/Makefile.bor
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-#
-# Makefile for building the IORTest
-#
-
-NAME = IORTest
-
-OBJFILES = $(OBJDIR)\IORTest.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORMANIP_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_IORMANIP_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/InterOp-Naming/Makefile.bor b/TAO/tests/InterOp-Naming/Makefile.bor
deleted file mode 100644
index 2dd83272ea6..00000000000
--- a/TAO/tests/InterOp-Naming/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the InterOp-Naming test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/InterOp-Naming/client.bor b/TAO/tests/InterOp-Naming/client.bor
deleted file mode 100644
index 5c531d10b24..00000000000
--- a/TAO/tests/InterOp-Naming/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the InterOp-Naming client
-#
-
-NAME = INS_test_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\INSS.obj \
- $(OBJDIR)\INSC.obj \
- $(OBJDIR)\INS_test_client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\INS.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\INSS.cpp $(IDLDIR)\INSC.cpp: $(IDLDIR)\INS.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/InterOp-Naming/server.bor b/TAO/tests/InterOp-Naming/server.bor
deleted file mode 100644
index 1b56aa85acc..00000000000
--- a/TAO/tests/InterOp-Naming/server.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-#
-# Makefile for building the InterOp-Naming server
-#
-
-NAME = INS_test_server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\INSS.obj \
- $(OBJDIR)\INSC.obj \
- $(OBJDIR)\INS_i.obj \
- $(OBJDIR)\Server_i.obj \
- $(OBJDIR)\INS_test_server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_IORTABLE_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_NAMING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_IORTABLE_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_NAMING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\INS.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\INSS.cpp $(IDLDIR)\INSC.cpp: $(IDLDIR)\INS.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Leader_Followers/Makefile.bor b/TAO/tests/Leader_Followers/Makefile.bor
deleted file mode 100644
index 2a71d45ae6a..00000000000
--- a/TAO/tests/Leader_Followers/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Leader_Followers test
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Leader_Followers/client.bor b/TAO/tests/Leader_Followers/client.bor
deleted file mode 100644
index 80df6b2e860..00000000000
--- a/TAO/tests/Leader_Followers/client.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Leader_Followers test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Leader_Followers/server.bor b/TAO/tests/Leader_Followers/server.bor
deleted file mode 100644
index 2236b3f1d55..00000000000
--- a/TAO/tests/Leader_Followers/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Leader_Followers tests
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/LongUpcalls/Makefile.bor b/TAO/tests/LongUpcalls/Makefile.bor
deleted file mode 100644
index b68ec8b6b36..00000000000
--- a/TAO/tests/LongUpcalls/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = blocking_server.bor blocking_client.bor ami_server.bor ami_client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/LongUpcalls/ami_client.bor b/TAO/tests/LongUpcalls/ami_client.bor
deleted file mode 100644
index 634dd49bd73..00000000000
--- a/TAO/tests/LongUpcalls/ami_client.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = ami_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Controller.obj \
- $(OBJDIR)\Manager_Handler.obj \
- $(OBJDIR)\ami_client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/LongUpcalls/ami_server.bor b/TAO/tests/LongUpcalls/ami_server.bor
deleted file mode 100644
index d26d6c159c4..00000000000
--- a/TAO/tests/LongUpcalls/ami_server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = ami_server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\AMI_Manager.obj \
- $(OBJDIR)\ami_server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/LongUpcalls/blocking_client.bor b/TAO/tests/LongUpcalls/blocking_client.bor
deleted file mode 100644
index e5ce5e51460..00000000000
--- a/TAO/tests/LongUpcalls/blocking_client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = blocking_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Controller.obj \
- $(OBJDIR)\blocking_client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/LongUpcalls/blocking_server.bor b/TAO/tests/LongUpcalls/blocking_server.bor
deleted file mode 100644
index 3d4295bdc59..00000000000
--- a/TAO/tests/LongUpcalls/blocking_server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = blocking_server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Manager.obj \
- $(OBJDIR)\blocking_server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile/Makefile.bor b/TAO/tests/MProfile/Makefile.bor
deleted file mode 100644
index 77f428d12fe..00000000000
--- a/TAO/tests/MProfile/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MProfile/client.bor b/TAO/tests/MProfile/client.bor
deleted file mode 100644
index f6c310e5a38..00000000000
--- a/TAO/tests/MProfile/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile/server.bor b/TAO/tests/MProfile/server.bor
deleted file mode 100644
index 3cdbcc16038..00000000000
--- a/TAO/tests/MProfile/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile.bor b/TAO/tests/MProfile_Connection_Timeout/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/MProfile_Connection_Timeout/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/tests/MProfile_Connection_Timeout/client.bor b/TAO/tests/MProfile_Connection_Timeout/client.bor
deleted file mode 100644
index 60269f1916c..00000000000
--- a/TAO/tests/MProfile_Connection_Timeout/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB)\
- $(TAO_MESSAGING_LIB)
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.bor b/TAO/tests/MProfile_Connection_Timeout/server.bor
deleted file mode 100644
index 3cdbcc16038..00000000000
--- a/TAO/tests/MProfile_Connection_Timeout/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Forwarding/Makefile.bor b/TAO/tests/MProfile_Forwarding/Makefile.bor
deleted file mode 100644
index a8256b01510..00000000000
--- a/TAO/tests/MProfile_Forwarding/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile_Forwarding test executables
-#
-
-MAKEFILES = server.bor client.bor manager.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MProfile_Forwarding/client.bor b/TAO/tests/MProfile_Forwarding/client.bor
deleted file mode 100644
index 9605d12c567..00000000000
--- a/TAO/tests/MProfile_Forwarding/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile_Forwarding client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Forwarding/manager.bor b/TAO/tests/MProfile_Forwarding/manager.bor
deleted file mode 100644
index fd958ad4064..00000000000
--- a/TAO/tests/MProfile_Forwarding/manager.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile_Forwarding manager
-#
-
-NAME = manager
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\manager.obj \
- $(OBJDIR)\Servant_Locator.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORMANIP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORMANIP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MProfile_Forwarding/server.bor b/TAO/tests/MProfile_Forwarding/server.bor
deleted file mode 100644
index c224c0e8457..00000000000
--- a/TAO/tests/MProfile_Forwarding/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the MProfile_Forwarding server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MT_BiDir/Makefile.bor b/TAO/tests/MT_BiDir/Makefile.bor
deleted file mode 100644
index c4a9ed47bb1..00000000000
--- a/TAO/tests/MT_BiDir/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MT_BiDir/client.bor b/TAO/tests/MT_BiDir/client.bor
deleted file mode 100644
index 1062cfc7f21..00000000000
--- a/TAO/tests/MT_BiDir/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-#
-# Makefile for building the BiDirectional client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\ReceiverC.obj \
- $(OBJDIR)\ReceiverS.obj \
- $(OBJDIR)\Receiver_i.obj \
- $(OBJDIR)\SenderC.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Receiver.idl \
- $(IDLDIR)\Sender.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-$(IDLDIR)\ReceiverS.cpp $(IDLDIR)\ReceiverC.cpp: $(IDLDIR)\Receiver.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SenderS.cpp $(IDLDIR)\SenderC.cpp: $(IDLDIR)\Sender.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MT_BiDir/server.bor b/TAO/tests/MT_BiDir/server.bor
deleted file mode 100644
index e275d666dfe..00000000000
--- a/TAO/tests/MT_BiDir/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Makefile for building the BiDirectional server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\ReceiverC.obj \
- $(OBJDIR)\SenderC.obj \
- $(OBJDIR)\SenderS.obj \
- $(OBJDIR)\Sender_i.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_BIDIRGIOP_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_BIDIRGIOP_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Receiver.idl \
- $(IDLDIR)\Sender.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-$(IDLDIR)\ReceiverS.cpp $(IDLDIR)\ReceiverC.cpp: $(IDLDIR)\Receiver.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\SenderS.cpp $(IDLDIR)\SenderC.cpp: $(IDLDIR)\Sender.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/MT_Client/Makefile.bor b/TAO/tests/MT_Client/Makefile.bor
deleted file mode 100644
index 63070f7afab..00000000000
--- a/TAO/tests/MT_Client/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor orb_creation.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MT_Client/client.bor b/TAO/tests/MT_Client/client.bor
deleted file mode 100644
index 5b207f5444c..00000000000
--- a/TAO/tests/MT_Client/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/tests/MT_Client/orb_creation.bor b/TAO/tests/MT_Client/orb_creation.bor
deleted file mode 100644
index 5a00bd29d2b..00000000000
--- a/TAO/tests/MT_Client/orb_creation.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-NAME = orb_creation
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\orb_creation.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/tests/MT_Client/server.bor b/TAO/tests/MT_Client/server.bor
deleted file mode 100644
index 282c6d6dee0..00000000000
--- a/TAO/tests/MT_Client/server.bor
+++ /dev/null
@@ -1,39 +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)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MT_Server/Makefile.bor b/TAO/tests/MT_Server/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/MT_Server/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/MT_Server/client.bor b/TAO/tests/MT_Server/client.bor
deleted file mode 100644
index 8a93258545a..00000000000
--- a/TAO/tests/MT_Server/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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/tests/MT_Server/server.bor b/TAO/tests/MT_Server/server.bor
deleted file mode 100644
index 5e4f8d8dbb7..00000000000
--- a/TAO/tests/MT_Server/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/MT_Timeout/Makefile.bor b/TAO/tests/MT_Timeout/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/MT_Timeout/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/tests/MT_Timeout/client.bor b/TAO/tests/MT_Timeout/client.bor
deleted file mode 100644
index 71f51e5f1b0..00000000000
--- a/TAO/tests/MT_Timeout/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_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/tests/MT_Timeout/server.bor b/TAO/tests/MT_Timeout/server.bor
deleted file mode 100644
index 2bbf147b84d..00000000000
--- a/TAO/tests/MT_Timeout/server.bor
+++ /dev/null
@@ -1,42 +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)\Sleep_Service.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor
deleted file mode 100644
index bf92a956ac2..00000000000
--- a/TAO/tests/Makefile.bor
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# $Id$
-#
-
-DIRS = \
- Abstract_Interface \
- AMH_Exceptions \
- AMH_Oneway \
- AMI \
- AMI_Buffering \
- AMI_Timeouts \
- Bidirectional \
- Bidirectional_NestedUpcall \
- Big_Oneways \
- Big_Reply \
- Big_Request_Muxing \
- Big_Twoways \
- Blocking_Sync_None \
- Bug_1020_Basic_Regression \
- Bug_1020_Regression \
- Bug_1361_Regression \
- Bug_1269_Regression \
- Bug_1270_Regression \
- Bug_1482_Regression \
- Bug_1551_Regression \
- Bug_1568_Regression \
- Bug_1670_Regression \
- Bug_1693_Test \
- CDR \
- Client_Leaks \
- Codec \
- CodeSets \
- Collocation \
- Collocation_Opportunities \
- Collocation_Tests \
- Connect_Strategy_Test \
- Connection_Purging \
- Connection_Failure \
- Connection_Timeout \
- Crash_On_Write \
- Cache_Growth_Test \
- Crashed_Callback \
- DLL_Orb \
- DSI_Gateway \
- DynAny_Test \
- Explicit_Event_Loop \
- Exposed_Policies \
- Faults \
- File_IO \
- FL_Cube \
- Forwarding \
- Hello \
- IDL_Test \
- InterOp-Naming \
- IORManipulation \
- Leader_Followers \
- LongUpcalls \
- MProfile \
- MProfile_Forwarding \
- MProfile_Connection_Timeout \
- MT_BiDir \
- MT_Client \
- MT_Server \
- MT_Timeout \
- Multiple \
- Multiple_Inheritance \
- Muxed_GIOP_Versions \
- Muxing \
- Native_Exceptions \
- Nested_Event_Loop \
- Nested_Upcall_Crash \
- NestedUpcall \
- No_Server_MT_Connect_Test \
- Object_Loader \
- Objref_Sequence_Test \
- OBV \
- OctetSeq \
- Oneway_Buffering \
- Oneways_Invoking_Twoways \
- ORB_destroy \
- ORB_init \
- ORB_shutdown \
- ORT \
- Param_Test \
- POA \
- Policies \
- Portable_Interceptors \
- QtTests \
- Queued_Message_Test \
- Reliable_Oneways \
- RTCORBA \
- RTScheduling \
- Server_Leaks \
- Single_Read \
- Smart_Proxies \
- Stack_Recursion \
- Strategies \
- Timed_Buffered_Oneways \
- Timeout \
- Two_Objects \
- UNKNOWN_Exception
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Multiple/Makefile.bor b/TAO/tests/Multiple/Makefile.bor
deleted file mode 100644
index 74ee4bb0cba..00000000000
--- a/TAO/tests/Multiple/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Multiple test
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Multiple/client.bor b/TAO/tests/Multiple/client.bor
deleted file mode 100644
index b59831c8787..00000000000
--- a/TAO/tests/Multiple/client.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Multiple test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MultipleC.obj \
- $(OBJDIR)\MultipleS.obj \
- $(OBJDIR)\Multiple_Impl.obj \
- $(OBJDIR)\Collocation_Tester.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\Multiple.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MultipleC.cpp $(IDLDIR)\MultipleS.cpp: $(IDLDIR)\Multiple.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Multiple/server.bor b/TAO/tests/Multiple/server.bor
deleted file mode 100644
index 8ee3346b579..00000000000
--- a/TAO/tests/Multiple/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Multiple test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MultipleC.obj \
- $(OBJDIR)\MultipleS.obj \
- $(OBJDIR)\Multiple_Impl.obj \
- $(OBJDIR)\Collocation_Tester.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\Multiple.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MultipleC.cpp $(IDLDIR)\MultipleS.cpp: $(IDLDIR)\Multiple.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Multiple_Inheritance/Makefile.bor b/TAO/tests/Multiple_Inheritance/Makefile.bor
deleted file mode 100644
index 5e0645c26a0..00000000000
--- a/TAO/tests/Multiple_Inheritance/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Multiple_Inheritance test
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Multiple_Inheritance/client.bor b/TAO/tests/Multiple_Inheritance/client.bor
deleted file mode 100644
index 5dd0e6f1158..00000000000
--- a/TAO/tests/Multiple_Inheritance/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Multiple_Inheritance example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Multiple_InheritanceC.obj \
- $(OBJDIR)\Multiple_InheritanceS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\Multiple_Inheritance.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Multiple_InheritanceC.cpp $(IDLDIR)\Multiple_InheritanceS.cpp: $(IDLDIR)\Multiple_Inheritance.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Multiple_Inheritance/server.bor b/TAO/tests/Multiple_Inheritance/server.bor
deleted file mode 100644
index f740c1bf9dc..00000000000
--- a/TAO/tests/Multiple_Inheritance/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Multiple_Inheritance test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Multiple_InheritanceC.obj \
- $(OBJDIR)\Multiple_InheritanceS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\Multiple_Inheritance.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Multiple_InheritanceC.cpp $(IDLDIR)\Multiple_InheritancetS.cpp: $(IDLDIR)\Multiple_Inheritance.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Muxed_GIOP_Versions/Makefile.bor b/TAO/tests/Muxed_GIOP_Versions/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.bor b/TAO/tests/Muxed_GIOP_Versions/client.bor
deleted file mode 100644
index 8a93258545a..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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/tests/Muxed_GIOP_Versions/server.bor b/TAO/tests/Muxed_GIOP_Versions/server.bor
deleted file mode 100644
index 5e4f8d8dbb7..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Muxing/Makefile.bor b/TAO/tests/Muxing/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Muxing/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Muxing/client.bor b/TAO/tests/Muxing/client.bor
deleted file mode 100644
index 166e95da035..00000000000
--- a/TAO/tests/Muxing/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\Client_Task.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/tests/Muxing/server.bor b/TAO/tests/Muxing/server.bor
deleted file mode 100644
index 97aeeb82a28..00000000000
--- a/TAO/tests/Muxing/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\Receiver.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Native_Exceptions/Makefile.bor b/TAO/tests/Native_Exceptions/Makefile.bor
deleted file mode 100644
index 046222a4a37..00000000000
--- a/TAO/tests/Native_Exceptions/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the forwarding example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Native_Exceptions/client.bor b/TAO/tests/Native_Exceptions/client.bor
deleted file mode 100644
index d8d28547fe8..00000000000
--- a/TAO/tests/Native_Exceptions/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the native_exceptions test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 0
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Native_Exceptions/server.bor b/TAO/tests/Native_Exceptions/server.bor
deleted file mode 100644
index aaae22b1067..00000000000
--- a/TAO/tests/Native_Exceptions/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the native examples test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 0
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor
deleted file mode 100644
index 6dd966a6e1b..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the MT_Client_Test test
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.bor b/TAO/tests/NestedUpcall/MT_Client_Test/client.bor
deleted file mode 100644
index 765e1323fca..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the MT_Client_Test example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MT_Client_TestC.obj \
- $(OBJDIR)\MT_Client_TestS.obj \
- $(OBJDIR)\MT_Object_i.obj \
- $(OBJDIR)\local_server.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- MT_Client_Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MT_Client_TestC.cpp $(IDLDIR)\MT_Client_TestS.cpp: $(IDLDIR)\MT_Client_Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.bor b/TAO/tests/NestedUpcall/MT_Client_Test/server.bor
deleted file mode 100644
index b85f0d6afd1..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the MT_Client_Test example
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\MT_Client_TestC.obj \
- $(OBJDIR)\MT_Client_TestS.obj \
- $(OBJDIR)\MT_Object_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- MT_Client_Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\MT_Client_TestC.cpp $(IDLDIR)\MT_Client_TestS.cpp: $(IDLDIR)\MT_Client_Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/Makefile.bor b/TAO/tests/NestedUpcall/Makefile.bor
deleted file mode 100644
index 73382233d40..00000000000
--- a/TAO/tests/NestedUpcall/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO NestedUpCall tests
-#
-
-DIRS = \
- MT_Client_Test \
- Simple \
- Triangle_Test
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/NestedUpcall/Simple/Makefile.bor b/TAO/tests/NestedUpcall/Simple/Makefile.bor
deleted file mode 100644
index 17cc5846b76..00000000000
--- a/TAO/tests/NestedUpcall/Simple/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Simple example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/NestedUpcall/Simple/client.bor b/TAO/tests/NestedUpcall/Simple/client.bor
deleted file mode 100644
index be05c9633e5..00000000000
--- a/TAO/tests/NestedUpcall/Simple/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Simple test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/Simple/server.bor b/TAO/tests/NestedUpcall/Simple/server.bor
deleted file mode 100644
index 80a70aa56d8..00000000000
--- a/TAO/tests/NestedUpcall/Simple/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Simple test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor b/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor
deleted file mode 100644
index 972effa3e23..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-#
-# Makefile for building the Triangle_Test test
-#
-
-MAKEFILES = \
- server_A.bor \
- server_B.bor \
- initiator.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor b/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor
deleted file mode 100644
index b516f8e70bf..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.bor
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-#
-# Makefile for building the Triangle_Test example
-#
-
-NAME = initiator
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Triangle_TestC.obj \
- $(OBJDIR)\Triangle_TestS.obj \
- $(OBJDIR)\initiator.obj \
- $(OBJDIR)\initiator_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- Triangle_Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
- $(TAO_IDL) $**
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor b/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor
deleted file mode 100644
index 392f5be602d..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Triangle_Test example
-#
-
-NAME = server_a
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Triangle_TestC.obj \
- $(OBJDIR)\Triangle_TestS.obj \
- $(OBJDIR)\Server_A.obj \
- $(OBJDIR)\object_A_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- Triangle_Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor b/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor
deleted file mode 100644
index 5d1bf2d4cef..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Triangle_Test example
-#
-
-NAME = server_b
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Triangle_TestC.obj \
- $(OBJDIR)\Triangle_TestS.obj \
- $(OBJDIR)\Server_b.obj \
- $(OBJDIR)\Object_B_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- Triangle_Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Triangle_TestC.cpp $(IDLDIR)\Triangle_TestS.cpp: $(IDLDIR)\Triangle_Test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Nested_Event_Loop/Makefile.bor b/TAO/tests/Nested_Event_Loop/Makefile.bor
deleted file mode 100644
index 3aba18bea37..00000000000
--- a/TAO/tests/Nested_Event_Loop/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Nested_Event_Loop example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Nested_Event_Loop/client.bor b/TAO/tests/Nested_Event_Loop/client.bor
deleted file mode 100644
index c870758f854..00000000000
--- a/TAO/tests/Nested_Event_Loop/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Nested_Event_Loop example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Nested_Event_Loop/server.bor b/TAO/tests/Nested_Event_Loop/server.bor
deleted file mode 100644
index aca11402ae3..00000000000
--- a/TAO/tests/Nested_Event_Loop/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Nested_Event_Loop example
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Nested_Upcall_Crash/Makefile.bor b/TAO/tests/Nested_Upcall_Crash/Makefile.bor
deleted file mode 100644
index 01faf9c1c51..00000000000
--- a/TAO/tests/Nested_Upcall_Crash/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Nested_Upcall_Crash test executables
-#
-
-MAKEFILES = server.bor client.bor scavenger.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Nested_Upcall_Crash/client.bor b/TAO/tests/Nested_Upcall_Crash/client.bor
deleted file mode 100644
index dba6d5f3b80..00000000000
--- a/TAO/tests/Nested_Upcall_Crash/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Nested_Upcall_Crash client executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Clock_Ticks.obj \
- $(OBJDIR)\Client_Peer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.bor b/TAO/tests/Nested_Upcall_Crash/scavenger.bor
deleted file mode 100644
index c2a9ea93381..00000000000
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Nested_Upcall_Crash scavenger executable
-#
-
-NAME = scavenger
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\scavenger.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Nested_Upcall_Crash/server.bor b/TAO/tests/Nested_Upcall_Crash/server.bor
deleted file mode 100644
index 884055d5f28..00000000000
--- a/TAO/tests/Nested_Upcall_Crash/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Nested_Upcall_Crash server executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Server_Peer.obj \
- $(OBJDIR)\Clock_Ticks.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/No_Server_MT_Connect_Test/Makefile.bor b/TAO/tests/No_Server_MT_Connect_Test/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/No_Server_MT_Connect_Test/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/tests/No_Server_MT_Connect_Test/client.bor b/TAO/tests/No_Server_MT_Connect_Test/client.bor
deleted file mode 100644
index 5b207f5444c..00000000000
--- a/TAO/tests/No_Server_MT_Connect_Test/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/tests/No_Server_MT_Connect_Test/server.bor b/TAO/tests/No_Server_MT_Connect_Test/server.bor
deleted file mode 100644
index 282c6d6dee0..00000000000
--- a/TAO/tests/No_Server_MT_Connect_Test/server.bor
+++ /dev/null
@@ -1,39 +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)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Any/Makefile.bor b/TAO/tests/OBV/Any/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/OBV/Any/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/tests/OBV/Any/client.bor b/TAO/tests/OBV/Any/client.bor
deleted file mode 100644
index 00ee8f978ad..00000000000
--- a/TAO/tests/OBV/Any/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\AnyC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Any.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\AnyS.cpp $(IDLDIR)\AnyC.cpp: $(IDLDIR)\Any.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Any/server.bor b/TAO/tests/OBV/Any/server.bor
deleted file mode 100644
index 809d1e7fb4f..00000000000
--- a/TAO/tests/OBV/Any/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\AnyC.obj \
- $(OBJDIR)\AnyS.obj \
- $(OBJDIR)\AnyS_impl.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Any.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\AnyS.cpp $(IDLDIR)\AnyC.cpp: $(IDLDIR)\Any.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Factory/Makefile.bor b/TAO/tests/OBV/Factory/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/OBV/Factory/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/tests/OBV/Factory/client.bor b/TAO/tests/OBV/Factory/client.bor
deleted file mode 100644
index 97d8b88cc1f..00000000000
--- a/TAO/tests/OBV/Factory/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\FactoryC.obj \
- $(OBJDIR)\FactoryC_impl.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Factory.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FactoryS.cpp $(IDLDIR)\FactoryC.cpp: $(IDLDIR)\Factory.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Factory/server.bor b/TAO/tests/OBV/Factory/server.bor
deleted file mode 100644
index 5b9517465d0..00000000000
--- a/TAO/tests/OBV/Factory/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\FactoryC.obj \
- $(OBJDIR)\FactoryS.obj \
- $(OBJDIR)\FactoryC_impl.obj \
- $(OBJDIR)\FactoryS_impl.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Factory.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\FactoryS.cpp $(IDLDIR)\FactoryC.cpp: $(IDLDIR)\Factory.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Forward/Makefile.bor b/TAO/tests/OBV/Forward/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/OBV/Forward/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/tests/OBV/Forward/client.bor b/TAO/tests/OBV/Forward/client.bor
deleted file mode 100644
index bbd6450b569..00000000000
--- a/TAO/tests/OBV/Forward/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TreeBaseC.obj \
- $(OBJDIR)\TreeControllerC.obj \
- $(OBJDIR)\TreeNodeC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\TreeBase.idl \
- $(IDLDIR)\TreeController.idl \
- $(IDLDIR)\TreeNode.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TreeBaseS.cpp $(IDLDIR)\TreeBaseC.cpp: $(IDLDIR)\TreeBase.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\TreeControllerS.cpp $(IDLDIR)\TreeControllerC.cpp: $(IDLDIR)\TreeController.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\TreeNodeS.cpp $(IDLDIR)\TreeNodeC.cpp: $(IDLDIR)\TreeNode.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Forward/server.bor b/TAO/tests/OBV/Forward/server.bor
deleted file mode 100644
index edefbb99c34..00000000000
--- a/TAO/tests/OBV/Forward/server.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TreeBaseC.obj \
- $(OBJDIR)\TreeControllerC.obj \
- $(OBJDIR)\TreeNodeC.obj \
- $(OBJDIR)\TreeBaseS.obj \
- $(OBJDIR)\TreeControllerS.obj \
- $(OBJDIR)\TreeNodeS.obj \
- $(OBJDIR)\Test_impl.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\TreeBase.idl \
- $(IDLDIR)\TreeController.idl \
- $(IDLDIR)\TreeNode.idl
-
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TreeBaseS.cpp $(IDLDIR)\TreeBaseC.cpp: $(IDLDIR)\TreeBase.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\TreeControllerS.cpp $(IDLDIR)\TreeControllerC.cpp: $(IDLDIR)\TreeController.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\TreeNodeS.cpp $(IDLDIR)\TreeNodeC.cpp: $(IDLDIR)\TreeNode.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OBV/Makefile.bor b/TAO/tests/OBV/Makefile.bor
deleted file mode 100644
index 2e9104c2dec..00000000000
--- a/TAO/tests/OBV/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-DIRS = \
- Any \
- Factory \
- Forward \
- TC_Alignment
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/OBV/TC_Alignment/Makefile.bor b/TAO/tests/OBV/TC_Alignment/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/OBV/TC_Alignment/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/tests/OBV/TC_Alignment/client.bor b/TAO/tests/OBV/TC_Alignment/client.bor
deleted file mode 100644
index f9c4133db87..00000000000
--- a/TAO/tests/OBV/TC_Alignment/client.bor
+++ /dev/null
@@ -1,37 +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) \
- $(TAOVALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_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/tests/OBV/TC_Alignment/server.bor b/TAO/tests/OBV/TC_Alignment/server.bor
deleted file mode 100644
index 47a693fdef6..00000000000
--- a/TAO/tests/OBV/TC_Alignment/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)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_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/tests/ORB_destroy/Makefile.bor b/TAO/tests/ORB_destroy/Makefile.bor
deleted file mode 100644
index 26df6af6d7e..00000000000
--- a/TAO/tests/ORB_destroy/Makefile.bor
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the ORB_destroy test
-#
-
-NAME = ORB_destroy
-
-OBJFILES = \
- $(OBJDIR)\ORB_destroy.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/ORB_init/Portspan/Makefile.bor b/TAO/tests/ORB_init/Portspan/Makefile.bor
deleted file mode 100644
index bf98ebd411a..00000000000
--- a/TAO/tests/ORB_init/Portspan/Makefile.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the ORB_init Portscan test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\SimpleC.obj \
- $(OBJDIR)\SimpleI.obj \
- $(OBJDIR)\SimpleS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Simple.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\SimpleS.cpp $(IDLDIR)\SimpleC.cpp: $(IDLDIR)\Simple.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/ORB_init/makefile.bor b/TAO/tests/ORB_init/makefile.bor
deleted file mode 100644
index 9712581efd7..00000000000
--- a/TAO/tests/ORB_init/makefile.bor
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the ORB_init test
-#
-
-DIRS = \
- Portspan
-
-NAME = ORB_init
-
-OBJFILES = \
- $(OBJDIR)\ORB_init.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/tests/ORB_shutdown/Makefile.bor b/TAO/tests/ORB_shutdown/Makefile.bor
deleted file mode 100644
index 22618e99c82..00000000000
--- a/TAO/tests/ORB_shutdown/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/ORB_shutdown/server.bor b/TAO/tests/ORB_shutdown/server.bor
deleted file mode 100644
index 27b6d3fbcc4..00000000000
--- a/TAO/tests/ORB_shutdown/server.bor
+++ /dev/null
@@ -1,39 +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)\Foo_Bar.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/ORT/Makefile.bor b/TAO/tests/ORT/Makefile.bor
deleted file mode 100644
index 40f0968b4c8..00000000000
--- a/TAO/tests/ORT/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the ORT test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/ORT/client.bor b/TAO/tests/ORT/client.bor
deleted file mode 100644
index 9a282ecea3d..00000000000
--- a/TAO/tests/ORT/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the ORT client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\ORT_testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\ORT_test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ORT_testS.cpp $(IDLDIR)\ORT_testC.cpp: $(IDLDIR)\ORT_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/ORT/server.bor b/TAO/tests/ORT/server.bor
deleted file mode 100644
index 63a3365390d..00000000000
--- a/TAO/tests/ORT/server.bor
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Borland Makefile for building the ORT server
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\ORT_testS.obj \
- $(OBJDIR)\ORT_testC.obj \
- $(OBJDIR)\ORT_test_i.obj \
- $(OBJDIR)\ObjectReferenceFactoryC.obj \
- $(OBJDIR)\ORT_test_IORInterceptor.obj \
- $(OBJDIR)\ObjectReferenceFactory.obj \
- $(OBJDIR)\ServerRequestInterceptor.obj \
- $(OBJDIR)\ServerORBInitializer.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_ORT_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_ORT_LIB) \
- $(TAO_IORINTERCEPTOR_LIB) \
- $(TAO_VALUETYPE_LIB)
-
-IDLFILES = \
- $(IDLDIR)\ORT_test.idl \
- $(IDLDIR)\ObjectReferenceFactory.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\ORT_testS.cpp $(IDLDIR)\ORT_testC.cpp: $(IDLDIR)\ORT_test.idl
- $(TAO_IDL) $**
-
-$(IDLDIR)\ObjectReferenceFactoryC.cpp: $(IDLDIR)\ObjectReferenceFactory.idl
- $(TAO_IDL) -DCORBA3 -I..\.. $**
diff --git a/TAO/tests/Object_Loader/Makefile.bor b/TAO/tests/Object_Loader/Makefile.bor
deleted file mode 100644
index 2a328a87239..00000000000
--- a/TAO/tests/Object_Loader/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Object_Loader test
-#
-
-MAKEFILES = \
- test_dll.bor \
- driver.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Object_Loader/driver.bor b/TAO/tests/Object_Loader/driver.bor
deleted file mode 100644
index 2a73006fedd..00000000000
--- a/TAO/tests/Object_Loader/driver.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Object_Loader test
-#
-
-NAME = driver
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\driver.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Object_Loader/test_dll.bor b/TAO/tests/Object_Loader/test_dll.bor
deleted file mode 100644
index 2a5b1581430..00000000000
--- a/TAO/tests/Object_Loader/test_dll.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Object_Loader test
-#
-
-NAME = test_dll
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\Loader.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- -DOLT_BUILD_DLL=1
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Objref_Sequence_Test/Makefile.bor b/TAO/tests/Objref_Sequence_Test/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Objref_Sequence_Test/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/tests/Objref_Sequence_Test/client.bor b/TAO/tests/Objref_Sequence_Test/client.bor
deleted file mode 100644
index 8cbcb24dee6..00000000000
--- a/TAO/tests/Objref_Sequence_Test/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/tests/Objref_Sequence_Test/server.bor b/TAO/tests/Objref_Sequence_Test/server.bor
deleted file mode 100644
index ae8b6a9205b..00000000000
--- a/TAO/tests/Objref_Sequence_Test/server.bor
+++ /dev/null
@@ -1,38 +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)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OctetSeq/Makefile.bor b/TAO/tests/OctetSeq/Makefile.bor
deleted file mode 100644
index 5fb3784735e..00000000000
--- a/TAO/tests/OctetSeq/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the OctetSeq test executables
-#
-
-MAKEFILES = client.bor server.bor OctetSeq.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/OctetSeq/OctetSeq.bor b/TAO/tests/OctetSeq/OctetSeq.bor
deleted file mode 100644
index b7f3e10bbbf..00000000000
--- a/TAO/tests/OctetSeq/OctetSeq.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the OctetSeq
-#
-
-NAME = OctetSeq
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\OctetSeq.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OctetSeq/client.bor b/TAO/tests/OctetSeq/client.bor
deleted file mode 100644
index 1eef255c36b..00000000000
--- a/TAO/tests/OctetSeq/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the OctetSeq client
-#
-
-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) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/OctetSeq/server.bor b/TAO/tests/OctetSeq/server.bor
deleted file mode 100644
index 66f739c179f..00000000000
--- a/TAO/tests/OctetSeq/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the OctetSeq server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Oneway_Buffering/Makefile.bor b/TAO/tests/Oneway_Buffering/Makefile.bor
deleted file mode 100644
index ebf90391f43..00000000000
--- a/TAO/tests/Oneway_Buffering/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-MAKEFILES = admin.bor server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Oneway_Buffering/admin.bor b/TAO/tests/Oneway_Buffering/admin.bor
deleted file mode 100644
index 3f3fdee2c23..00000000000
--- a/TAO/tests/Oneway_Buffering/admin.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-NAME = admin
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Oneway_Buffering_Admin.obj \
- $(OBJDIR)\admin.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Oneway_Buffering/client.bor b/TAO/tests/Oneway_Buffering/client.bor
deleted file mode 100644
index 07a5df8a53a..00000000000
--- a/TAO/tests/Oneway_Buffering/client.bor
+++ /dev/null
@@ -1,39 +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) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_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/tests/Oneway_Buffering/server.bor b/TAO/tests/Oneway_Buffering/server.bor
deleted file mode 100644
index 54fe1187578..00000000000
--- a/TAO/tests/Oneway_Buffering/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)\Oneway_Buffering.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Makefile.bor b/TAO/tests/Oneways_Invoking_Twoways/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Oneways_Invoking_Twoways/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.bor b/TAO/tests/Oneways_Invoking_Twoways/client.bor
deleted file mode 100644
index 46c16851f75..00000000000
--- a/TAO/tests/Oneways_Invoking_Twoways/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Client_Task.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\Receiver_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.bor b/TAO/tests/Oneways_Invoking_Twoways/server.bor
deleted file mode 100644
index 43a4f8ed5e4..00000000000
--- a/TAO/tests/Oneways_Invoking_Twoways/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\Sender_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Current/makefile.bor b/TAO/tests/POA/Current/makefile.bor
deleted file mode 100644
index c5594e810c4..00000000000
--- a/TAO/tests/POA/Current/makefile.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-#
-# Makefile for building the Current test
-#
-
-NAME = Current
-
-
-OBJFILES = \
- $(OBJDIR)\Current.obj
-
-CPPDIR = .
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/tests/POA/Default_Servant/makefile.bor b/TAO/tests/POA/Default_Servant/makefile.bor
deleted file mode 100644
index 430ab784b70..00000000000
--- a/TAO/tests/POA/Default_Servant/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Destuction test
-#
-
-NAME = Default_Servant
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Default_Servant.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Etherealization/makefile.bor b/TAO/tests/POA/Etherealization/makefile.bor
deleted file mode 100644
index 0aa9d6aa2da..00000000000
--- a/TAO/tests/POA/Etherealization/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Destuction test
-#
-
-NAME = Etherealization
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Etherealization.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/makefile.bor b/TAO/tests/POA/Excessive_Object_Deactivations/makefile.bor
deleted file mode 100644
index 299b2586de4..00000000000
--- a/TAO/tests/POA/Excessive_Object_Deactivations/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Destuction test
-#
-
-NAME = Excessive_Object_Deactivations
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Excessive_Object_Deactivations.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Identity/makefile.bor b/TAO/tests/POA/Identity/makefile.bor
deleted file mode 100644
index 483c3dc5674..00000000000
--- a/TAO/tests/POA/Identity/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Identity test
-#
-
-NAME = Identity
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Identity.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/MT_Servant_Locator/makefile.bor b/TAO/tests/POA/MT_Servant_Locator/makefile.bor
deleted file mode 100644
index ee6c903b6f0..00000000000
--- a/TAO/tests/POA/MT_Servant_Locator/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA MT_Servant_Locator test
-#
-
-NAME = MT_Servant_Locator
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\MT_Servant_Locator.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Makefile.bor b/TAO/tests/POA/Makefile.bor
deleted file mode 100644
index 7cd9a133369..00000000000
--- a/TAO/tests/POA/Makefile.bor
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO POA tests
-#
-
-DIRS = \
- Object_Reactivation \
- Excessive_Object_Deactivations \
- Etherealization \
- POA_Destruction \
- Default_Servant \
- Identity \
- Non_Servant_Upcalls \
- MT_Servant_Locator \
- Nested_Non_Servant_Upcalls \
- Single_Threaded_POA \
- Persistent_ID \
- Policies \
- Current \
- wait_for_completion
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/makefile.bor b/TAO/tests/POA/Nested_Non_Servant_Upcalls/makefile.bor
deleted file mode 100644
index a6776e2ae7f..00000000000
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Nested_Non_Servant_Upcalls test
-#
-
-NAME = Nested_Non_Servant_Upcalls
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Nested_Non_Servant_Upcalls.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/makefile.bor b/TAO/tests/POA/Non_Servant_Upcalls/makefile.bor
deleted file mode 100644
index 1f5b8895c15..00000000000
--- a/TAO/tests/POA/Non_Servant_Upcalls/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Non_Servant_Upcalls test
-#
-
-NAME = Non_Servant_Upcalls
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Non_Servant_Upcalls.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Object_Reactivation/makefile.bor b/TAO/tests/POA/Object_Reactivation/makefile.bor
deleted file mode 100644
index 275aac19ddf..00000000000
--- a/TAO/tests/POA/Object_Reactivation/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Object_Reactivation test
-#
-
-NAME = Object_Reactivation
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Object_Reactivation.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/POA_Destruction/makefile.bor b/TAO/tests/POA/POA_Destruction/makefile.bor
deleted file mode 100644
index 5e802f036a4..00000000000
--- a/TAO/tests/POA/POA_Destruction/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Destuction test
-#
-
-NAME = POA_Destruction
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\POA_Destruction.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Persistent_ID/Makefile.bor b/TAO/tests/POA/Persistent_ID/Makefile.bor
deleted file mode 100644
index 5266d264ed8..00000000000
--- a/TAO/tests/POA/Persistent_ID/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the POA Forwarding examples
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/POA/Persistent_ID/client.bor b/TAO/tests/POA/Persistent_ID/client.bor
deleted file mode 100644
index a943b5f29cb..00000000000
--- a/TAO/tests/POA/Persistent_ID/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the POA Forwarding executable
-#
-
-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) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Persistent_ID/server.bor b/TAO/tests/POA/Persistent_ID/server.bor
deleted file mode 100644
index ce8a3dc8f1d..00000000000
--- a/TAO/tests/POA/Persistent_ID/server.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the POA Forwarding executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/Policies/makefile.bor b/TAO/tests/POA/Policies/makefile.bor
deleted file mode 100644
index 20936a1b892..00000000000
--- a/TAO/tests/POA/Policies/makefile.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-#
-# Makefile for building the Policies test
-#
-
-NAME = Policies
-
-
-OBJFILES = \
- $(OBJDIR)\Policies.obj
-
-CPPDIR = .
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/tests/POA/Single_Threaded_POA/makefile.bor b/TAO/tests/POA/Single_Threaded_POA/makefile.bor
deleted file mode 100644
index 495fb055bf7..00000000000
--- a/TAO/tests/POA/Single_Threaded_POA/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Single_Threaded_POA test
-#
-
-NAME = Single_Threaded_POA
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Single_Threaded_POA.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/POA/wait_for_completion/makefile.bor b/TAO/tests/POA/wait_for_completion/makefile.bor
deleted file mode 100644
index ee0989d3222..00000000000
--- a/TAO/tests/POA/wait_for_completion/makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the POA Destuction test
-#
-
-NAME = wait_for_completion
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\wait_for_completion.obj
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Param_Test/Makefile.bor b/TAO/tests/Param_Test/Makefile.bor
deleted file mode 100644
index b5db339ef14..00000000000
--- a/TAO/tests/Param_Test/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Param_Test executables
-#
-
-MAKEFILES = \
- server.bor \
- client.bor \
- anyop.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Param_Test/anyop.bor b/TAO/tests/Param_Test/anyop.bor
deleted file mode 100644
index a852bdfb2e2..00000000000
--- a/TAO/tests/Param_Test/anyop.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the anyop client
-#
-
-NAME = anyop
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. \
- -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\param_testC.obj \
- $(OBJDIR)\anyop.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICINTERFACE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICINTERFACE_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\param_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\param_testS.cpp $(IDLDIR)\param_testC.cpp: $(IDLDIR)\param_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Param_Test/client.bor b/TAO/tests/Param_Test/client.bor
deleted file mode 100644
index c41ac092bf5..00000000000
--- a/TAO/tests/Param_Test/client.bor
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id$
-#
-# Makefile for building the Param_Test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. \
- -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\param_testS.obj \
- $(OBJDIR)\param_testC.obj \
- $(OBJDIR)\driver.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\options.obj \
- $(OBJDIR)\results.obj \
- $(OBJDIR)\helper.obj \
- $(OBJDIR)\any.obj \
- $(OBJDIR)\bd_long_seq.obj \
- $(OBJDIR)\bd_short_seq.obj \
- $(OBJDIR)\bd_str_seq.obj \
- $(OBJDIR)\bd_wstr_seq.obj \
- $(OBJDIR)\bd_string.obj \
- $(OBJDIR)\bd_wstring.obj \
- $(OBJDIR)\bd_struct_seq.obj \
- $(OBJDIR)\bd_array_seq.obj \
- $(OBJDIR)\fixed_array.obj \
- $(OBJDIR)\fixed_struct.obj \
- $(OBJDIR)\nested_struct.obj \
- $(OBJDIR)\objref_struct.obj \
- $(OBJDIR)\objref.obj \
- $(OBJDIR)\short.obj \
- $(OBJDIR)\ulonglong.obj \
- $(OBJDIR)\typecode.obj \
- $(OBJDIR)\ub_any_seq.obj \
- $(OBJDIR)\ub_long_seq.obj \
- $(OBJDIR)\ub_objref_seq.obj \
- $(OBJDIR)\ub_short_seq.obj \
- $(OBJDIR)\ub_str_seq.obj \
- $(OBJDIR)\ub_wstr_seq.obj \
- $(OBJDIR)\ub_string.obj \
- $(OBJDIR)\ub_wstring.obj \
- $(OBJDIR)\ub_struct_seq.obj \
- $(OBJDIR)\ub_array_seq.obj \
- $(OBJDIR)\var_array.obj \
- $(OBJDIR)\var_struct.obj \
- $(OBJDIR)\recursive_struct.obj \
- $(OBJDIR)\recursive_union.obj \
- $(OBJDIR)\except.obj \
- $(OBJDIR)\big_union.obj \
- $(OBJDIR)\small_union.obj \
- $(OBJDIR)\multdim_array.obj \
- $(OBJDIR)\complex_any.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_DYNAMICINTERFACE_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_DYNAMICINTERFACE_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\param_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\param_testS.cpp $(IDLDIR)\param_testC.cpp: $(IDLDIR)\param_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Param_Test/server.bor b/TAO/tests/Param_Test/server.bor
deleted file mode 100644
index 7efc09cc295..00000000000
--- a/TAO/tests/Param_Test/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Param_Test server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. \
- -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\param_testS.obj \
- $(OBJDIR)\param_testC.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\param_test_i.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\param_test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\param_testS.cpp $(IDLDIR)\param_testC.cpp: $(IDLDIR)\param_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Policies/Makefile.bor b/TAO/tests/Policies/Makefile.bor
deleted file mode 100644
index a281e8f4beb..00000000000
--- a/TAO/tests/Policies/Makefile.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the Policies test
-#
-
-NAME = Manipulation
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Manipulation.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
-
-
diff --git a/TAO/tests/Portable_Interceptors/AMI/Makefile.bor b/TAO/tests/Portable_Interceptors/AMI/Makefile.bor
deleted file mode 100644
index fffdccf0b31..00000000000
--- a/TAO/tests/Portable_Interceptors/AMI/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building the Interceptors test executables
-#
-# $Id$
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.bor b/TAO/tests/Portable_Interceptors/AMI/client.bor
deleted file mode 100644
index 44ab86d2eac..00000000000
--- a/TAO/tests/Portable_Interceptors/AMI/client.bor
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PortableInterceptor AMI test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Client_ORBInitializer.obj \
- $(OBJDIR)\Client_Interceptor.obj \
- $(OBJDIR)\Echo_Handler.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_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) -GC $**
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.bor b/TAO/tests/Portable_Interceptors/AMI/server.bor
deleted file mode 100644
index 49414d0ab43..00000000000
--- a/TAO/tests/Portable_Interceptors/AMI/server.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PortableInterceptors AMI test server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\Echo.obj \
- $(OBJDIR)\Server_ORBInitializer.obj \
- $(OBJDIR)\Server_Interceptor.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_VALUETYPE_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_VALUETYPE_LIB) \
- $(TAO_MESSAGING_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) -GC $**
-
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.bor b/TAO/tests/Portable_Interceptors/Benchmark/Makefile.bor
deleted file mode 100644
index 32a8f524697..00000000000
--- a/TAO/tests/Portable_Interceptors/Benchmark/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.bor b/TAO/tests/Portable_Interceptors/Benchmark/client.bor
deleted file mode 100644
index e15ab6bf3eb..00000000000
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\Marker.obj \
- $(OBJDIR)\Client_ORBInitializer.obj \
- $(OBJDIR)\Interceptor_Type.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/tests/Portable_Interceptors/Benchmark/server.bor b/TAO/tests/Portable_Interceptors/Benchmark/server.bor
deleted file mode 100644
index e89b8693a16..00000000000
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\Server_ORBInitializer.obj \
- $(OBJDIR)\Marker.obj \
- $(OBJDIR)\Interceptor_Type.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.bor b/TAO/tests/Portable_Interceptors/Dynamic/Makefile.bor
deleted file mode 100644
index 32a8f524697..00000000000
--- a/TAO/tests/Portable_Interceptors/Dynamic/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.bor b/TAO/tests/Portable_Interceptors/Dynamic/client.bor
deleted file mode 100644
index e17522b23ff..00000000000
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Echo_Client_ORBInitializer.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/tests/Portable_Interceptors/Dynamic/server.bor b/TAO/tests/Portable_Interceptors/Dynamic/server.bor
deleted file mode 100644
index f77d31e911b..00000000000
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\Echo_Server_ORBInitializer.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.bor b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.bor
deleted file mode 100644
index 32a8f524697..00000000000
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.bor b/TAO/tests/Portable_Interceptors/ForwardRequest/client.bor
deleted file mode 100644
index d5d1d34f3eb..00000000000
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ForwardRequest test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Client_Request_Interceptor.obj \
- $(OBJDIR)\Client_ORBInitializer.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) -DCORBA3 -I..\..\.. $**
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor b/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
deleted file mode 100644
index fc5e8554ad8..00000000000
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ForwardRequest test client
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\Server_Request_Interceptor.obj \
- $(OBJDIR)\Server_ORBInitializer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) -DCORBA3 -I..\..\.. $**
-
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.bor b/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.bor
deleted file mode 100644
index 32a8f524697..00000000000
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.bor b/TAO/tests/Portable_Interceptors/IORInterceptor/client.bor
deleted file mode 100644
index 4749dd3c98d..00000000000
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -I../../.. -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\FOO_ClientRequestInterceptor.obj \
- $(OBJDIR)\FOO_Client_ORBInitializer.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/tests/Portable_Interceptors/IORInterceptor/server.bor b/TAO/tests/Portable_Interceptors/IORInterceptor/server.bor
deleted file mode 100644
index 855ffb8fa75..00000000000
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -I../../.. -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\FOO_IORInterceptor.obj \
- $(OBJDIR)\FOO_IORInterceptor_ORBInitializer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_IORINTERCEPTOR_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_IORINTERCEPTOR_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Portable_Interceptors/Makefile.bor b/TAO/tests/Portable_Interceptors/Makefile.bor
deleted file mode 100644
index 3fc12edc586..00000000000
--- a/TAO/tests/Portable_Interceptors/Makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-#
-# Makefile for building the TAO Portable_Interceptors tests
-#
-
-DIRS = \
- Benchmark \
- Dynamic \
- Service_Context_Manipulation \
- IORInterceptor \
- ForwardRequest \
- Request_Interceptor_Flow \
- AMI \
- PICurrent \
- ORB_Shutdown
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.bor b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.bor
deleted file mode 100644
index 7b4afd5c3e8..00000000000
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the PI ORB::shutdown() test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.bor b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.bor
deleted file mode 100644
index 3e1e9062e49..00000000000
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PI ORB::shutdown() test client
-#
-
-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) -I..\..\.. $**
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.bor b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.bor
deleted file mode 100644
index 2ec8f8c0153..00000000000
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PI ORB::shutdown() test server.
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\Server_Request_Interceptor.obj \
- $(OBJDIR)\Server_ORBInitializer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) -I..\..\.. $**
-
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.bor b/TAO/tests/Portable_Interceptors/PICurrent/Makefile.bor
deleted file mode 100644
index 69a2fb60144..00000000000
--- a/TAO/tests/Portable_Interceptors/PICurrent/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the PICurrent test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.bor b/TAO/tests/Portable_Interceptors/PICurrent/client.bor
deleted file mode 100644
index e630c3a2eaa..00000000000
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PICurrent test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\ClientRequestInterceptor.obj \
- $(OBJDIR)\ClientORBInitializer.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/tests/Portable_Interceptors/PICurrent/server.bor b/TAO/tests/Portable_Interceptors/PICurrent/server.bor
deleted file mode 100644
index 1f5064ed546..00000000000
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the PICurrent test client
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\ServerRequestInterceptor.obj \
- $(OBJDIR)\ServerORBInitializer.obj \
- $(OBJDIR)\ClientRequestInterceptor2.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.bor b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.bor
deleted file mode 100644
index cf47e5769bd..00000000000
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Request_Interceptor_Flow test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.bor b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.bor
deleted file mode 100644
index ed543290446..00000000000
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ForwardRequest test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\Request_Interceptor.obj \
- $(OBJDIR)\Client_Request_Interceptor.obj \
- $(OBJDIR)\Client_ORBInitializer.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/tests/Portable_Interceptors/Request_Interceptor_Flow/server.bor b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.bor
deleted file mode 100644
index 6417ca803d9..00000000000
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the ForwardRequest test client
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\Request_Interceptor.obj \
- $(OBJDIR)\Server_Request_Interceptor.obj \
- $(OBJDIR)\Server_ORBInitializer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.bor b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.bor
deleted file mode 100644
index 32a8f524697..00000000000
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.bor b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.bor
deleted file mode 100644
index 9a72b2142d4..00000000000
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.bor
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\Client_ORBInitializer.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/tests/Portable_Interceptors/Service_Context_Manipulation/server.bor b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.bor
deleted file mode 100644
index 1eae27f67e4..00000000000
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-#
-# Makefile for building the Interceptors server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\Server_ORBInitializer.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/QtTests/Makefile.bor b/TAO/tests/QtTests/Makefile.bor
deleted file mode 100644
index 8d4e0ad446e..00000000000
--- a/TAO/tests/QtTests/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the QtTest test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/QtTests/client.bor b/TAO/tests/QtTests/client.bor
deleted file mode 100644
index 4a881f70640..00000000000
--- a/TAO/tests/QtTests/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the QtTest client
-#
-
-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) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/QtTests/server.bor b/TAO/tests/QtTests/server.bor
deleted file mode 100644
index 14df5154c0f..00000000000
--- a/TAO/tests/QtTests/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the QtTest server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Queued_Message_Test/makefile.bor b/TAO/tests/Queued_Message_Test/makefile.bor
deleted file mode 100644
index a2c08f936f3..00000000000
--- a/TAO/tests/Queued_Message_Test/makefile.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-
-#
-# Makefile for building the Queued_Message_Test
-#
-
-NAME = Queued_Message_Test
-
-OBJFILES = \
- $(OBJDIR)\Queued_Message_Test.obj
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_example.bor>
-
diff --git a/TAO/tests/RTCORBA/Banded_Connections/Makefile.bor b/TAO/tests/RTCORBA/Banded_Connections/Makefile.bor
deleted file mode 100644
index 1fa1f35710e..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.bor b/TAO/tests/RTCORBA/Banded_Connections/client.bor
deleted file mode 100644
index f9daba10db3..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Banded_Connections client
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.bor b/TAO/tests/RTCORBA/Banded_Connections/server.bor
deleted file mode 100644
index 0c1810dc5f2..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile.bor b/TAO/tests/RTCORBA/Client_Propagated/Makefile.bor
deleted file mode 100644
index cb9c1a4221e..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.bor b/TAO/tests/RTCORBA/Client_Propagated/client.bor
deleted file mode 100644
index fe904f2e8b8..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\client.obj \
- $(OBJDIR)\interceptors.obj \
- $(OBJDIR)\Client_ORBInitializer.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.bor b/TAO/tests/RTCORBA/Client_Propagated/server.bor
deleted file mode 100644
index f6dede3f0a7..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Client_Protocol/Makefile.bor b/TAO/tests/RTCORBA/Client_Protocol/Makefile.bor
deleted file mode 100644
index 1fa1f35710e..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.bor b/TAO/tests/RTCORBA/Client_Protocol/client.bor
deleted file mode 100644
index 1cce7dc6de8..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol client
-#
-
-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) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.bor b/TAO/tests/RTCORBA/Client_Protocol/server.bor
deleted file mode 100644
index 6635bb0a989..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Collocation/Makefile.bor b/TAO/tests/RTCORBA/Collocation/Makefile.bor
deleted file mode 100644
index 171959b721f..00000000000
--- a/TAO/tests/RTCORBA/Collocation/Makefile.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-NAME = Collocation
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\Collocation.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor
deleted file mode 100644
index 0410cea188b..00000000000
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building Destroy_Thread_Pool
-#
-
-NAME = Destroy_Thread_Pool
-
-
-OBJFILES = \
- $(OBJDIR)\Destroy_Thread_Pool.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.bor b/TAO/tests/RTCORBA/Explicit_Binding/Makefile.bor
deleted file mode 100644
index 6a51bb4bdd3..00000000000
--- a/TAO/tests/RTCORBA/Explicit_Binding/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Explicit_Binding test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.bor b/TAO/tests/RTCORBA/Explicit_Binding/client.bor
deleted file mode 100644
index 7ac2d7583bb..00000000000
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Explicit_Binding client
-#
-
-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) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.bor b/TAO/tests/RTCORBA/Explicit_Binding/server.bor
deleted file mode 100644
index e43ead2f26c..00000000000
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Explicit Binding server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor b/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.bor b/TAO/tests/RTCORBA/Linear_Priority/client.bor
deleted file mode 100644
index 1dbc7ac6fdc..00000000000
--- a/TAO/tests/RTCORBA/Linear_Priority/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.bor b/TAO/tests/RTCORBA/Linear_Priority/server.bor
deleted file mode 100644
index 9764a14d778..00000000000
--- a/TAO/tests/RTCORBA/Linear_Priority/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.bor
deleted file mode 100644
index e6b3d8aebd8..00000000000
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
deleted file mode 100644
index 10dc010d651..00000000000
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the Server_Protocol client
-#
-
-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) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor
deleted file mode 100644
index 59b94d3365b..00000000000
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Makefile.bor b/TAO/tests/RTCORBA/Makefile.bor
deleted file mode 100644
index 073184d929a..00000000000
--- a/TAO/tests/RTCORBA/Makefile.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#
-# Makefile for building RTCORBA tests
-#
-
-DIRS = \
- Banded_Connections \
- Client_Propagated \
- Client_Protocol \
- Collocation \
- Destroy_Thread_Pool \
- Explicit_Binding \
- Linear_Priority \
- MT_Client_Protocol_Priority \
- ORB_init \
- Persistent_IOR \
- Policies \
- Policy_Combinations \
- Priority_Inversion_With_Bands \
- Private_Connection \
- Profile_And_Endpoint_Selection \
- RTMutex \
- Server_Declared \
- Server_Protocol \
- Thread_Pool
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/ORB_init/Makefile.bor b/TAO/tests/RTCORBA/ORB_init/Makefile.bor
deleted file mode 100644
index b3f28c9c50a..00000000000
--- a/TAO/tests/RTCORBA/ORB_init/Makefile.bor
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = ORB_init
-
-
-OBJFILES = \
- $(OBJDIR)\ORB_init.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.bor b/TAO/tests/RTCORBA/Persistent_IOR/client.bor
deleted file mode 100644
index 7f1b1cf7414..00000000000
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.bor b/TAO/tests/RTCORBA/Persistent_IOR/server.bor
deleted file mode 100644
index 9764a14d778..00000000000
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Policies/makefile.bor b/TAO/tests/RTCORBA/Policies/makefile.bor
deleted file mode 100644
index b7150dd5f51..00000000000
--- a/TAO/tests/RTCORBA/Policies/makefile.bor
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = Policies
-
-
-OBJFILES = \
- $(OBJDIR)\Policies.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.bor b/TAO/tests/RTCORBA/Policy_Combinations/client.bor
deleted file mode 100644
index 1dbc7ac6fdc..00000000000
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.bor b/TAO/tests/RTCORBA/Policy_Combinations/server.bor
deleted file mode 100644
index 9764a14d778..00000000000
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.bor b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.bor
deleted file mode 100644
index b4ad73c05ba..00000000000
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.bor b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.bor
deleted file mode 100644
index 253bcae49b4..00000000000
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.bor b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.bor
deleted file mode 100644
index 0051bb49a3e..00000000000
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Private_Connection/Makefile.bor b/TAO/tests/RTCORBA/Private_Connection/Makefile.bor
deleted file mode 100644
index cb9c1a4221e..00000000000
--- a/TAO/tests/RTCORBA/Private_Connection/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.bor b/TAO/tests/RTCORBA/Private_Connection/client.bor
deleted file mode 100644
index 229e398c9cd..00000000000
--- a/TAO/tests/RTCORBA/Private_Connection/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated client
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.bor b/TAO/tests/RTCORBA/Private_Connection/server.bor
deleted file mode 100644
index f6dede3f0a7..00000000000
--- a/TAO/tests/RTCORBA/Private_Connection/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Client_Propagated server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.bor b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.bor
deleted file mode 100644
index b4ad73c05ba..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.bor b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.bor
deleted file mode 100644
index 6262cf79027..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the RTCorba Profile_And_Endpoint_Selection client executable
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.bor b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.bor
deleted file mode 100644
index 6ee189af258..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the RTCorba Profile_And_Endpoint_Selection server executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/RTMutex/Makefile.bor b/TAO/tests/RTCORBA/RTMutex/Makefile.bor
deleted file mode 100644
index dc1073cf253..00000000000
--- a/TAO/tests/RTCORBA/RTMutex/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/RTMutex/server.bor b/TAO/tests/RTCORBA/RTMutex/server.bor
deleted file mode 100644
index 419d7301439..00000000000
--- a/TAO/tests/RTCORBA/RTMutex/server.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the RTMutex server
-#
-
-NAME = server
-
-
-OBJFILES = \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/TAO/tests/RTCORBA/Server_Declared/Makefile.bor b/TAO/tests/RTCORBA/Server_Declared/Makefile.bor
deleted file mode 100644
index 1fa1f35710e..00000000000
--- a/TAO/tests/RTCORBA/Server_Declared/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.bor b/TAO/tests/RTCORBA/Server_Declared/client.bor
deleted file mode 100644
index 5d498949191..00000000000
--- a/TAO/tests/RTCORBA/Server_Declared/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol client
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.bor b/TAO/tests/RTCORBA/Server_Declared/server.bor
deleted file mode 100644
index 63be69376e4..00000000000
--- a/TAO/tests/RTCORBA/Server_Declared/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Server_Protocol/Makefile.bor b/TAO/tests/RTCORBA/Server_Protocol/Makefile.bor
deleted file mode 100644
index 1fa1f35710e..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.bor b/TAO/tests/RTCORBA/Server_Protocol/client.bor
deleted file mode 100644
index 1cce7dc6de8..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol client
-#
-
-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) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.bor b/TAO/tests/RTCORBA/Server_Protocol/server.bor
deleted file mode 100644
index 6635bb0a989..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/server.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Server_Protocol server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile.bor b/TAO/tests/RTCORBA/Thread_Pool/Makefile.bor
deleted file mode 100644
index 6a47ce28954..00000000000
--- a/TAO/tests/RTCORBA/Thread_Pool/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Thread_Pool test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.bor b/TAO/tests/RTCORBA/Thread_Pool/client.bor
deleted file mode 100644
index 253bcae49b4..00000000000
--- a/TAO/tests/RTCORBA/Thread_Pool/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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) \
- $(TAO_RTCORBA_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_RTCORBA_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.bor b/TAO/tests/RTCORBA/Thread_Pool/server.bor
deleted file mode 100644
index 0051bb49a3e..00000000000
--- a/TAO/tests/RTCORBA/Thread_Pool/server.bor
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults test executable
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_RTCORBA_CFLAGS) \
- $(TAO_RTPORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_RTCORBA_LIB) \
- $(TAO_RTPORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/RTScheduling/Current/Current.bor b/TAO/tests/RTScheduling/Current/Current.bor
deleted file mode 100644
index 2806c170751..00000000000
--- a/TAO/tests/RTScheduling/Current/Current.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Current exe with Borland C++ Builder
-
-NAME = Current
-
-
-OBJFILES = \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\Thread_Task.obj \
- $(OBJDIR)\test.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(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 =
-!endif
-
-CFLAGS = \
- -I..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;..
-
-INCLUDES = \
- ..\Scheduler.h \
- Thread_Task.h
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/RTScheduling/Current/Makefile.bor b/TAO/tests/RTScheduling/Current/Makefile.bor
deleted file mode 100644
index b4dce493ad5..00000000000
--- a/TAO/tests/RTScheduling/Current/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Current.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Current.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Current.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Current.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.bor b/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.bor
deleted file mode 100644
index 0d0f158e162..00000000000
--- a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the DT_Spawn exe with Borland C++ Builder
-
-NAME = DT_Spawn
-
-
-OBJFILES = \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\test.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(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 =
-!endif
-
-CFLAGS = \
- -I..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;..
-
-INCLUDES = \
- ..\Scheduler.h
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Makefile.bor b/TAO/tests/RTScheduling/DT_Spawn/Makefile.bor
deleted file mode 100644
index 8c54265d3f9..00000000000
--- a/TAO/tests/RTScheduling/DT_Spawn/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DT_Spawn.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DT_Spawn.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DT_Spawn.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DT_Spawn.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/tests/RTScheduling/Makefile.bor b/TAO/tests/RTScheduling/Makefile.bor
deleted file mode 100644
index 0b33a967eeb..00000000000
--- a/TAO/tests/RTScheduling/Makefile.bor
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-#
-# Makefile for building RTScheduling tests
-#
-
-DIRS = \
- Current \
- DT_Spawn \
- Scheduling_Interceptor \
- Thread_Cancel \
- VoidData
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.bor b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.bor
deleted file mode 100644
index 9639e40c5ad..00000000000
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile.bor
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Server.bor all
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Client.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Server.bor clean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Client.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Server.bor realclean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Client.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Server.bor install
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Scheduler_Interceptor_Client.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Client.bor b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Client.bor
deleted file mode 100644
index 334d9f9f05b..00000000000
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Client.bor
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Scheduler_Interceptor_Client exe with Borland C++ Builder
-
-NAME = Scheduler_Interceptor_Client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_client.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(LIB_DECORATOR).lib \
- TAO$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).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..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-INCLUDES = \
- ..\Scheduler.h \
- testC.h \
- testC.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) -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Server.bor b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Server.bor
deleted file mode 100644
index 64cb8462c31..00000000000
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor_Server.bor
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Scheduler_Interceptor_Server exe with Borland C++ Builder
-
-NAME = Scheduler_Interceptor_Server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_server.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(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)\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..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;..
-
-IDLDIR = .
-
-INCLUDES = \
- ..\Scheduler.h \
- testC.h \
- testS.h \
- testC.i \
- testS.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 -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Makefile.bor b/TAO/tests/RTScheduling/Thread_Cancel/Makefile.bor
deleted file mode 100644
index 151c1212e7e..00000000000
--- a/TAO/tests/RTScheduling/Thread_Cancel/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 Thread_Cancel.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Thread_Cancel.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Thread_Cancel.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Thread_Cancel.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.bor b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.bor
deleted file mode 100644
index af6af77d4dc..00000000000
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.bor
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-# Makefile for building the Thread_Cancel exe with Borland C++ Builder
-
-NAME = Thread_Cancel
-
-
-OBJFILES = \
- $(OBJDIR)\Scheduler.obj \
- $(OBJDIR)\Thread_Task.obj \
- $(OBJDIR)\test.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(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 =
-!endif
-
-CFLAGS = \
- -I..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .;..
-
-INCLUDES = \
- ..\Scheduler.h \
- Thread_Task.h
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/RTScheduling/VoidData/Makefile.bor b/TAO/tests/RTScheduling/VoidData/Makefile.bor
deleted file mode 100644
index 197c9896b78..00000000000
--- a/TAO/tests/RTScheduling/VoidData/Makefile.bor
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f VoidData.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f VoidData.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f VoidData.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f VoidData.bor install
-
-regenerate:
- perl /project/charanga/irfan/ACE_wrappers/bin/mwc.pl -type borland
diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.bor b/TAO/tests/RTScheduling/VoidData/VoidData.bor
deleted file mode 100644
index 4455c5252ac..00000000000
--- a/TAO/tests/RTScheduling/VoidData/VoidData.bor
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the VoidData exe with Borland C++ Builder
-#
-
-NAME = VoidData
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I $(TAO_ROOT)
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_client.obj
-
-LFLAGS = \
- -j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
- -L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
- -j$(CORE_BINDIR) \
- -L$(CORE_BINDIR)
-
-LIBFILES = \
- TAO_RTScheduler$(LIB_DECORATOR).lib \
- TAO_RTCORBA$(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 =
-!endif
-
-CFLAGS = \
- -I..\..\.. \
- -I..\..\..\tao \
- -I..\..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- testC.h \
- testC.i
-
-IDLFILES = \
- $(IDLDIR)\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) -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/tests/Reliable_Oneways/Makefile.bor b/TAO/tests/Reliable_Oneways/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Reliable_Oneways/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/tests/Reliable_Oneways/client.bor b/TAO/tests/Reliable_Oneways/client.bor
deleted file mode 100644
index 105b9a7ee99..00000000000
--- a/TAO/tests/Reliable_Oneways/client.bor
+++ /dev/null
@@ -1,39 +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) \
- $(TAO_MESSAGING_CFLAGS) \
- $(TAO_VALUETYPE_CLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_MESSAGING_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/tests/Reliable_Oneways/server.bor b/TAO/tests/Reliable_Oneways/server.bor
deleted file mode 100644
index 40fbccb00b6..00000000000
--- a/TAO/tests/Reliable_Oneways/server.bor
+++ /dev/null
@@ -1,42 +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)\Oneway_Receiver.obj \
- $(OBJDIR)\Shutdown_Helper.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Server_Leaks/Makefile.bor b/TAO/tests/Server_Leaks/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Server_Leaks/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Server_Leaks/client.bor b/TAO/tests/Server_Leaks/client.bor
deleted file mode 100644
index 45201c84736..00000000000
--- a/TAO/tests/Server_Leaks/client.bor
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-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/tests/Server_Leaks/server.bor b/TAO/tests/Server_Leaks/server.bor
deleted file mode 100644
index 91dd6e8d14c..00000000000
--- a/TAO/tests/Server_Leaks/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Ping_Service.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Single_Read/Makefile.bor b/TAO/tests/Single_Read/Makefile.bor
deleted file mode 100644
index 611b1376727..00000000000
--- a/TAO/tests/Single_Read/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Single_Read test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Single_Read/client.bor b/TAO/tests/Single_Read/client.bor
deleted file mode 100644
index 3469a32d061..00000000000
--- a/TAO/tests/Single_Read/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#
-# Makefile for building the Single_read client
-#
-
-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) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Single_Read/server.bor b/TAO/tests/Single_Read/server.bor
deleted file mode 100644
index e72d3ba7919..00000000000
--- a/TAO/tests/Single_Read/server.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-#
-# Makefile for building the Single_Read server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor b/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor
deleted file mode 100644
index 8834ddf4873..00000000000
--- a/TAO/tests/Smart_Proxies/Benchmark/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Benchmark test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.bor b/TAO/tests/Smart_Proxies/Benchmark/client.bor
deleted file mode 100644
index 9eb9835835f..00000000000
--- a/TAO/tests/Smart_Proxies/Benchmark/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Benchmark client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\Smart_Proxy_Impl.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.bor b/TAO/tests/Smart_Proxies/Benchmark/server.bor
deleted file mode 100644
index 8ff8456c3f8..00000000000
--- a/TAO/tests/Smart_Proxies/Benchmark/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Benchmark server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor
deleted file mode 100644
index e646ec80512..00000000000
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-#
-# Makefile for building the Coll_Test_Stubs library
-#
-
-NAME = Coll_Test_Stubs
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp -Gd \
- -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
- -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
-
-OBJFILES = \
- $(OBJDIR)\DiamondC.obj \
- $(OBJDIR)\Smart_Proxy_Impl.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) \
- -DMY_STUB_BUILD_DLL
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SMARTPROXIES_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = $(IDLDIR)\Diamond.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DiamondS.cpp $(IDLDIR)\DiamondC.cpp: $(IDLDIR)\Diamond.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.bor b/TAO/tests/Smart_Proxies/Collocation/Collocation.bor
deleted file mode 100644
index 387c4b8f656..00000000000
--- a/TAO/tests/Smart_Proxies/Collocation/Collocation.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation test
-#
-
-NAME = main
-
-OBJFILES = \
- $(OBJDIR)\Coll_Tester.obj \
- $(OBJDIR)\main.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_STRATEGIES_CFLAGS) \
- -DDiamond_HAS_DLL=1 \
- -DMY_Stub_HAS_DLL=1
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB) \
- $(BINDIR)\Diamond$(LIB_DECORATOR).lib \
- $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.bor b/TAO/tests/Smart_Proxies/Collocation/Diamond.bor
deleted file mode 100644
index 1301cb8d2e9..00000000000
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.bor
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-#
-# Makefile for building the Diamond library
-#
-
-NAME = Diamond
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp -Gd \
- -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
- -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h
-
-OBJFILES = \
- $(OBJDIR)\DiamondC.obj \
- $(OBJDIR)\DiamondS.obj \
- $(OBJDIR)\Diamond_i.obj
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DDIAMOND_BUILD_DLL $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib $(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = $(IDLDIR)\Diamond.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\DiamondS.cpp $(IDLDIR)\DiamondC.cpp: $(IDLDIR)\Diamond.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor b/TAO/tests/Smart_Proxies/Collocation/Makefile.bor
deleted file mode 100644
index 7e697f6feb3..00000000000
--- a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Collocation test executables and libraries
-#
-
-MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Makefile.bor b/TAO/tests/Smart_Proxies/Makefile.bor
deleted file mode 100644
index eca291acc1b..00000000000
--- a/TAO/tests/Smart_Proxies/Makefile.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies tests
-#
-
-DIRS = \
- Collocation \
- Benchmark \
- On_Demand \
- Policy
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor b/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor
deleted file mode 100644
index 366d29b2f47..00000000000
--- a/TAO/tests/Smart_Proxies/On_Demand/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies On_Demand test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.bor b/TAO/tests/Smart_Proxies/On_Demand/client.bor
deleted file mode 100644
index a307d26e8f5..00000000000
--- a/TAO/tests/Smart_Proxies/On_Demand/client.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies On_Demand client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\Smart_Proxy_Impl.obj \
- $(OBJDIR)\Smart_Test_Factory.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.bor b/TAO/tests/Smart_Proxies/On_Demand/server.bor
deleted file mode 100644
index 737dafdaae7..00000000000
--- a/TAO/tests/Smart_Proxies/On_Demand/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies On_Demand server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile.bor b/TAO/tests/Smart_Proxies/Policy/Makefile.bor
deleted file mode 100644
index 7d165a0e324..00000000000
--- a/TAO/tests/Smart_Proxies/Policy/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Policy test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Smart_Proxies/Policy/client.bor b/TAO/tests/Smart_Proxies/Policy/client.bor
deleted file mode 100644
index a023e25a354..00000000000
--- a/TAO/tests/Smart_Proxies/Policy/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Policy client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\Smart_Proxy_Impl.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Smart_Proxies/Policy/server.bor b/TAO/tests/Smart_Proxies/Policy/server.bor
deleted file mode 100644
index 83fda18db57..00000000000
--- a/TAO/tests/Smart_Proxies/Policy/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-#
-# Makefile for building the Smart_Proxies Policy server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gsp
-
-OBJFILES = \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SMARTPROXIES_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SMARTPROXIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Stack_Recursion/Makefile.bor b/TAO/tests/Stack_Recursion/Makefile.bor
deleted file mode 100644
index 2f698b045a1..00000000000
--- a/TAO/tests/Stack_Recursion/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Faults test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Stack_Recursion/client.bor b/TAO/tests/Stack_Recursion/client.bor
deleted file mode 100644
index e808f96bf9e..00000000000
--- a/TAO/tests/Stack_Recursion/client.bor
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults ping executable
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\Client_Task.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/tests/Stack_Recursion/server.bor b/TAO/tests/Stack_Recursion/server.bor
deleted file mode 100644
index f76f1938739..00000000000
--- a/TAO/tests/Stack_Recursion/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Faults Test executable
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\TestC.obj \
- $(OBJDIR)\TestS.obj \
- $(OBJDIR)\Server_Task.obj \
- $(OBJDIR)\Sender.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Strategies/Makefile.bor b/TAO/tests/Strategies/Makefile.bor
deleted file mode 100644
index 5c99093fb8f..00000000000
--- a/TAO/tests/Strategies/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the strategies test executables
-#
-
-MAKEFILES = client.bor server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Strategies/client.bor b/TAO/tests/Strategies/client.bor
deleted file mode 100644
index f9010edbe36..00000000000
--- a/TAO/tests/Strategies/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the strategies client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\simple_testC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\simple_test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\simple_testS.cpp $(IDLDIR)\simple_testC.cpp: $(IDLDIR)\simple_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Strategies/server.bor b/TAO/tests/Strategies/server.bor
deleted file mode 100644
index 4248aa81e22..00000000000
--- a/TAO/tests/Strategies/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the strategies server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\simple_testS.obj \
- $(OBJDIR)\simple_testC.obj \
- $(OBJDIR)\simple_test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_STRATEGIES_LIB)
-
-IDLFILES = \
- $(IDLDIR)\simple_test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\simple_testS.cpp $(IDLDIR)\simple_testC.cpp: $(IDLDIR)\simple_test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile.bor b/TAO/tests/Timed_Buffered_Oneways/Makefile.bor
deleted file mode 100644
index a6d3903a02d..00000000000
--- a/TAO/tests/Timed_Buffered_Oneways/Makefile.bor
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-#
-# Makefile for building the Timed_Buffered_Oneways example
-#
-
-MAKEFILES = \
- client.bor \
- server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.bor b/TAO/tests/Timed_Buffered_Oneways/client.bor
deleted file mode 100644
index 9952f7f379b..00000000000
--- a/TAO/tests/Timed_Buffered_Oneways/client.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Timed_Buffered_Oneways_client example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.bor b/TAO/tests/Timed_Buffered_Oneways/server.bor
deleted file mode 100644
index 9cc43b317cb..00000000000
--- a/TAO/tests/Timed_Buffered_Oneways/server.bor
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Timed_Buffered_Oneways example
-#
-
-NAME = server
-
-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) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
-
diff --git a/TAO/tests/Timeout/Makefile.bor b/TAO/tests/Timeout/Makefile.bor
deleted file mode 100644
index 324a7f88cef..00000000000
--- a/TAO/tests/Timeout/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-#
-# Makefile for building the Timeout test executables
-#
-
-MAKEFILES = server.bor client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Timeout/client.bor b/TAO/tests/Timeout/client.bor
deleted file mode 100644
index 2d823b36d4f..00000000000
--- a/TAO/tests/Timeout/client.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Timeout test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Timeout/server.bor b/TAO/tests/Timeout/server.bor
deleted file mode 100644
index d0005e1c275..00000000000
--- a/TAO/tests/Timeout/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the Timeout test server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I..\.. -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.obj \
- $(OBJDIR)\test_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_MESSAGING_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_MESSAGING_LIB)
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Two_Objects/Makefile.bor b/TAO/tests/Two_Objects/Makefile.bor
deleted file mode 100644
index 19f31a4d882..00000000000
--- a/TAO/tests/Two_Objects/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/tests/Two_Objects/client.bor b/TAO/tests/Two_Objects/client.bor
deleted file mode 100644
index 1b2ae8e6bec..00000000000
--- a/TAO/tests/Two_Objects/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)\Two_ObjectsC.obj \
- $(OBJDIR)\client.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Two_Objects.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Two_ObjectsS.cpp $(IDLDIR)\Two_ObjectsC.cpp: $(IDLDIR)\Two_Objects.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/Two_Objects/server.bor b/TAO/tests/Two_Objects/server.bor
deleted file mode 100644
index e8621136af9..00000000000
--- a/TAO/tests/Two_Objects/server.bor
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
- $(OBJDIR)\Two_ObjectsC.obj \
- $(OBJDIR)\Two_ObjectsS.obj \
- $(OBJDIR)\worker.obj \
- $(OBJDIR)\First_i.obj \
- $(OBJDIR)\Second_i.obj \
- $(OBJDIR)\Object_Factory_i.obj \
- $(OBJDIR)\server.obj
-
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
- $(IDLDIR)\Two_Objects.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\Two_ObjectsS.cpp $(IDLDIR)\Two_ObjectsC.cpp: $(IDLDIR)\Two_Objects.idl
- $(TAO_IDL) $**
diff --git a/TAO/tests/UNKNOWN_Exception/Makefile.bor b/TAO/tests/UNKNOWN_Exception/Makefile.bor
deleted file mode 100644
index 987cf33ed27..00000000000
--- a/TAO/tests/UNKNOWN_Exception/Makefile.bor
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-#----------------------------------------------------------------------------
-# Borland Workspace
-#----------------------------------------------------------------------------
-
-!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
-
-all:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Server.bor all
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Client.bor all
-
-clean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Server.bor clean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Client.bor clean
-
-realclean:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Server.bor realclean
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Client.bor realclean
-
-install:
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Server.bor install
- $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f UNKNOWN_Exception_Client.bor install
-
-regenerate:
- C:\Program Files\Perl\bin\perl.exe C:\irfan\ACE_wrappers\bin\mwc.pl -type borland
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Client.bor b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Client.bor
deleted file mode 100644
index a63e224011d..00000000000
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Client.bor
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the client exe with Borland C++ Builder
-#
-
-
-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$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).lib \
-
-
-IDLFILES = \
- $(IDLDIR)\test.idl
-
-!ifdef STATIC
-LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
-DLL_FLAGS =
-!else
-LIB_FLAGS =
-DLL_FLAGS =
-!endif
-
-CFLAGS = \
- -I..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-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) -Ge 0 $**
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Server.bor b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Server.bor
deleted file mode 100644
index ecf67d7d1a1..00000000000
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception_Server.bor
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# $Id$
-#
-# Makefile for building the server exe with Borland C++ Builder
-#
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
-
-OBJFILES = \
- $(OBJDIR)\server.obj \
- $(OBJDIR)\testC.obj \
- $(OBJDIR)\testS.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$(LIB_DECORATOR).lib \
- ACE$(LIB_DECORATOR).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..\.. \
- -I..\..\tao \
- -I..\..\.. \
- $(LIB_FLAGS) \
- $(DLL_FLAGS)
-
-CPPDIR = .
-
-IDLDIR = .
-
-INCLUDES = \
- testC.h \
- testS.h \
- testS_T.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) -Ge 0 $**