diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Makefile.dirs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e8d2c9aadfe..435c4ee2b0f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 31 23:58:02 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * tao/Makefile.dirs: Add include of rules.tao.GNU, in order to + get default values for make variables like corba_messaging. + Sat Aug 31 23:16:35 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * tao/Makefile: Re-order targets to that if make -k is specified, diff --git a/TAO/tao/Makefile.dirs b/TAO/tao/Makefile.dirs index c01b1391e42..2426dfbcf59 100644 --- a/TAO/tao/Makefile.dirs +++ b/TAO/tao/Makefile.dirs @@ -22,7 +22,12 @@ DIRS = \ # Include macros and targets #---------------------------------------------------------------------------- +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU ifeq ($(corba_messaging),1) |