diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-06 18:15:08 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-06 18:15:08 +0000 |
| commit | b547f7aa1fa95c3c0444ed7dea995a3f9636cca8 (patch) | |
| tree | c1d90a918cc8664e35e6f2248c1def52cb00eb5b | |
| parent | f4b62cbc3bd934465c505ccd317bf5952bbc6d40 (diff) | |
| download | ATCD-b547f7aa1fa95c3c0444ed7dea995a3f9636cca8.tar.gz | |
ChangeLogTag: Wed Nov 6 11:43:01 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0b2d5ddc01b..70724f58bf3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,6 +1,13 @@ +Wed Nov 6 11:43:01 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile: Fixed an error + which occurs when the right libraries havent been built. Thanks + to Gautham Thaker for pointing this out. + Wed Nov 6 11:35:01 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Bug_1020_Basic_Regression/Server_Task.h: Fixed fuzz errors. + * tests/Bug_1020_Basic_Regression/Server_Task.h: Fixed fuzz + errors. Wed Nov 6 11:32:58 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 6218339dac6..12ca83ae59b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -8,9 +8,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LIBNAME = libTAO_RTEC_COSEC -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) ACE_SHLIBS = -lTAO_RTEvent -lTAO_CosEvent \ -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE @@ -39,9 +36,11 @@ 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))) - BIN = $(BIN2) +ifeq (RTEvent,$(findstring RTEvent ,$(TAO_ORBSVCS))) +ifeq (CosEvent,$(findstring CosEvent ,$(TAO_ORBSVCS))) +LIBNAME = libTAO_RTEC_COSEC +LIB = $(LIBNAME).a +SHLIB = $(LIBNAME).$(SOEXT) endif # RTEvent endif # CosEvent include $(ACE_ROOT)/include/makeinclude/macros.GNU |