diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-20 18:19:18 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-20 18:19:18 +0000 |
| commit | a80cb8051f8881284383fcb9225960ae1942c634 (patch) | |
| tree | e5b6f0d0c38481aa9d7276c273cdb8ec23149e86 | |
| parent | ce82b74f2ff51e518ec88c1802e4d75c4b4e1c83 (diff) | |
| download | ATCD-a80cb8051f8881284383fcb9225960ae1942c634.tar.gz | |
ChangeLogTag: Mon Dec 20 12:15:35 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 18 | ||||
| -rw-r--r-- | TAO/examples/Makefile | 2 | ||||
| -rw-r--r-- | TAO/performance-tests/RTCorba/Makefile | 13 | ||||
| -rw-r--r-- | TAO/performance-tests/RTCorba/Oneways/Makefile | 12 |
4 files changed, 39 insertions, 6 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index d1635c19e71..6ff681d5f6b 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,21 @@ +Mon Dec 20 12:15:35 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * performance-tests/RTCorba/Oneways/Makefile: Compile the Reliable + directory only if we have CORBA Messaging defined since there + is no buffering in TAO without CORBA Messaging. + + * performance-tests/RTCorba/Makefile: Compile the + Multiple_Endpoints directory only if we have RT CORBA defined + since there is no priority mapping in TAO without RT CORBA. + + * examples/Makefile (DIRS): Should be: + + ifeq ($(corba_messaging),1) + + instead of: + + ifdef corba_messaging + Mon Dec 20 11:10:07 1999 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp: Changed some diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile index 076d29cf5bb..62cdd884ffe 100644 --- a/TAO/examples/Makefile +++ b/TAO/examples/Makefile @@ -36,7 +36,7 @@ ifndef minimum_corba endif # minimum_corba -ifdef corba_messaging +ifeq ($(corba_messaging),1) # No Buffered Oneways without CORBA Messaging DIRS += Buffered_Oneways diff --git a/TAO/performance-tests/RTCorba/Makefile b/TAO/performance-tests/RTCorba/Makefile index 8ac57c96919..83258b46bd6 100644 --- a/TAO/performance-tests/RTCorba/Makefile +++ b/TAO/performance-tests/RTCorba/Makefile @@ -10,8 +10,7 @@ # Local macros #---------------------------------------------------------------------------- -DIRS = Oneways \ - Multiple_Endpoints +DIRS = Oneways ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO @@ -22,8 +21,16 @@ endif #---------------------------------------------------------------------------- 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) + +# No Priorities without RT CORBA + DIRS += Multiple_Endpoints + +endif # rt_corba + +include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/performance-tests/RTCorba/Oneways/Makefile b/TAO/performance-tests/RTCorba/Oneways/Makefile index 08d7dddee91..d4e616e31a2 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Makefile +++ b/TAO/performance-tests/RTCorba/Oneways/Makefile @@ -10,7 +10,7 @@ # Local macros #---------------------------------------------------------------------------- -DIRS = Reliable +DIRS = ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO @@ -21,8 +21,16 @@ endif #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(corba_messaging),1) + +# No Buffered Oneways without CORBA Messaging + DIRS += Reliable + +endif # corba_messaging + +include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU |