diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-02-29 20:38:49 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-02-29 20:38:49 +0000 |
| commit | e50ad20b6c171d722cce99217f8daea9e3ae841d (patch) | |
| tree | 2664dabc91fa06b3a8d0cac99e1aeff0f3b46347 /TAO/orbsvcs | |
| parent | 83eecab49260c633c1be24f69c2b557ee2d31249 (diff) | |
| download | ATCD-e50ad20b6c171d722cce99217f8daea9e3ae841d.tar.gz | |
ChangeLogTag:Sun Feb 29 14:58:50 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs')
25 files changed, 138 insertions, 138 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 136c34845e5..01198dcf54b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -12,15 +12,6 @@ LIBNAME = libTAO_RTEC_COSEC LIB2 = $(LIBNAME).a SHLIB2 = $(LIBNAME).$(SOEXT) -#### If the orbsvcs library wasn't built with all components, don't -#### try to build certain tests. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) -ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) -LIB = $(LIB2) -SHLIB = $(SHLIB2) -endif # RTEvent -endif # CosEvent ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosEvent \ -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE @@ -49,6 +40,15 @@ LSRC = $(addsuffix .cpp,$(FILES)) $(IDL_SRC) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the orbsvcs library wasn't built with all components, don't +#### try to build certain tests. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) + ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) + ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS))) + LIB = $(LIB2) + SHLIB = $(SHLIB2) + endif # RTEvent + endif # CosEvent include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile b/TAO/orbsvcs/examples/Log/Basic/Makefile index b47e2d12590..4f9e0241d16 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile +++ b/TAO/orbsvcs/examples/Log/Basic/Makefile @@ -26,14 +26,6 @@ CLIENT_OBJS = \ BIN2 = tls_client -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Log,$(findstring Log,$(TAO_ORBSVCS))) - ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Naming -endif # Log #---------------------------------------------------------------------------- # Include macros and targets @@ -42,6 +34,14 @@ endif # Log include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Log,$(findstring Log,$(TAO_ORBSVCS))) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # Log include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile b/TAO/orbsvcs/examples/Notify/Filter/Makefile index c6dfc8f5666..b0cf15f1194 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Makefile +++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile @@ -20,14 +20,6 @@ FILTER_OBJS = $(LSRC:.cpp=.o) BIN2 = Filter -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS))) - ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Naming -endif # Notify #---------------------------------------------------------------------------- # Include macros and targets @@ -36,6 +28,14 @@ endif # Notify include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS))) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # Notify include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile index a39efa7c360..350024fbf70 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile @@ -20,14 +20,6 @@ SUBSCRIBE_OBJS = $(LSRC:.cpp=.o) BIN2 = Subscribe -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS))) - ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Naming -endif # Notify #---------------------------------------------------------------------------- # Include macros and targets @@ -36,6 +28,14 @@ endif # Notify include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Notify,$(findstring Notify,$(TAO_ORBSVCS))) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # Notify include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile index bbebea3f81c..293b7f199c4 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile @@ -14,16 +14,6 @@ endif # ! TAO_ROOT BIN2 = Service -#### If the orbsvcs library wasn't built with all components, don't -#### try to build certain tests. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) - ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) - ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # RTOLDEvent - endif # Sched -endif # Event PSRC= Service.cpp Supplier.cpp Consumer.cpp LDLIBS = -lTAO_RTOLDEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging $(TAO_SRVR_LIBS) @@ -43,6 +33,16 @@ Service_OBJS=$(addsuffix .o, Service Supplier Consumer) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the orbsvcs library wasn't built with all components, don't +#### try to build certain tests. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) + ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) + ifeq (RTOLDEvent,$(findstring RTOLDEvent,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # RTOLDEvent + endif # Sched +endif # Event include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile index ccfe9da20d0..f788cc2921f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile @@ -30,6 +30,13 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = sender distributer receiver +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.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) @@ -39,13 +46,6 @@ ifeq ($(corba_messaging),1) endif # AV endif # corba_messaging -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile index 558074638b8..04eff873138 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = receiver sender -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +34,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile index 2f5bc4b5f41..3cb9efd03cb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile @@ -31,9 +31,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = sender distributer receiver -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -42,6 +39,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile index bb19cdf3d98..63caae4a5fd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = server ftp -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +34,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile index 23f9d07e3cc..2998df1c7a3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile @@ -16,12 +16,6 @@ PSRC = $(PING_OBJS:.o=.cpp) $(PONG_OBJS:.o=.cpp) $(CONTROL_OBJS:.o=.cpp) BIN2 = ping pong control -#### 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV PING_OBJS = ping.o PONG_OBJS = pong.o @@ -34,6 +28,12 @@ CONTROL_OBJS = control.o include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile index 68adcbf67b3..a8114f3a02e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile @@ -26,12 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = receiver sender -#### 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +34,12 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile index be07725e9b7..37406f2b950 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = server ftp -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +34,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile index ec28561b638..c06bc608663 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = server ftp -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +34,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile index cb3bf0f5994..7ee93825aef 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile @@ -26,12 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = receiver sender -#### 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +34,12 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile index ca88a72905f..190410934a8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = server ftp -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -37,6 +34,9 @@ TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile index 0592d0e48c6..17e63a27d4a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile @@ -26,9 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = receiver sender -#### 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) #---------------------------------------------------------------------------- # Include macros and targets @@ -39,6 +36,9 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.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) ifeq ($(corba_messaging),1) ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile index bbe20749957..f381fb4e243 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile @@ -26,12 +26,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) BIN2 = receiver sender -#### 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +34,12 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.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) +ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # AV include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index 2d94106db1a..421e4ea7d15 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -28,9 +28,6 @@ CC_CLT_OBJS = CC_client.o CC_tests.o tmplinst.o CC_naming_service.o \ BIN2 = CC_client -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) #---------------------------------------------------------------------------- # Include macros and targets @@ -39,6 +36,9 @@ TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) ifeq ($(corba_messaging),1) ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) BIN = $(BIN2) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile index e8e73c04698..a5d41d393b0 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile @@ -13,11 +13,6 @@ LIBNAME = libCECTests LIB2 = $(LIBNAME).a SHLIB2 = $(LIBNAME).$(SOEXT) -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS))) - LIB = $(LIB2) - SHLIB = $(SHLIB2) -endif # NativeCosEvent ACE_SHLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE LDLIBS = -lTAO_CosEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO @@ -35,6 +30,11 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS))) + LIB = $(LIB2) + SHLIB = $(SHLIB2) +endif # NativeCosEvent include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile index e6135e46e64..1dd76679ac5 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile @@ -19,12 +19,6 @@ SRC = $(addsuffix .cpp, $(BIN2)) \ 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 sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Event #---------------------------------------------------------------------------- # Include macros and targets @@ -33,6 +27,12 @@ endif # Event include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Event include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index 80e5e81fcca..72abae0c5ba 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -12,12 +12,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ BIN2 = EC_Multiple -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Event PSRC=EC_Multiple.cpp @@ -28,6 +22,12 @@ PSRC=EC_Multiple.cpp include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Event,$(findstring Event,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Event include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile index 9bb341870e3..21f70c5fdcb 100644 --- a/TAO/orbsvcs/tests/Event/lib/Makefile +++ b/TAO/orbsvcs/tests/Event/lib/Makefile @@ -13,11 +13,6 @@ LIBNAME = libECTests LIB2 = $(LIBNAME).a SHLIB2 = $(LIBNAME).$(SOEXT) -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) - LIB = $(LIB2) - SHLIB = $(SHLIB2) -endif # RTEvent ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO -lACE LDLIBS = -lTAO_RTEvent -lTAO_CosNaming -lTAO_PortableServer -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO_IORInterceptor -lTAO @@ -35,6 +30,11 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (RTEvent,$(findstring RTEvent,$(TAO_ORBSVCS))) + LIB = $(LIB2) + SHLIB = $(SHLIB2) +endif # RTEvent include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile index 46d066ffbee..513b1041ca0 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile +++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile @@ -32,12 +32,6 @@ BIN2 = client TAO_IDLFLAGS = -Ge 1 -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming #---------------------------------------------------------------------------- # Include macros and targets @@ -46,6 +40,12 @@ endif # Naming include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile index 614d74482ae..0f85e6e477f 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile @@ -26,14 +26,6 @@ CLIENT_OBJS = \ BIN2 = client -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Log,$(findstring Log,$(TAO_ORBSVCS))) - ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) - endif # Naming -endif # Log #---------------------------------------------------------------------------- # Include macros and targets @@ -42,6 +34,14 @@ endif # Log include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +#### If the TAO orbsvcs library wasn't built with sufficient components, +#### don't try to build here. +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Log,$(findstring Log,$(TAO_ORBSVCS))) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # Log include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile index 09ec578104f..4ca08a66714 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/Makefile +++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile @@ -26,10 +26,6 @@ CLIENT_OBJS = $(addsuffix .o, client ior_corbaname_client_i status_i) $(IDL_SRC: TAO_IDLFLAGS += -Ge 1 -TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Naming #---------------------------------------------------------------------------- # Include macros and targets @@ -38,6 +34,10 @@ endif # Naming include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) +endif # Naming include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |