diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-02-14 00:41:34 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-02-14 00:41:34 +0000 |
| commit | 760d7ecf2290567bac37cd45838a217d970d987c (patch) | |
| tree | a2216bd87e8a1f34bf485e6e3230608c1016255e /TAO | |
| parent | 5bcae29c2e621f89642c13b3ea91317bfe84df35 (diff) | |
| download | ATCD-760d7ecf2290567bac37cd45838a217d970d987c.tar.gz | |
ChangeLogTag: Wed Feb 13 18:39:01 2002 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.PortableGroup | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Miop/McastHello/Makefile | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4d9bfc03b9f..a6626346db8 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Feb 13 18:39:01 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/tests/Miop/McastHello/Makefile: Added a check for + compilation. + * orbsvcs/orbsvcs/Makefile.PortableGroup: Added CosNaming to list + of libraries against which this needs to be linked. + Wed Feb 13 12:47:46 2002 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/IFR_Service/ConstantDef_i.cpp: Changed the usage of diff --git a/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup b/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup index bce238039f2..a0aef1d0bc0 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup +++ b/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup @@ -14,7 +14,7 @@ SHLIB = $(LIBNAME).$(SOEXT) VPATH=.:PortableGroup -ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE +ACE_SHLIBS = -lTAO_CosNaming -lTAO_PortableServer -lTAO -lACE #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile b/TAO/orbsvcs/tests/Miop/McastHello/Makefile index c39aff4720f..b9ad20de7b9 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile +++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile @@ -32,10 +32,10 @@ include $(TAO_ROOT)/rules.tao.GNU #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. - -ifeq ($(minimum_corba),0) +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (PortableGroup,$(findstring PortableGroup,$(TAO_ORBSVCS))) BIN = $(BIN_UNCHECKED) -endif # minimum_corba == 0 +endif # PortableGroup include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU |