From db87f6492513dc7d6b82ca154107d35a9ad499e8 Mon Sep 17 00:00:00 2001 From: kitty Date: Wed, 5 Feb 2003 02:32:40 +0000 Subject: Tue Feb 4 13:23:51 2003 Krishnakumar B --- TAO/ChangeLog | 5 +++++ 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 + + * tao/Makefile: Fix the Makefile to use the SUBDIR_MAKEFILE + variable when recursing into directories. + Sun Feb 02 21:01:12 2003 Frank Hunleth * 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. -- cgit v1.2.1