diff options
68 files changed, 132 insertions, 126 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 3b210f74834..f5ffe93d8c1 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,51 +1,57 @@ +Sun Jul 04 15:41:34 1999 David L. Levine <levine@cs.wustl.edu> + + * many Makefiles: call ace_components via sh, instead of + directly in the make $(shell) command. This allows it + to work on platforms that don't have /bin/sh, such as NT. + Sun Jul 4 12:34:24 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * ace/Timer_Hash_T.cpp (cancel): Reversed a comparison from - <= to > to make the ACE_ASSERT replacement work properly. - Thanks to David Levine for reporting this. + * ace/Timer_Hash_T.cpp (cancel): Reversed a comparison from + <= to > to make the ACE_ASSERT replacement work properly. + Thanks to David Levine for reporting this. + + * tests/Thread_Pool_Test.cpp (open): We need to define 'int i' + outside of the for loop to keep EGCS from complaining for some + reason. - * tests/Thread_Pool_Test.cpp (open): We need to define 'int i' - outside of the for loop to keep EGCS from complaining for some - reason. + * ace/Timer_Heap_T.cpp: Reformatted this code to conform to + the ACE programming guidelines. - * ace/Timer_Heap_T.cpp: Reformatted this code to conform to - the ACE programming guidelines. - - * ace/Timer_Heap_T.cpp (schedule): Replaced an ad hoc check for - allocator failure with the ACE_ALLOCATOR_RETURN macro. + * ace/Timer_Heap_T.cpp (schedule): Replaced an ad hoc check for + allocator failure with the ACE_ALLOCATOR_RETURN macro. - * ace/RB_Tree.cpp: Modified Carlo's change so that we add an - extra set of parens in a special way, rather than using a new - macro. This is more consistent with how we deal with this - problem in other parts of ACE. - - * ace/RB_Tree.cpp (insert_i): Removed an unreachable statement. - Thanks to David Levine for reporting this. + * ace/RB_Tree.cpp: Modified Carlo's change so that we add an + extra set of parens in a special way, rather than using a new + macro. This is more consistent with how we deal with this + problem in other parts of ACE. + + * ace/RB_Tree.cpp (insert_i): Removed an unreachable statement. + Thanks to David Levine for reporting this. Sat Jul 3 22:12:07 1999 Carlos O'Ryan <coryan@cs.wustl.edu> - * ace/Object_Manager.cpp (get_singleton_lock): - Fixed one of the ACE_Thread_Mutex version of this method. One of - the braces after an if() statement got "accidentaly" removed; - binding the "else" part of the statement to the previous if() - instead. + * ace/Object_Manager.cpp (get_singleton_lock): + Fixed one of the ACE_Thread_Mutex version of this method. One of + the braces after an if() statement got "accidentaly" removed; + binding the "else" part of the statement to the previous if() + instead. Sat Jul 3 18:54:18 1999 Carlos O'Ryan <coryan@cs.wustl.edu> - * ace/RB_Tree.cpp: - If the "constructor" parameter in an ACE_NEW_RETURN macro has a - comma in it (such as Foo(x,y,z)) we need to replace it with a - macro, so it is seen as a single token by the pre-processor. - Otherwise it (the pre-processor) gets confused and uses - the comma as separator. Thanks to David for detecting this one. + * ace/RB_Tree.cpp: + If the "constructor" parameter in an ACE_NEW_RETURN macro has a + comma in it (such as Foo(x,y,z)) we need to replace it with a + macro, so it is seen as a single token by the pre-processor. + Otherwise it (the pre-processor) gets confused and uses + the comma as separator. Thanks to David for detecting this one. Sat Jul 3 15:57:40 1999 Carlos O'Ryan <coryan@cs.wustl.edu> - * ace/SOCK_Dgram_Mcast.cpp: - Fixed error code return, it should be -1 not ACE_INVALID_HANDLE + * ace/SOCK_Dgram_Mcast.cpp: + Fixed error code return, it should be -1 not ACE_INVALID_HANDLE - * ace/SOCK_Connector.cpp: - Fixed stray comment characters. + * ace/SOCK_Connector.cpp: + Fixed stray comment characters. Sat Jul 03 14:04:10 1999 David L. Levine <levine@cs.wustl.edu> @@ -55,39 +61,39 @@ Sat Jul 03 14:04:10 1999 David L. Levine <levine@cs.wustl.edu> Sat Jul 3 12:05:46 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * ace/SOCK_Dgram_Mcast: Modified the subscribe() method to return - 0 or -1 rather than ACE_HANDLE. Thanks to Vidya Narayanan - <CVN065@lmpsil02.comm.mot.com> for suggesting this. + * ace/SOCK_Dgram_Mcast: Modified the subscribe() method to return + 0 or -1 rather than ACE_HANDLE. Thanks to Vidya Narayanan + <CVN065@lmpsil02.comm.mot.com> for suggesting this. - * ace/SOCK_Acceptor, - ace/SOCK_Connector, - ace/SOCK: Added the ACE_Protocol_Info *, ACE_SOCK_GROUP, and - flags parameters to these classes so we can pass down the GQoS - information. Thanks to Vidya Narayanan - <CVN065@lmpsil02.comm.mot.com> for suggesting this. + * ace/SOCK_Acceptor, + ace/SOCK_Connector, + ace/SOCK: Added the ACE_Protocol_Info *, ACE_SOCK_GROUP, and + flags parameters to these classes so we can pass down the GQoS + information. Thanks to Vidya Narayanan + <CVN065@lmpsil02.comm.mot.com> for suggesting this. - * ace/SOCK.h: Added the reuse_addr parameter to open() and the - ACE_SOCK constructor. + * ace/SOCK.h: Added the reuse_addr parameter to open() and the + ACE_SOCK constructor. - * tests/Future_Set_Test.cpp (main): We were casting a const ASYS_TCHAR * - to u_int, yikes! + * tests/Future_Set_Test.cpp (main): We were casting a + const ASYS_TCHAR * to u_int, yikes! - * ace/RB_Tree.cpp: Cleaned up the code so it's conformant with the - ACE programming style, particularly for dynamic memory - allocation (which wasn't using ACE_NEW). + * ace/RB_Tree.cpp: Cleaned up the code so it's conformant with the + ACE programming style, particularly for dynamic memory + allocation (which wasn't using ACE_NEW). - * ace/ACE.cpp (get_ip_interfaces): Cleaned up the code so it conforms - to the ACE programming guidelines. + * ace/ACE.cpp (get_ip_interfaces): Cleaned up the code so it conforms + to the ACE programming guidelines. - * ace/Timer_Hash_T.cpp: Fixed a number mistakes where the return - value of new wasn't being checked. + * ace/Timer_Hash_T.cpp: Fixed a number mistakes where the return + value of new wasn't being checked. - * ace/Timer_Heap_T.cpp, - ace/Timer_Wheel_T.cpp: Removed the apparently extraneous parens - used in the ACE_NEW* macros in order to keep EGCS 2.95 happy. - Thanks to Jody Hagins and Arturo Montes - <mitosys@colomsat.com.co> for reporting this. BTW, if this - causes problems on any compilers please let me know. + * ace/Timer_Heap_T.cpp, + ace/Timer_Wheel_T.cpp: Removed the apparently extraneous parens + used in the ACE_NEW* macros in order to keep EGCS 2.95 happy. + Thanks to Jody Hagins and Arturo Montes + <mitosys@colomsat.com.co> for reporting this. BTW, if this + causes problems on any compilers please let me know. * ace: Reformatted all the ACE_NEW* macros so they conform to ACE programming style. diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile index dc37e09738f..0615a632aa0 100644 --- a/TAO/examples/Callback_Quoter/Makefile +++ b/TAO/examples/Callback_Quoter/Makefile @@ -69,7 +69,7 @@ BIN2 = notifier \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile index 4ec20e9b467..9b1b165201e 100644 --- a/TAO/examples/Event_Comm/Makefile +++ b/TAO/examples/Event_Comm/Makefile @@ -56,7 +56,7 @@ BIN2 = supplier \ TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Logging/Makefile b/TAO/examples/Logging/Makefile index 212f1c21c3b..1a378c90bce 100644 --- a/TAO/examples/Logging/Makefile +++ b/TAO/examples/Logging/Makefile @@ -33,7 +33,7 @@ BIN2 = Logging_Service Logging_Test #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile index 3b27cbf9487..bb79df20cea 100644 --- a/TAO/examples/Quoter/Makefile +++ b/TAO/examples/Quoter/Makefile @@ -47,7 +47,7 @@ BIN2 = client server Factory_Finder Generic_Factory #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile index 37fa8539050..e8fcf27555b 100644 --- a/TAO/examples/Simple/bank/Makefile +++ b/TAO/examples/Simple/bank/Makefile @@ -47,7 +47,7 @@ BIN2 = server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile index 0d080371002..e6f81721987 100644 --- a/TAO/examples/Simple/echo/Makefile +++ b/TAO/examples/Simple/echo/Makefile @@ -45,7 +45,7 @@ BIN2 = server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile index 8bee5b4ef9b..1bcd6f88adc 100644 --- a/TAO/examples/Simple/grid/Makefile +++ b/TAO/examples/Simple/grid/Makefile @@ -45,7 +45,7 @@ BIN2 = server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile index d9355aefcfa..a8531bca24b 100644 --- a/TAO/examples/Simple/time-date/Makefile +++ b/TAO/examples/Simple/time-date/Makefile @@ -49,7 +49,7 @@ BIN2 = server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile index c5646f425a3..43dd4327d32 100644 --- a/TAO/examples/Simple/time/Makefile +++ b/TAO/examples/Simple/time/Makefile @@ -45,7 +45,7 @@ BIN2 = server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile index 88ea73ab780..92b4fc9299f 100644 --- a/TAO/examples/Simulator/DOVEMIB/Makefile +++ b/TAO/examples/Simulator/DOVEMIB/Makefile @@ -23,7 +23,7 @@ BIN2 = DOVEMIB #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile index cd1adacc916..3f2ab875168 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile +++ b/TAO/examples/Simulator/Event_Supplier/Makefile @@ -26,7 +26,7 @@ BIN2 = Event_Sup Logging_Sup DualEC_Sup Event_Con #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile index a1674157bab..4076ae993a2 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile +++ b/TAO/orbsvcs/Concurrency_Service/Makefile @@ -17,7 +17,7 @@ BIN2 = Concurrency_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Concurrency diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile index 8677da2f8cc..f0e10fb2695 100644 --- a/TAO/orbsvcs/CosEvent_Service/Makefile +++ b/TAO/orbsvcs/CosEvent_Service/Makefile @@ -12,7 +12,7 @@ BIN2 = CosEvent_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index e5a374a1ff0..0cbb299afdf 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -13,7 +13,7 @@ BIN2 = Dump_Schedule #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Sched diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile index 2362e2a0fb3..428a032e308 100644 --- a/TAO/orbsvcs/Event_Service/Makefile +++ b/TAO/orbsvcs/Event_Service/Makefile @@ -9,7 +9,7 @@ BIN2 = Event_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile index dc662e3e6e3..ca808c50bac 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile @@ -41,7 +41,7 @@ BIN2 = ImplRepo_Service \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # ImplRepo diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile index c3b80dc77ed..73e7721bf17 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile @@ -30,7 +30,7 @@ BIN2 = LifeCycle_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # LifeCycle diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index 7a5b09416c0..c0aa2f883ca 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -18,7 +18,7 @@ BIN2 = Naming_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile index 3da97bc8142..4df1d4198f2 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile +++ b/TAO/orbsvcs/Scheduling_Service/Makefile @@ -12,7 +12,7 @@ BIN2 = Scheduling_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Sched diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile index 79410be2e51..cadedc7e8e8 100644 --- a/TAO/orbsvcs/Time_Service/Makefile +++ b/TAO/orbsvcs/Time_Service/Makefile @@ -35,7 +35,7 @@ BIN2 = Time_Service_Server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Time diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile index 5a3acd2e688..73dc532d84f 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile +++ b/TAO/orbsvcs/Trading_Service/Makefile @@ -16,7 +16,7 @@ BIN2 = Trading_Service #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Trader diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile index 811d4dd5186..93591bc8696 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile @@ -43,7 +43,7 @@ BIN2 = factory \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile index 7043b24eee5..ee0b055a4a9 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile @@ -18,7 +18,7 @@ BIN2 = Service \ #### If the orbsvcs library wasn't built with all components, don't #### try to build certain tests. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event2 diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile index af346427936..b871a5f98e0 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile @@ -29,7 +29,7 @@ BIN2 = server client child_process #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # AV diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile index f7a4dea4ec8..ee685a87c00 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile @@ -23,7 +23,7 @@ BIN2 = vcr #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # AV diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile index 4fadaab1df6..28fef79f620 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile @@ -57,7 +57,7 @@ LSRC = $(addsuffix .cpp,$(FILES)) #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) LIB = $(LIB2) SHLIB = $(SHLIB2) diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile index 8c14d8a0851..153119a8e25 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile @@ -36,7 +36,7 @@ LSRC = $(addsuffix .cpp,$(FILES)) #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) LIB = $(LIB2) SHLIB = $(SHLIB2) diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile index 76c34372e40..6a1edd68a98 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile @@ -27,7 +27,7 @@ CPPFLAGS += -I$(MPEG_ROOT) #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) LIB = $(LIB2) SHLIB = $(SHLIB2) diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile index f756a1d14fa..2fecb4b7d35 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile @@ -39,7 +39,7 @@ LIBS += -lTAO -lACE #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) LIB = $(LIB2) SHLIB = $(SHLIB2) diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile index caa8796b159..2e259de641a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile @@ -39,7 +39,7 @@ BIN2 = augmented_server server vs as #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # AV diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile index c25b22626e2..8d36d536681 100644 --- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BUILD := TAO_VR.module $(BUILD) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile index fb343d5c4da..95c2c3a0b97 100644 --- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile @@ -28,7 +28,7 @@ BIN2 = client server #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # AV diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index 5d8b7cc925a..f091c372ba2 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -33,7 +33,7 @@ BIN2 = CC_client #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Concurrency diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile index c3c947998ec..40bf99cc392 100644 --- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile +++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile @@ -17,7 +17,7 @@ BIN2 = CosEC_Basic #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # CosEvent diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile index 2f5246b09f7..24fb6ed7521 100644 --- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile @@ -35,7 +35,7 @@ BIN2 = supplier \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # CosEvent diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile index 34c3671d05b..a85e96ed75e 100644 --- a/TAO/orbsvcs/tests/EC_Basic/Makefile +++ b/TAO/orbsvcs/tests/EC_Basic/Makefile @@ -14,7 +14,7 @@ BIN2 = EC_Basic #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile index 4e1184204a4..f95867e97ff 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile @@ -23,7 +23,7 @@ BIN2 = ECM_Supplier ECM_Consumer #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile index dd9a4662356..c79e0244ee5 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile @@ -14,7 +14,7 @@ BIN2 = EC_Mcast #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event2 diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index ddcb0afeaf5..d70af289b11 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -14,7 +14,7 @@ BIN2 = EC_Multiple #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index 684131ff9b0..ccc3198f4d6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -21,7 +21,7 @@ BIN2 = ECT_Supplier ECT_Consumer ECT_Throughput #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile index 4e2dba84d13..ef8ffd97a84 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Makefile +++ b/TAO/orbsvcs/tests/Event/Basic/Makefile @@ -20,7 +20,7 @@ BIN2 = Reconnect \ #### If the orbsvcs library wasn't built with all components, don't #### try to build certain tests. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event2 diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile index db055ad060d..99962528d43 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Makefile +++ b/TAO/orbsvcs/tests/Event/Performance/Makefile @@ -17,7 +17,7 @@ BIN2 = Throughput \ #### If the orbsvcs library wasn't built with all components, don't #### try to build certain tests. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event2 diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile index 6eb7834983b..6b182b07c99 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile +++ b/TAO/orbsvcs/tests/Event/lib/Makefile @@ -13,7 +13,7 @@ LIBNAME = libECTests LIB2 = $(LIBNAME).a SHLIB2 = $(LIBNAME).$(SOEXT) -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS))) LIB = $(LIB2) SHLIB = $(SHLIB2) diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile index 9702e3806c5..a50a5280f97 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Makefile +++ b/TAO/orbsvcs/tests/Event_Latency/Makefile @@ -10,7 +10,7 @@ BIN2 = Event_Latency #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Event diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile index d486e22d4f1..7982b4862eb 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile @@ -62,7 +62,7 @@ BIN2 = airplane_server \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # ImplRepo diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index f15e3a6c88a..52979c1b173 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -21,7 +21,7 @@ BIN2 = server client #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Property,$(findstring Property,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Property diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index f833c678ac6..ac83993838e 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -15,7 +15,7 @@ BIN2 = DynSched_Test #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Sched diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index 3602264bdaa..11559c69138 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -13,7 +13,7 @@ BIN2 = Sched_Conf #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Sched diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index 9ba07320020..bd74f226fa6 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -33,7 +33,7 @@ TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile index 140e2f1bb31..044c0eaa776 100644 --- a/TAO/orbsvcs/tests/Time/Makefile +++ b/TAO/orbsvcs/tests/Time/Makefile @@ -29,7 +29,7 @@ BIN2 = client #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Time diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index 7f045b73517..cd298e95f73 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -43,7 +43,7 @@ VLDLIBS = $(LDLIBS:%=%$(VAR)) #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS))) BIN = $(BIN2) LIB = $(LIB2) diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile index 688b17e9935..fe6dd78f768 100644 --- a/TAO/performance-tests/POA/Demux/Makefile +++ b/TAO/performance-tests/POA/Demux/Makefile @@ -48,7 +48,7 @@ VLDLIBS = $(LDLIBS:%=%$(VAR)) TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile index 08f59c3d493..cea11eedc21 100644 --- a/TAO/tests/InterOp-Naming/Makefile +++ b/TAO/tests/InterOp-Naming/Makefile @@ -52,7 +52,7 @@ BIN2 = \ #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Naming diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile index 2a86efcf069..3c6a59441b4 100644 --- a/TAO/utils/nslist/Makefile +++ b/TAO/utils/nslist/Makefile @@ -24,7 +24,7 @@ BUILD = $(VBIN) TAO_IDLFLAGS += -Ge 1 #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. -TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) BIN = $(BIN2) endif # Time diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile index 40368b89466..34b49b362ec 100644 --- a/examples/Naming/Makefile +++ b/examples/Naming/Makefile @@ -18,7 +18,7 @@ BIN2 = test_non_existent \ #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # ! Other diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile index fa86c16de96..555289cea0b 100644 --- a/netsvcs/clients/Logger/Makefile +++ b/netsvcs/clients/Logger/Makefile @@ -17,7 +17,7 @@ BIN2 = direct_logging \ #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Other diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 8b5fc35a463..d4eb6775c08 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -29,7 +29,7 @@ SHLIB2 = libClient_Test.$(SOEXT) #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) LIB = $(LIB2) diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index 8f301ff30da..d2f7cf959f9 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -29,7 +29,7 @@ SHLIB2 = libDump_Restore.$(SOEXT) #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) LIB = $(LIB2) diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile index bea5dddb1b2..60b8703b2e1 100644 --- a/netsvcs/clients/Tokens/collection/Makefile +++ b/netsvcs/clients/Tokens/collection/Makefile @@ -18,7 +18,7 @@ BIN2 = collection #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile index 1ddd17d4d23..29fb07d179a 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile +++ b/netsvcs/clients/Tokens/deadlock/Makefile @@ -18,7 +18,7 @@ BIN2 = deadlock_detection_test #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile index b6ee8f15f1a..8b75b4c6371 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile +++ b/netsvcs/clients/Tokens/invariant/Makefile @@ -18,7 +18,7 @@ BIN2 = invariant #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/clients/Tokens/manual/Makefile b/netsvcs/clients/Tokens/manual/Makefile index ad7c54f1ac4..2d8ca80ad6d 100644 --- a/netsvcs/clients/Tokens/manual/Makefile +++ b/netsvcs/clients/Tokens/manual/Makefile @@ -14,7 +14,7 @@ BIN2 = manual #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile index ad94852bf85..e23b2e26695 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile +++ b/netsvcs/clients/Tokens/mutex/Makefile @@ -18,7 +18,7 @@ BIN2 = test_mutex #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile index 3db6d5466d9..7c0e08adc38 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile +++ b/netsvcs/clients/Tokens/rw_lock/Makefile @@ -18,7 +18,7 @@ BIN2 = rw_locks #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) endif # Token diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index 2a427265076..0dae71f70bf 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -16,7 +16,7 @@ BIN2 = main #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS))) BIN = $(BIN2) diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index 016073228b6..f8fb35c632e 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -32,7 +32,7 @@ BIN2 = test_naming #### If the ACE library wasn't built with sufficient components, don't #### try to build here. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN += $(BIN2) endif # ! Other diff --git a/tests/Makefile b/tests/Makefile index 3cb872f43e0..c8cc327f25b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -87,7 +87,7 @@ BIN2 = Naming_Test \ #### If the ACE library wasn't built with all components, don't #### try to build certain tests. -ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace) +ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN += $(BIN2) endif # ! Other |