fixed up version of 1.4.1.1 to properly descend & not waste processes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@936 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/Imake.rules b/src/config/Imake.rules
index a3973e90a1c6953974d32ce63185d593c579040c..292117d7cde079bc52d0aca5b081eb0f5bf5e496 100644 (file)
--- a/src/config/Imake.rules
+++ b/src/config/Imake.rules
@@ -1255,40 +1255,48 @@ target::                                                                @@\
 #ifndef MakeNsubdirMakefiles
 #define MakeNsubdirMakefiles()                                         @@\
 subdirMakefiles:                                                       @@\
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak                           @@\
+       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR) -s Makefile.new; \   @@\
+       $(MAKE) -f Makefile.new noop                                    @@\
        -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then \                 @@\
-       echo "  $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       echo "  $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; \                        @@\
        $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \ @@\
+       $(MV) $(MAKEFILE_SUBDIR)/Makefile.new $(MAKEFILE_SUBDIR)/Makefile; \ @@\
+       cd $(MAKEFILE_SUBDIR); $(MAKE) $(MFLAGS) Makefiles; \           @@\
        else exit 0; fi                                                 @@\
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \   @@\
-       $(MAKE) $(MFLAGS) Makefiles                                     @@\
                                                                        @@\
 subsubdirMakefiles:                                                    @@\
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak                           @@\
+       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR) -s Makefile.new; \   @@\
+       $(MAKE) -f Makefile.new noop                                    @@\
        -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then \                 @@\
-       echo "  $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       echo "  $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; \                        @@\
        $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \ @@\
+       $(MV) $(MAKEFILE_SUBDIR)/Makefile.new $(MAKEFILE_SUBDIR)/Makefile; \ @@\
+       cd $(MAKEFILE_SUBDIR); $(MAKE) $(MFLAGS) Makefiles; \           @@\
        else exit 0; fi                                                 @@\
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \        @@\
-       $(MAKE) $(MFLAGS) Makefiles                                     @@\
                                                                        @@\
 subsubsubdirMakefiles:                                                 @@\
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak                           @@\
+       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR) -s Makefile.new; \   @@\
+       $(MAKE) -f Makefile.new noop                                    @@\
        -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then \                 @@\
-       echo "  $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       echo "  $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; \                        @@\
        $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \ @@\
-       else exit 0; fi @@\
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \     @@\
-       $(MAKE) $(MFLAGS) Makefiles                                     @@\
+       $(MV) $(MAKEFILE_SUBDIR)/Makefile.new $(MAKEFILE_SUBDIR)/Makefile; \ @@\
+       cd $(MAKEFILE_SUBDIR); $(MAKE) $(MFLAGS) Makefiles; \           @@\
+       else exit 0; fi                                                 @@\
                                                                        @@\
 subsubsubsubdirMakefiles:                                              @@\
-       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak                           @@\
+       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR) -s Makefile.new; \   @@\
+       $(MAKE) -f Makefile.new noop                                    @@\
        -@if [ -f $(MAKEFILE_SUBDIR)/Makefile ]; then \                 @@\
-       echo "  $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       echo "  $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak"; \ @@\
+       $(RM) $(MAKEFILE_SUBDIR)/Makefile.bak; \                        @@\
        $(MV) $(MAKEFILE_SUBDIR)/Makefile $(MAKEFILE_SUBDIR)/Makefile.bak; \ @@\
-       else exit 0; fi                                                 @@\
-       cd $(MAKEFILE_SUBDIR); $(IMAKE_CMD) -DTOPDIR=$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(UPPREFIX)$(TOP) -DCURDIR=$(NEW_CURRENT_DIR); \  @@\
-       $(MAKE) $(MFLAGS) Makefiles
+       $(MV) $(MAKEFILE_SUBDIR)/Makefile.new $(MAKEFILE_SUBDIR)/Makefile; \ @@\
+       cd $(MAKEFILE_SUBDIR); $(MAKE) $(MFLAGS) Makefiles; \           @@\
+       else exit 0; fi
 #endif /* MakeNsubdirMakefiles */