diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-10 04:19:21 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-10 04:19:21 +0000 |
| commit | ae9fce4711e00c6b9948babd66e0a55507949a13 (patch) | |
| tree | 3b84ea2d583d05e6b14d80437a3b724be16f2681 | |
| parent | 458ff7c96909556b5f952198172274cfc2428522 (diff) | |
| download | ATCD-ae9fce4711e00c6b9948babd66e0a55507949a13.tar.gz | |
ChangeLogTag: Tue Sep 10 04:18:47 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Makefile | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 63daf1d3d5c..20bb8c19709 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 10 04:18:47 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/examples/Makefile: + Do not build certain tests unless corba_messaging=1. + Tue Sep 10 04:10:46 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * orbsvcs/tests/Makefile: diff --git a/TAO/orbsvcs/examples/Makefile b/TAO/orbsvcs/examples/Makefile index 0f5a03957f0..c59a130cc12 100644 --- a/TAO/orbsvcs/examples/Makefile +++ b/TAO/orbsvcs/examples/Makefile @@ -4,28 +4,31 @@ # #---------------------------------------------------------------------------- +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU + #---------------------------------------------------------------------------- # Local macros #---------------------------------------------------------------------------- - +ifeq ($(corba_messaging),1) DIRS = CosEC \ - RtEC \ - Notify \ + RtEC +endif # corba_messaging + +DIRS += Notify \ Log \ Security \ ORT -ifndef TAO_ROOT - TAO_ROOT = $(ACE_ROOT)/TAO -endif - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(TAO_ROOT)/rules.tao.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 |