diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-31 23:20:42 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-31 23:20:42 +0000 |
| commit | 6cd6e9fb91a9b3d4380ff37d0158076ef33ce976 (patch) | |
| tree | 73ce1c51985e72e96ef3c3002749a83c47875cb0 | |
| parent | a549545f68d7dc7ae72ae7e259d516f894fd6b25 (diff) | |
| download | ATCD-6cd6e9fb91a9b3d4380ff37d0158076ef33ce976.tar.gz | |
ChangeLogTag: Sat Aug 31 23:16:35 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 350e4b92bdf..e8d2c9aadfe 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +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, + a recursive make on Makefile.dirs will be performed even if + the recursive make on Makefile.tao fails. + Sat Aug 31 16:06:42 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu> * tao/Messaging/Makefile: Reverted the change "Sat Aug 31 14:54:01 2002 Balachandran Natarajan " since there is better way to do diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index f1247f293a4..130076a0f84 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -1,19 +1,30 @@ #---------------------------------------------------------------------------- # $Id$ # -# Makefile for the ACE library +# Makefile for the TAO library #---------------------------------------------------------------------------- -# This default rule is here so invoking make realclean will do +# This default rule is here so invoking make realclean will # work when recursing through subdirectories .DEFAULT: @$(MAKE) -f Makefile.tao $@ @$(MAKE) -f Makefile.dirs $@ -# Invoke Makefile.ace first to build libACE, and then +# We need this rule, so that if parallel makes (-j) are invoked, +# the tao target will be built before the dirs target (otherwise the +# dirs targets may try to link libTAO before libTAO has been built). +# Recursively invoked makes from this file will still be run in parallel. +.NOTPARALLEL: + +# Invoke Makefile.tao first to build libTAO, and then # invoke Makefile.dirs to recurse through subdirectories -all: +all: tao dirs + +tao: @$(MAKE) -f Makefile.tao + +dirs: @$(MAKE) -f Makefile.dirs + # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. |