diff options
author | bala <balanatarajan@users.noreply.github.com> | 2003-02-13 22:35:23 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2003-02-13 22:35:23 +0000 |
commit | a8eacb5647a8b59caf4d01939c2d35de0b465c46 (patch) | |
tree | 3f7cfef74b9ea6efb1ab5b45ab98d05fe2b8b3dc | |
parent | c27a1915ddf0a200059dcf698a7331ae50e5dde4 (diff) | |
download | ATCD-a8eacb5647a8b59caf4d01939c2d35de0b465c46.tar.gz |
ChangeLogTag: Thu Feb 13 17:45:35 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 4 | ||||
-rw-r--r-- | TAO/utils/catior/Makefile | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e1544d533c3..728585f8e3a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 13 17:45:35 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * utils/catior/Makefile: Do not build if RTCORBA is turned off. + Thu Feb 13 17:41:37 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf: Added the diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile index aff25c79b83..0580b51c0aa 100644 --- a/TAO/utils/catior/Makefile +++ b/TAO/utils/catior/Makefile @@ -14,7 +14,7 @@ endif # ! TAO_ROOT LDLIBS = -lTAO_Strategies -lTAO -lTAO_RTCORBA -BIN = catior +BIN_UNCHECKED = catior SRC= catior.cpp @@ -26,6 +26,9 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(rt_corba),1) +BIN=$(BIN_UNCHECKED) +endif # rt_corba include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU |