diff options
| author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 02:32:40 +0000 |
|---|---|---|
| committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 02:32:40 +0000 |
| commit | db87f6492513dc7d6b82ca154107d35a9ad499e8 (patch) | |
| tree | 8636ddec20c3dca8835038c4b4dacbd4026dc578 | |
| parent | 1b09350ce01be71281c2805725a671c07dadddac (diff) | |
| download | ATCD-db87f6492513dc7d6b82ca154107d35a9ad499e8.tar.gz | |
Tue Feb 4 13:23:51 2003 Krishnakumar B <kitty@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 371e7fd5d4b..b231fbf7ee4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 4 13:23:51 2003 Krishnakumar B <kitty@cs.wustl.edu> + + * tao/Makefile: Fix the Makefile to use the SUBDIR_MAKEFILE + variable when recursing into directories. + Sun Feb 02 21:01:12 2003 Frank Hunleth <frank@hunleth.com> * orbsvcs/tests/Miop/McastHello/run_test.pl: Fixed a race condition diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 130076a0f84..42439cdc9fc 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -4,11 +4,11 @@ # Makefile for the TAO library #---------------------------------------------------------------------------- -# This default rule is here so invoking make realclean will +# This default rule is here so invoking make realclean will # work when recursing through subdirectories .DEFAULT: @$(MAKE) -f Makefile.tao $@ - @$(MAKE) -f Makefile.dirs $@ + @$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile $@ # We need this rule, so that if parallel makes (-j) are invoked, # the tao target will be built before the dirs target (otherwise the @@ -23,8 +23,8 @@ all: tao dirs tao: @$(MAKE) -f Makefile.tao -dirs: - @$(MAKE) -f Makefile.dirs +dirs: + @$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. |