diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-04-13 03:36:55 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-04-13 03:36:55 +0000 |
| commit | 88f6f0ed7fab0d22fc2aec20e805cf3de0ec5e87 (patch) | |
| tree | 46c6488f2ebfaaa2fa5d9763b5438ed7e7cdcfec | |
| parent | 8b5429cdf5a74fb0ea1e81275a59cb969a00e904 (diff) | |
| download | ATCD-88f6f0ed7fab0d22fc2aec20e805cf3de0ec5e87.tar.gz | |
ChangeLogTag:Sat Apr 12 22:33:22 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/RT_lib/Makefile | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Test_Filter/Makefile | 15 |
3 files changed, 23 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a9164894bd7..ec4978e046a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sat Apr 12 22:33:22 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/tests/Notify/Test_Filter/Makefile: + * orbsvcs/tests/Notify/RT_lib/Makefile: Added guards for builds in + which RTCORBA is turned off. + Fri Apr 11 17:00:00 2003 Roy Pollock <rpollock@ghs.com> * orbsvcs/orbsvcs/AV/global.h: INTEGRITY already has typedefs of diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile index 48c54472a27..adeb65491f0 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile +++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile @@ -22,18 +22,20 @@ FILES = \ RT_Factories_Define CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS))) -ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS))) -LIB = $(LIB_UNCHECKED) -SHLIB = $(SHLIB_UNCHECKED) -endif -endif #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU +ifeq ($(rt_corba),1) +ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS))) +ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS))) +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) +endif +endif +endif #rt_corba LSRC = $(addsuffix .cpp, $(FILES)) ACELIB = -lACE diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile index 5ed8a29e408..db7c2b35411 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Makefile @@ -20,18 +20,21 @@ FILES = \ RT_Test_FilterFactory CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS))) -ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS))) -LIB = $(LIB_UNCHECKED) -SHLIB = $(SHLIB_UNCHECKED) -endif -endif #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(rt_corba),1) +ifeq (Notify, $(findstring Notify, $(CURRENT_COMPONENTS))) +ifeq (Naming, $(findstring Naming, $(CURRENT_COMPONENTS))) +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) +endif +endif +endif # ami LSRC = $(addsuffix .cpp, $(FILES)) ACELIB = -lACE |