diff options
author | bala <balanatarajan@users.noreply.github.com> | 2003-11-20 02:16:50 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2003-11-20 02:16:50 +0000 |
commit | 197cac0a15bc4db0a55f5ffebd6dc2edeab9414c (patch) | |
tree | d193e5fcb3bf2c64e2014996efae8118683bc199 | |
parent | 8465f48412e04895e1a7a8593747da829f844676 (diff) | |
download | ATCD-197cac0a15bc4db0a55f5ffebd6dc2edeab9414c.tar.gz |
ChangeLogTag:Wed Nov 19 20:09:17 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
18 files changed, 121 insertions, 65 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d54bf5fa000..291ccb11c20 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Wed Nov 19 20:09:17 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/Concurrency_Service/Makefile: + * orbsvcs/Naming_Service/Makefile: + * orbsvcs/Time_Service/Makefile + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile: + * orbsvcs/tests/AVStreams/Component_Switching/Makefile + * orbsvcs/tests/AVStreams/Full_Profile/Makefile: + * orbsvcs/tests/AVStreams/Multicast/Makefile: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile: + * orbsvcs/tests/AVStreams/Pluggable/Makefile: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile: + * orbsvcs/tests/Concurrency/Makefile: + * orbsvcs/tests/Property/Makefile: + * orbsvcs/tests/Sched_Conf/Makefile: + * orbsvcs/tests/Simple_Naming/Makefile: + * orbsvcs/tests/Time/Makefile: + + Added TAO_Messaging to the link line. Further made sure that we + don't build these when messaging is disabled. + Wed Nov 19 19:43:15 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/DomainC.cpp: diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile index f885bd84f98..6cb1bfb56d3 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile +++ b/TAO/orbsvcs/Concurrency_Service/Makefile @@ -20,9 +20,11 @@ BIN2 = Concurrency_Service #### 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 (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Concurrency +ifeq ($(corba_messaging),1) + ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Concurrency +endif # corba_messaging #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index b8a668fd34d..6288686a1b7 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -20,9 +20,11 @@ BIN2 = Naming_Service #### 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 +ifeq ($(corba_messaging),1) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # corba_messaging #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile index 0dd5852a92e..927acfef8c7 100644 --- a/TAO/orbsvcs/Time_Service/Makefile +++ b/TAO/orbsvcs/Time_Service/Makefile @@ -33,9 +33,11 @@ BIN2 = Time_Service_Server \ #### 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 (Time,$(findstring Time,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Time +ifeq ($(corba_messaging),1) + ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Time +endif # corba_messaging #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile index d420206202a..2e059e07980 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile @@ -33,9 +33,11 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile index d9f8c7ef189..b3dc499bbde 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o @@ -29,9 +29,6 @@ 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 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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/Component_Switching/Makefile b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile index 9a711fc04d9..56b45145b6d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS) SENDER_OBJS = Connection_Manager.o \ @@ -34,9 +34,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -45,6 +42,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile index ff822b06e69..3fe8311be60 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) SERVER_OBJS = server.o CLIENT_OBJS = ftp.o @@ -29,9 +29,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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 df34eaf0f5d..f97d4e2546d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable -lTAO_Strategies $(TAO_SRVR_LIBS) SERVER_OBJS = server.o CLIENT_OBJS = ftp.o @@ -29,9 +29,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile index 5ea142c0d25..d406c9f0414 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) SERVER_OBJS = server.o CLIENT_OBJS = ftp.o @@ -29,9 +29,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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 128db7e6945..c42803b09db 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) SERVER_OBJS = server.o CLIENT_OBJS = ftp.o @@ -29,9 +29,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -40,6 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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/Simple_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile index 546698b4aef..f7a91fd4d3b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) SENDER_OBJS = sender.o DISTRIBUTER_OBJS = distributer.o @@ -30,9 +30,6 @@ 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) -ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # AV #---------------------------------------------------------------------------- # Include macros and targets @@ -41,6 +38,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile index 2887c39ea35..7548e0e9590 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) RECEIVER_OBJS = receiver.o SENDER_OBJS = sender.o @@ -29,9 +29,6 @@ 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 +37,11 @@ endif # AV include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (AV,$(findstring AV,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # AV +endif # corba_messaging 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 2fd855d3669..f225c4baac2 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -14,7 +14,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_CosConcurrency -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) PROG_SRCS = CC_client.cpp CC_tests.cpp CC_naming_service.cpp \ tmplinst.cpp CC_command.tab.cpp \ @@ -31,9 +31,6 @@ 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) -ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Concurrency #---------------------------------------------------------------------------- # Include macros and targets @@ -42,6 +39,11 @@ endif # Concurrency include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Concurrency +endif # corba_messaging 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/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index dbc20b7fc57..4f44eb2f06c 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -13,7 +13,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) CosProperty_SERVER_OBJS = server.o CosProperty_CLIENT_OBJS = client.o @@ -24,9 +24,6 @@ BIN2 = server 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 (Property,$(findstring Property,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Property #---------------------------------------------------------------------------- # Include macros and targets @@ -35,6 +32,11 @@ endif # Property include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (Property,$(findstring Property,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Property +endif # corba_messaging 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/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index 0fbc81529d7..361bc4e348d 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -10,16 +10,13 @@ LSRC = $(DUMP_SRCS) SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o) DUMP_OBJS = $(DUMP_SRCS:.cpp=.o) -LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) BIN2 = Sched_Conf #### 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 (Sched,$(findstring Sched,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Sched #---------------------------------------------------------------------------- # Include macros and targets @@ -28,6 +25,11 @@ endif # Sched include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Sched +endif # corba_messaging 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/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index b39e8159a73..f7b80437fe4 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) IDL_FILES = test_object IDL_SRC = test_objectC.cpp test_objectS.cpp @@ -33,9 +33,6 @@ 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 @@ -44,6 +41,11 @@ endif # Naming include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Naming +endif # corba_messaging 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/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile index 764fff7d8e3..2ceb1ea904e 100644 --- a/TAO/orbsvcs/tests/Time/Makefile +++ b/TAO/orbsvcs/tests/Time/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable $(TAO_SRVR_LIBS) +LDLIBS = -lTAO_CosTime -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Messaging -lTAO_IORTable $(TAO_SRVR_LIBS) PROG_SRCS = \ client.cpp \ @@ -28,10 +28,6 @@ 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 (Time,$(findstring Time,$(TAO_ORBSVCS))) - BIN = $(BIN2) -endif # Time - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -39,6 +35,11 @@ endif # Time include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(corba_messaging),1) + ifeq (Time,$(findstring Time,$(TAO_ORBSVCS))) + BIN = $(BIN2) + endif # Time +endif # corba_messaging include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |