diff options
| author | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-18 21:04:31 +0000 |
|---|---|---|
| committer | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-18 21:04:31 +0000 |
| commit | d99c74e54c21638896301902370e211f07c3ada5 (patch) | |
| tree | 19042fec5516d407309d408d7cd3de1c5bc67b11 | |
| parent | 65c7c1773b1bf9fc7f04af3c93de7aaf2c62dc95 (diff) | |
| download | ATCD-d99c74e54c21638896301902370e211f07c3ada5.tar.gz | |
ChangeLogTag: Fri Oct 18 15:52:11 2002 Priyanka Gontla <pgontla@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Makefile | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/Makefile | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/NameService/Makefile | 3 |
5 files changed, 32 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d42bf4e053e..a9f2d05500d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Fri Oct 18 15:52:11 2002 Priyanka Gontla <pgontla@ociweb.com> + + * orbsvcs/tests/ImplRepo/Makefile: + * orbsvcs/tests/ImplRepo/NameService/Makefile: + * orbsvcs/ImplRepo_Service/Makefile: + * orbsvcs/orbsvcs/Makefile: + Applied the patches provided by Craig Rodrigues so that + Implementation Repostory and related tests will be compiled + only when ImplRepo is added to the list of TAO_ORBSVCS + in platform_macros. + + Thanks to Craig Rodrigues for pointing this out and for + the patches. + Fri Oct 18 15:59:58 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * examples/AMH/Sink_Server/mt_server.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile index 1718d6ed393..f1480900f87 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Makefile +++ b/TAO/orbsvcs/ImplRepo_Service/Makefile @@ -58,6 +58,13 @@ BIN2 = ImplRepo_Service \ ImR_Activator \ tao_imr +#### 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 #---------------------------------------------------------------------------- @@ -66,9 +73,12 @@ 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 (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS))) ifeq ($(minimum_corba),0) BIN = $(BIN2) endif # minimum_corba +endif # ImplRepo include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 65b591804bf..c1c792c44b3 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -86,7 +86,8 @@ ifndef TAO_ORBSVCS TAO_ORBSVCS += Security SSLIOP endif # ssl - TAO_ORBSVCS += Notify + TAO_ORBSVCS += Notify \ + ImplRepo endif # TAO_ORBSVCS diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile index bd87675fb7d..79945576da0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/Makefile @@ -71,9 +71,12 @@ 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 (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS))) ifeq ($(minimum_corba),0) BIN = $(BIN_UNCHECKED) endif # minimum_corba +endif # ImplRepo include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile index c83e00a8bd6..43f85675d47 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile @@ -29,9 +29,12 @@ 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 (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS))) ifeq ($(minimum_corba),0) BIN = $(BIN_UNCHECKED) endif # minimum_corba +endif # ImplRepo include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU |