* Makefile.in (SUBDIRS): New macro.

	(mostlyclean, clean, distclean, maintainer-clean): Adjust to
	avoid multiple subdirectory cleaning.
	(*-subdir): Use SUBDIRS.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30229 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 58dca53..0d28615 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-28  Nathan Sidwell  <nathan@acm.org>
+
+       * Makefile.in (SUBDIRS): New macro.
+       (mostlyclean, clean, distclean, maintainer-clean): Adjust to
+       avoid multiple subdirectory cleaning.
+       (*-subdir): Use SUBDIRS.
+
 1999-10-25  Jim Kingdon  <http://developer.redhat.com/>
 
        * cplus-dem.c: Move declarations of standard_symbol_characters and

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index a42ea62..f5a1833 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -92,6 +92,9 @@ FLAGS_TO_PASS = \
        "libsubdir=$(libsubdir)" \
        "tooldir=$(tooldir)"
 
+# Subdirectories to recurse into. We need to override this during cleaning
+SUBDIRS = testsuite
+
 all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
 
@@ -204,19 +207,24 @@ ls:
 
 # Need to deal with profiled libraries, too.
 
+# Cleaning has to be done carefully to ensure that we don't clean our SUBDIRS
+# multiple times, hence our explicit recursion with an empty SUBDIRS.
 mostlyclean: mostlyclean-subdir
        rm -rf *.o pic core errs \#* *.E a.out
        rm -f needed.awk needed2.awk errors dummy needed-list config.h stamp-*
        rm -f $(CONFIG_H) $(NEEDED_LIST) stamp-picdir
        @$(MULTICLEAN) multi-clean DO=mostlyclean
-clean: mostlyclean clean-subdir
+clean: clean-subdir
+       $(MAKE) SUBDIRS="" mostlyclean
        rm -f *.a required-list tmpmulti.out
        @$(MULTICLEAN) multi-clean DO=clean
-distclean: clean distclean-subdir
+distclean: distclean-subdir
+       $(MAKE) SUBDIRS="" clean
        @$(MULTICLEAN) multi-clean DO=distclean
        rm -f *~ Makefile config.status xhost-mkfrag TAGS multilib.out
        rm -f config.log
-maintainer-clean realclean: distclean maintainer-clean-subdir
+maintainer-clean realclean: maintainer-clean-subdir
+       $(MAKE) SUBDIRS="" distclean
 
 force:
 
@@ -236,7 +244,9 @@ install-info-subdir clean-info-subdir dvi-subdir install-subdir     \
 etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
 maintainer-clean-subdir:
        @target=`echo $@ | sed -e 's/-subdir//'`; \
-       cd testsuite && $(MAKE) $$target
+       for dir in . $(SUBDIRS) ; do \
+         test $$dir = . || (cd $$dir && $(MAKE) $$target) || exit 1; \
+       done
 
 $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA): stamp-picdir