From 75e3be2c706ebd829b5d544dd20b4a00ac4520ea Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 4 Oct 2005 14:47:17 +0000
Subject: Do not recurse into ldso/libc/libpthread on clean

---
 Makefile            | 11 ++++++-----
 ldso/Makefile       |  4 +++-
 ldso/libdl/Makefile |  2 +-
 libpthread/Makefile |  4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b46518d0a..c54251dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -348,13 +348,13 @@ defconfig: extra/config/conf
 
 clean:
 	@$(RM) -r lib include/bits
-	$(RM) */*.so */*.a
+	$(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
 	$(RM) libc/misc/internals/interp.c
+	$(RM) ldso/libdl/*.a
 	$(RM) include/fpu_control.h
 	$(MAKE) -C extra/locale clean
-	$(MAKE) -C ldso clean
-	$(MAKE) -C libc clean
-	$(MAKE) -C libpthread clean
+	$(MAKE) -C ldso headers_clean
+	$(MAKE) -C libpthread headers_clean
 	$(MAKE) -C test clean
 	$(MAKE) -C utils clean
 	@set -e; \
@@ -370,9 +370,10 @@ clean:
 	@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then		\
 	    $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean;		\
 	fi
-	- find . \( -name \*.o -o -name core -o -name .\#\* \) -exec $(RM) {} \;
+	-find . -name \*.o -exec $(RM) {} \;
 
 distclean: clean
+	-find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\#\* \) -exec $(RM) {} \;
 	$(RM) .config .config.old .config.cmd
 	$(RM) extra/locale/*.txt
 	$(MAKE) -C extra clean
diff --git a/ldso/Makefile b/ldso/Makefile
index 340ddfacb..07bf63241 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -43,9 +43,11 @@ include/dl-progname.h:
 	echo '#include "$(TARGET_ARCH)/elfinterp.c"' \
 		> include/dl-progname.h
 
-clean: subdirs_clean
+headers_clean:
 	$(RM) $(HEADERS)
 
+clean: subdirs_clean headers_clean
+
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
 
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 8101b08e3..76149adbf 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -92,4 +92,4 @@ libdl_pic.o: libdl.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.o *~ core *.a
+	$(RM) *.[oa] *~ core
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 18292917a..a1cdcaedc 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -67,10 +67,12 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy
 $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
 	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
-clean: subdirs_clean
+headers_clean:
 	$(RM)	$(TOPDIR)include/pthread.h $(TOPDIR)include/semaphore.h \
 		$(TOPDIR)include/thread_db.h \
 		$(TOPDIR)include/bits/pthreadtypes.h $(TOPDIR)include/bits/semaphore.h \
 		$(TOPDIR)include/bits/libc-lock.h $(TOPDIR)include/bits/stdio-lock
 
+clean: subdirs_clean headers_clean
+
 .PHONY: dummy
-- 
cgit v1.2.3