Speed up clean target, don't recurse where possible, remove unneeded actions

19 files changed, 7 insertions, 36 deletions

diff --git a/Makefile b/Makefile
index c7295c7ff..d1d7d9e64 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,6 @@ noconfig_targets := menuconfig config oldconfig randconfig \
 TOPDIR=./
 include Rules.mak
 
-ALL_SUBDIRS = ldso libc libcrypt libresolv libnsl libutil librt libm libpthread libintl test utils # extra
-
 DIRS = ldso libc libcrypt libresolv libnsl libutil librt
 ifeq ($(strip $(UCLIBC_HAS_FLOATS)),y)
 	DIRS += libm
@@ -353,15 +351,16 @@ defconfig: extra/config/conf
 	$(INSTALL) -d include/bits
 	@./extra/config/conf -d extra/Configs/Config.in
 
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)): dummy
-	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-
-clean: subdirs_clean
+clean:
 	- find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec $(RM) {} \;
 	@$(RM) -r lib include/bits
-	$(MAKE) -C libc/misc/internals clean
+	$(RM) libc/misc/internals/interp.c
+	$(RM) include/fpu_control.h
 	$(MAKE) -C extra/locale clean
+	$(MAKE) -C ldso clean
+	$(MAKE) -C libpthread clean
+	$(MAKE) -C test clean
+	$(MAKE) -C utils clean
 	@set -e; \
 	for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
 		$(RM) include/sys/$$i; \
diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile
index c37858380..cf7f1be41 100644
--- a/libc/sysdeps/linux/alpha/Makefile
+++ b/libc/sysdeps/linux/alpha/Makefile
@@ -81,4 +81,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 65df75338..6fe496162 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -86,4 +86,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/bfin/Makefile b/libc/sysdeps/linux/bfin/Makefile
index 8fb05118e..a76e0039d 100644
--- a/libc/sysdeps/linux/bfin/Makefile
+++ b/libc/sysdeps/linux/bfin/Makefile
@@ -80,5 +80,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) $(TOPDIR)lib/crt0.o
diff --git a/libc/sysdeps/linux/e1/Makefile b/libc/sysdeps/linux/e1/Makefile
index 60d6ec026..3c1852447 100644
--- a/libc/sysdeps/linux/e1/Makefile
+++ b/libc/sysdeps/linux/e1/Makefile
@@ -85,7 +85,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-ifneq ($(strip $(HAVE_ELF)),y)
-	$(RM) $(TOPDIR)/include/float.h
-endif
diff --git a/libc/sysdeps/linux/frv/Makefile b/libc/sysdeps/linux/frv/Makefile
index dbf78d1c6..5cda0b49c 100644
--- a/libc/sysdeps/linux/frv/Makefile
+++ b/libc/sysdeps/linux/frv/Makefile
@@ -76,5 +76,4 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
 	$(RM) $(TOPDIR)/include/link.h
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index bde820b2b..31ed12be4 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -86,5 +86,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) $(TOPDIR)include/fpu_control.h
diff --git a/libc/sysdeps/linux/i960/Makefile b/libc/sysdeps/linux/i960/Makefile
index 2701e9985..a081e36ce 100644
--- a/libc/sysdeps/linux/i960/Makefile
+++ b/libc/sysdeps/linux/i960/Makefile
@@ -82,4 +82,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index 7e595229f..c3a58aa53 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -96,7 +96,6 @@ endif
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
 ifneq ($(strip $(HAVE_ELF)),y)
 	$(RM) $(TOPDIR)/include/float.h
 endif
diff --git a/libc/sysdeps/linux/microblaze/Makefile b/libc/sysdeps/linux/microblaze/Makefile
index 269d53eb6..e47bbefb0 100644
--- a/libc/sysdeps/linux/microblaze/Makefile
+++ b/libc/sysdeps/linux/microblaze/Makefile
@@ -88,4 +88,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index 82484c0e7..52bed5ef9 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -88,6 +88,4 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) $(TOPDIR)/include/fpu_control.h
 	$(RM) $(TOPDIR)/include/sgidefs.h
diff --git a/libc/sysdeps/linux/nios/Makefile b/libc/sysdeps/linux/nios/Makefile
index cdfd9a204..b351a9649 100644
--- a/libc/sysdeps/linux/nios/Makefile
+++ b/libc/sysdeps/linux/nios/Makefile
@@ -80,5 +80,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) $(TOPDIR)/include/fpu_control.h
diff --git a/libc/sysdeps/linux/nios2/Makefile b/libc/sysdeps/linux/nios2/Makefile
index 7cb737e36..e3abf4b87 100644
--- a/libc/sysdeps/linux/nios2/Makefile
+++ b/libc/sysdeps/linux/nios2/Makefile
@@ -80,5 +80,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) $(TOPDIR)/include/fpu_control.h
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index 4c345c00f..393c215ba 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -87,4 +87,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index f224acdbf..aecb890f2 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -86,5 +86,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) gmon-start.S
diff --git a/libc/sysdeps/linux/sh64/Makefile b/libc/sysdeps/linux/sh64/Makefile
index 3b5e8e9d0..27df53220 100644
--- a/libc/sysdeps/linux/sh64/Makefile
+++ b/libc/sysdeps/linux/sh64/Makefile
@@ -85,4 +85,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index 8a2549cb2..6a160cfc4 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -81,4 +81,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile
index e54925096..f63bcdf90 100644
--- a/libc/sysdeps/linux/v850/Makefile
+++ b/libc/sysdeps/linux/v850/Makefile
@@ -85,4 +85,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/x86_64/Makefile b/libc/sysdeps/linux/x86_64/Makefile
index 3c48d9e0b..0ac79f351 100644
--- a/libc/sysdeps/linux/x86_64/Makefile
+++ b/libc/sysdeps/linux/x86_64/Makefile
@@ -85,5 +85,3 @@ headers:
 
 clean:
 	$(RM) *.[oa] *~ core
-	$(RM) bits/sysnum.h
-	$(RM) gmon-start.S