Protection agains non-existing subdirectories for clean and clobber

targets.  On some platforms this would cause an infinite Make
recursion.  Also remove "Doc" from the SUBDIRSTOO variable, since it
no longer exists in the standard distribution.
This commit is contained in:
Guido van Rossum 1998-05-19 21:15:03 +00:00
parent 110f3652d6
commit 15527e98cd
1 changed files with 6 additions and 2 deletions

View File

@ -146,7 +146,7 @@ OPT= @OPT@
SUBDIRS= Parser Objects Python Modules SUBDIRS= Parser Objects Python Modules
# Other subdirectories # Other subdirectories
SUBDIRSTOO= Include Lib Doc Misc Demo Grammar SUBDIRSTOO= Include Lib Misc Demo Grammar
# Files and directories to be distributed # Files and directories to be distributed
CONFIGFILES= configure configure.in acconfig.h config.h.in Makefile.in CONFIGFILES= configure configure.in acconfig.h config.h.in Makefile.in
@ -485,11 +485,13 @@ localclean:
clean: localclean clean: localclean
-for i in $(SUBDIRS); do \ -for i in $(SUBDIRS); do \
if test -d $$i; then \
(echo making clean in subdirectory $$i; cd $$i; \ (echo making clean in subdirectory $$i; cd $$i; \
if test -f Makefile; \ if test -f Makefile; \
then $(MAKE) clean; \ then $(MAKE) clean; \
else $(MAKE) -f Makefile.*in clean; \ else $(MAKE) -f Makefile.*in clean; \
fi); \ fi); \
else true; fi; \
done done
localclobber: localclean localclobber: localclean
@ -498,11 +500,13 @@ localclobber: localclean
clobber: localclobber clobber: localclobber
-for i in $(SUBDIRS); do \ -for i in $(SUBDIRS); do \
if test -d $$i; then \
(echo clobbering subdirectory $$i; cd $$i; \ (echo clobbering subdirectory $$i; cd $$i; \
if test -f Makefile; \ if test -f Makefile; \
then $(MAKE) clobber; \ then $(MAKE) clobber; \
else $(MAKE) -f $(srcdir)/Makefile.in clobber; \ else $(MAKE) -f $(srcdir)/Makefile*.in clobber; \
fi); \ fi); \
else true; fi; \
done done
# Make things extra clean, before making a distribution: # Make things extra clean, before making a distribution: