diff options
author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-23 21:40:18 +0000 |
---|---|---|
committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-23 21:40:18 +0000 |
commit | 3f004a239a76cab4fbcde6c4048b64d7a093fa28 (patch) | |
tree | 42b5bad7744f6279b7165b86632a7bf5b022bc14 /TAO | |
parent | 7043d5721da0b79ae3e0d333971ff5be2a779f81 (diff) | |
download | ATCD-3f004a239a76cab4fbcde6c4048b64d7a093fa28.tar.gz |
ChangeLogTag: Wed Oct 23 16:32:36 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ac2f05b34e7..9186327b59f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 23 16:32:36 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile: Added a check to + ensure that the contents are not compiled if the dependant + libraries are not available. Thanks to Sandeep Neema + <neemask@corvette.vuse.vanderbilt.edu> for reporting this. + Wed Oct 23 13:38:59 2002 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/orbsvcs/DsEventLogAdmin.dsp: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 13a9a2e6544..6218339dac6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -36,6 +36,14 @@ 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))) + BIN = $(BIN2) +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 |