prettify make clean

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2025-05-08 23:02:28 +08:00 · 2010-03-25 15:17:10 +01:00 · 2010-03-25 15:17:10 +01:00 · abdbaa897b
commit abdbaa897b
parent 41d4cc097c
58 changed files with 128 additions and 128 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -9,7 +9,7 @@
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 clean_targets := clean realclean distclean \
-	objclean-y headers_clean-y utils_clean
+	objclean-y headers_clean-y CLEAN_utils
 noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
 	defconfig allyesconfig allnoconfig \
 	release dist tags help
@ -148,9 +148,9 @@ endif

 $(target-headers-sysdep): | $(top_builddir)include/bits $(top_builddir)include/sys

-sysdep_common_headers-clean:
-	$(RM) $(ALL_HEADERS_COMMON)
-headers_clean-y += sysdep_common_headers-clean
+HEADERCLEAN_common:
+	$(do_rm) $(ALL_HEADERS_COMMON)
+headers_clean-y += HEADERCLEAN_common

 # The headers. Arch specific headers are specified via ARCH_HEADERS in
 # libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch which appends those via
@ -446,7 +446,7 @@ include_clean:

 clean: include_clean
 	$(Q)$(RM) -r $(top_builddir)lib $(top_builddir)include/bits
-	@$(MAKE) -C utils utils_clean
+	@$(MAKE) -C utils CLEAN_utils
 	+$(MAKE) -s -C test clean
 	@$(RM) $(top_builddir)include/linux $(top_builddir)include/asm*
 	$(Q)$(RM) $(top_builddir)extra/scripts/unifdef
--- a/2
+++ b/2
@ -95,7 +95,7 @@ pur_disp_ln        = echo "  "LN $(show_objs)
 pur_disp_mkdir     = echo "  "MKDIR $(show_objs)
 pur_disp_gen       = echo "  "GEN $(show_objs)
 pur_disp_unifdef   = echo "  "UNIFDEF $(show_objs)
-pur_disp_rm        = echo "  "CLEAN $(@:_clean=)
+pur_disp_rm        = echo "  "CLEAN $(subst CLEAN_,,$(patsubst HEADERCLEAN_%,include \(%\),$@))

 sil_disp_compile.c = true
 sil_disp_compile.i = true
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@ -234,9 +234,9 @@ $(top_builddir)include/bits/uClibc_locale_data.h: $(locale_OUT)/uClibc_locale_da
 	$(Q)$(AWK) 'BEGIN{i=1}{if (/WANT_/) i=/endif/;else if (i) print $0}' \
 		$< > $@

-objclean-y += locale_clean
+objclean-y += CLEAN_extra/locale

 # lmmtolso.c/gen_mmap.c/tst-*.c not used
-locale_clean:
+CLEAN_extra/locale:
 	$(do_rm) $(locale_HOBJ) $(locale_SRC) $(addprefix $(locale_OUT)/*., o os txt) \
 		$(addprefix $(locale_OUT)/,$(addsuffix .h,uClibc_locale_data lt_defines c8tables wctables locale_tables locale_collate) lmmtolso gen_mmap locale.mmap)
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@ -60,7 +60,7 @@ $(UCLIBC_LDSO_NAME)_OBJS := $($(UCLIBC_LDSO_NAME)_COBJ) $($(UCLIBC_LDSO_NAME)_SO
 ldso-y := $($(UCLIBC_LDSO_NAME)_OBJS:.o=.oS)

 lib-so-y += $(ldso)
-objclean-y += $(UCLIBC_LDSO_NAME)_clean
+objclean-y += CLEAN_ldso/ldso

 $(ldso): $(ldso:.$(MAJOR_VERSION)=)
 $(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
@ -70,5 +70,5 @@ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-$(UCLIBC_LDSO_NAME)_clean:
+CLEAN_ldso/ldso:
 	$(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e))))
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@ -41,7 +41,7 @@ libdl-so-y := $(libdl_OUT)/libdl.oS

 lib-a-$(HAVE_SHARED) += $(top_builddir)lib/libdl.a
 lib-so-y += $(top_builddir)lib/libdl.so
-objclean-y += libdl_clean
+objclean-y += CLEAN_ldso/libdl

 $(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend)
 	$(call link.so,$(libdl_FULL_NAME),$(MAJOR_VERSION))
@ -55,5 +55,5 @@ $(top_builddir)lib/libdl.a: $(libdl-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-libdl_clean:
+CLEAN_ldso/libdl:
 	$(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a)
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@ -52,7 +52,7 @@ endif
 lib-a-y += $(top_builddir)lib/libc.a
 lib-gdb-y += $(top_builddir)lib/libc.gdb
 lib-so-y += $(libc.depend)
-objclean-y += libc_clean
+objclean-y += CLEAN_libc

 OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n '/OUTPUT_FORMAT/,/)/p'

@ -96,5 +96,5 @@ $(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y)
 $(top_builddir)lib/libc.gdb: $(libc_OUT)/libc_so.a $(LINK_FLAT_CRTS)
 	$(call link-flat.so,$(@:.gdb=),$(UCLIBC_SHARED_FLAT_ID))

-libc_clean:
+CLEAN_libc:
 	$(do_rm) $(addprefix $(libc_OUT)/*., o os oS a)
--- a/libc/inet/Makefile.in
+++ b/libc/inet/Makefile.in
@ -57,7 +57,7 @@ INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC-y))

 libc-y += $(INET_OBJ)

-objclean-y += inet_clean
+objclean-y += CLEAN_libc/inet

-inet_clean:
+CLEAN_libc/inet:
 	$(do_rm) $(addprefix $(INET_OUT)/*., o os)
--- a/libc/inet/rpc/Makefile.in
+++ b/libc/inet/rpc/Makefile.in
@ -41,7 +41,7 @@ libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o

 libc-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ)

-objclean-y+=inet_rpc_clean
+objclean-y+=CLEAN_libc/inet/rpc

-inet_rpc_clean:
+CLEAN_libc/inet/rpc:
 	$(do_rm) $(addprefix $(INET_RPC_OUT)/*., o os oS)
--- a/libc/misc/assert/Makefile.in
+++ b/libc/misc/assert/Makefile.in
@ -17,7 +17,7 @@ MISC_ASSERT_OBJ := $(MISC_ASSERT_OUT)/__assert.o

 libc-y += $(MISC_ASSERT_OBJ)

-objclean-y += misc_assert_clean
+objclean-y += CLEAN_libc/misc/assert

-misc_assert_clean:
+CLEAN_libc/misc/assert:
 	$(do_rm) $(addprefix $(MISC_ASSERT_OUT)/*., o os)
--- a/libc/misc/ctype/Makefile.in
+++ b/libc/misc/ctype/Makefile.in
@ -36,7 +36,7 @@ MISC_CTYPE_OBJ := $(patsubst %.c,$(MISC_CTYPE_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_CTYPE_OBJ)

-objclean-y += misc_ctype_clean
+objclean-y += CLEAN_libc/misc/ctype

-misc_ctype_clean:
+CLEAN_libc/misc/ctype:
 	$(do_rm) $(addprefix $(MISC_CTYPE_OUT)/*., o os)
--- a/libc/misc/dirent/Makefile.in
+++ b/libc/misc/dirent/Makefile.in
@ -22,7 +22,7 @@ MISC_DIRENT_OBJ := $(patsubst %.c,$(MISC_DIRENT_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_DIRENT_OBJ)

-objclean-y += misc_dirent_clean
+objclean-y += CLEAN_libc/misc/dirent

-misc_dirent_clean:
+CLEAN_libc/misc/dirent:
 	$(do_rm) $(addprefix $(MISC_DIRENT_OUT)/*., o os)
--- a/libc/misc/elf/Makefile.in
+++ b/libc/misc/elf/Makefile.in
@ -16,7 +16,7 @@ MISC_ELF_OBJ:=$(patsubst %.c,$(MISC_ELF_OUT)/%.o,$(libc_a_CSRC))
 libc-static-y += $(MISC_ELF_OBJ)
 libc-shared-y += $(MISC_ELF_OUT)/dl-iterate-phdr.oS

-objclean-y+= misc_elf_clean
+objclean-y+= CLEAN_libc/misc/elf

-misc_elf_clean:
+CLEAN_libc/misc/elf:
 	$(do_rm) $(addprefix $(MISC_ELF_OUT)/*., o os oS)
--- a/libc/misc/error/Makefile.in
+++ b/libc/misc/error/Makefile.in
@ -23,7 +23,7 @@ MISC_ERROR_OBJ := $(patsubst %.c,$(MISC_ERROR_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_ERROR_OBJ)

-objclean-y += misc_error_clean
+objclean-y += CLEAN_libc/misc/error

-misc_error_clean:
+CLEAN_libc/misc/error:
 	$(do_rm) $(addprefix $(MISC_ERROR_OUT)/*., o os)
--- a/libc/misc/file/Makefile.in
+++ b/libc/misc/file/Makefile.in
@ -20,7 +20,7 @@ libc-y += $(MISC_FILE_OBJ)

 libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_FILE_OUT)/lockf64.o

-objclean-y += misc_file_clean
+objclean-y += CLEAN_libc/misc/file

-misc_file_clean:
+CLEAN_libc/misc/file:
 	$(do_rm) $(addprefix $(MISC_FILE_OUT)/*., o os oS)
--- a/libc/misc/fnmatch/Makefile.in
+++ b/libc/misc/fnmatch/Makefile.in
@ -21,7 +21,7 @@ MISC_FNMATCH_OBJ := $(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC))

 libc-$(UCLIBC_HAS_FNMATCH) += $(MISC_FNMATCH_OBJ)

-objclean-y += misc_fnmatch_clean
+objclean-y += CLEAN_libc/misc/fnmatch

-misc_fnmatch_clean:
+CLEAN_libc/misc/fnmatch:
 	$(do_rm) $(addprefix $(MISC_FNMATCH_OUT)/*., o os)
--- a/libc/misc/ftw/Makefile.in
+++ b/libc/misc/ftw/Makefile.in
@ -20,7 +20,7 @@ MISC_FTW_OBJ := $(patsubst %.c,$(MISC_FTW_OUT)/%.o,$(CSRC))

 libc-$(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW)) += $(MISC_FTW_OBJ)

-objclean-y += misc_ftw_clean
+objclean-y += CLEAN_libc/misc/ftw

-misc_ftw_clean:
+CLEAN_libc/misc/ftw:
 	$(do_rm) $(addprefix $(MISC_FTW_OUT)/*., o os)
--- a/libc/misc/glob/Makefile.in
+++ b/libc/misc/glob/Makefile.in
@ -27,7 +27,7 @@ MISC_GLOB_OBJ := $(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC))

 libc-$(UCLIBC_HAS_GLOB) += $(MISC_GLOB_OBJ)

-objclean-y += misc_glob_clean
+objclean-y += CLEAN_libc/misc/glob

-misc_glob_clean:
+CLEAN_libc/misc/glob:
 	$(do_rm) $(addprefix $(MISC_GLOB_OUT)/*., o os)
--- a/libc/misc/gnu/Makefile.in
+++ b/libc/misc/gnu/Makefile.in
@ -17,7 +17,7 @@ MISC_GNU_OBJ := $(MISC_GNU_OUT)/obstack.o

 libc-y += $(MISC_GNU_OBJ)

-objclean-y += misc_gnu_clean
+objclean-y += CLEAN_libc/misc/gnu

-misc_gnu_clean:
+CLEAN_libc/misc/gnu:
 	$(do_rm) $(addprefix $(MISC_GNU_OUT)/*., o os)
--- a/libc/misc/internals/Makefile.in
+++ b/libc/misc/internals/Makefile.in
@ -35,7 +35,7 @@ libc-shared-$(UCLIBC_FORMAT_SHARED_FLAT) += \
  $(MISC_INTERNALS_OUT)/shared_flat_add_library.os
 libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o

-objclean-y += misc_internals_clean
+objclean-y += CLEAN_libc/misc/internals

-misc_internals_clean:
+CLEAN_libc/misc/internals:
 	$(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS)
--- a/libc/misc/locale/Makefile.in
+++ b/libc/misc/locale/Makefile.in
@ -24,7 +24,7 @@ MISC_LOCALE_OBJ := $(patsubst %.c,$(MISC_LOCALE_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_LOCALE_OBJ)

-objclean-y += misc_locale_clean
+objclean-y += CLEAN_libc/misc/locale

-misc_locale_clean:
+CLEAN_libc/misc/locale:
 	$(do_rm) $(addprefix $(MISC_LOCALE_OUT)/*., o os)
--- a/libc/misc/mntent/Makefile.in
+++ b/libc/misc/mntent/Makefile.in
@ -17,7 +17,7 @@ MISC_MNTENT_OBJ := $(MISC_MNTENT_OUT)/mntent.o

 libc-y += $(MISC_MNTENT_OBJ)

-objclean-y += misc_mntent_clean
+objclean-y += CLEAN_libc/misc/mntent

-misc_mntent_clean:
+CLEAN_libc/misc/mntent:
 	$(do_rm) $(addprefix $(MISC_MNTENT_OUT)/*., o os)
--- a/libc/misc/pthread/Makefile.in
+++ b/libc/misc/pthread/Makefile.in
@ -13,7 +13,7 @@ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
 libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/unlock.o
 libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o

-objclean-y += misc_pthread_clean
+objclean-y += CLEAN_libc/misc/pthread

-misc_pthread_clean:
+CLEAN_libc/misc/pthread:
 	$(do_rm) $(addprefix $(MISC_PTHREAD_OUT)/*., o os oS)
--- a/libc/misc/regex/Makefile.in
+++ b/libc/misc/regex/Makefile.in
@ -21,7 +21,7 @@ MISC_REGEX_OBJ := $(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC))

 libc-$(UCLIBC_HAS_REGEX) += $(MISC_REGEX_OBJ)

-objclean-y += misc_regex_clean
+objclean-y += CLEAN_libc/misc/regex

-misc_regex_clean:
+CLEAN_libc/misc/regex:
 	$(do_rm) $(addprefix $(MISC_REGEX_OUT)/*., o os)
--- a/libc/misc/search/Makefile.in
+++ b/libc/misc/search/Makefile.in
@ -29,7 +29,7 @@ MISC_SEARCH_OBJ := $(patsubst %.c,$(MISC_SEARCH_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_SEARCH_OBJ)

-objclean-y += misc_search_clean
+objclean-y += CLEAN_libc/misc/search

-misc_search_clean:
+CLEAN_libc/misc/search:
 	$(do_rm) $(addprefix $(MISC_SEARCH_OUT)/*., o os)
--- a/libc/misc/statfs/Makefile.in
+++ b/libc/misc/statfs/Makefile.in
@ -25,7 +25,7 @@ libc-y += $(MISC_STATFS_OBJ)

 libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_STATFS_OUT)/statvfs64.o $(MISC_STATFS_OUT)/fstatvfs64.o

-objclean-y += misc_statfs_clean
+objclean-y += CLEAN_libc/misc/statfs

-misc_statfs_clean:
+CLEAN_libc/misc/statfs:
 	$(do_rm) $(addprefix $(MISC_STATFS_OUT)/*., o os oS)
--- a/libc/misc/syslog/Makefile.in
+++ b/libc/misc/syslog/Makefile.in
@ -19,7 +19,7 @@ ifeq ($(UCLIBC_HAS_SYSLOG),y)
 libc-y += $(MISC_SYSLOG_OBJ)
 endif

-objclean-y += misc_syslog_clean
+objclean-y += CLEAN_libc/misc/syslog

-misc_syslog_clean:
+CLEAN_libc/misc/syslog:
 	$(do_rm) $(addprefix $(MISC_SYSLOG_OUT)/*., o os)
--- a/libc/misc/sysvipc/Makefile.in
+++ b/libc/misc/sysvipc/Makefile.in
@ -26,7 +26,7 @@ MISC_SYSVIPC_OBJ := $(patsubst %.c,$(MISC_SYSVIPC_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_SYSVIPC_OBJ)

-objclean-y += misc_sysvipc_clean
+objclean-y += CLEAN_libc/misc/sysvipc

-misc_sysvipc_clean:
+CLEAN_libc/misc/sysvipc:
 	$(do_rm) $(addprefix $(MISC_SYSVIPC_OUT)/*., o os)
--- a/libc/misc/time/Makefile.in
+++ b/libc/misc/time/Makefile.in
@ -37,7 +37,7 @@ MISC_TIME_OBJ := $(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_TIME_OBJ)

-objclean-y += misc_time_clean
+objclean-y += CLEAN_libc/misc/time

-misc_time_clean:
+CLEAN_libc/misc/time:
 	$(do_rm) $(addprefix $(MISC_TIME_OUT)/*., o os)
--- a/libc/misc/ttyent/Makefile.in
+++ b/libc/misc/ttyent/Makefile.in
@ -17,7 +17,7 @@ MISC_TTYENT_OBJ := $(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_TTYENT_OBJ)

-objclean-y += misc_ttyent_clean
+objclean-y += CLEAN_libc/misc/ttyent

-misc_ttyent_clean:
+CLEAN_libc/misc/ttyent:
 	$(do_rm) $(addprefix $(MISC_TTYENT_OUT)/*., o os)
--- a/libc/misc/utmp/Makefile.in
+++ b/libc/misc/utmp/Makefile.in
@ -17,7 +17,7 @@ MISC_UTMP_OBJ := $(patsubst %.c,$(MISC_UTMP_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_UTMP_OBJ)

-objclean-y += misc_utmp_clean
+objclean-y += CLEAN_libc/misc/utmp

-misc_utmp_clean:
+CLEAN_libc/misc/utmp:
 	$(do_rm) $(addprefix $(MISC_UTMP_OUT)/*., o os)
--- a/libc/misc/wchar/Makefile.in
+++ b/libc/misc/wchar/Makefile.in
@ -35,7 +35,7 @@ MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC))

 libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ)

-objclean-y += misc_wchar_clean
+objclean-y += CLEAN_libc/misc/wchar

-misc_wchar_clean:
+CLEAN_libc/misc/wchar:
 	$(do_rm) $(addprefix $(MISC_WCHAR_OUT)/*., o os)
--- a/libc/misc/wctype/Makefile.in
+++ b/libc/misc/wctype/Makefile.in
@ -30,7 +30,7 @@ MISC_WCTYPE_OBJ := $(patsubst %.c,$(MISC_WCTYPE_OUT)/%.o,$(CSRC))

 libc-y += $(MISC_WCTYPE_OBJ)

-objclean-y += misc_wctype_clean
+objclean-y += CLEAN_libc/misc/wctype

-misc_wctype_clean:
+CLEAN_libc/misc/wctype:
 	$(do_rm) $(addprefix $(MISC_WCTYPE_OUT)/*., o os)
--- a/libc/misc/wordexp/Makefile.in
+++ b/libc/misc/wordexp/Makefile.in
@ -17,7 +17,7 @@ MISC_WORDEXP_OBJ := $(patsubst %.c,$(MISC_WORDEXP_OUT)/%.o,$(CSRC))

 libc-$(UCLIBC_HAS_WORDEXP) += $(MISC_WORDEXP_OBJ)

-objclean-y += misc_wordexp_clean
+objclean-y += CLEAN_libc/misc/wordexp

-misc_wordexp_clean:
+CLEAN_libc/misc/wordexp:
 	$(do_rm) $(addprefix $(MISC_WORDEXP_OUT)/*., o os)
--- a/libc/pwd_grp/Makefile.in
+++ b/libc/pwd_grp/Makefile.in
@ -27,7 +27,7 @@ PWDGRP_OBJ := $(patsubst %.c,$(PWDGRP_OUT)/%.o,$(CSRC))

 libc-y += $(PWDGRP_OBJ)

-objclean-y += pwdgrp_clean
+objclean-y += CLEAN_libc/pwd_grp

-pwdgrp_clean:
+CLEAN_libc/pwd_grp:
 	$(do_rm) $(addprefix $(PWDGRP_OUT)/*., o os)
--- a/libc/signal/Makefile.in
+++ b/libc/signal/Makefile.in
@ -28,7 +28,7 @@ SIGNAL_OBJ := $(patsubst %.c,$(SIGNAL_OUT)/%.o,$(CSRC-y))

 libc-y += $(SIGNAL_OBJ)

-objclean-y += signal_clean
+objclean-y += CLEAN_libc/signal

-signal_clean:
+CLEAN_libc/signal:
 	$(do_rm) $(addprefix $(SIGNAL_OUT)/*., o os)
--- a/libc/stdio/Makefile.in
+++ b/libc/stdio/Makefile.in
@ -103,7 +103,7 @@ ifeq ($(UCLIBC_HAS_WCHAR),y)
 libc-nomulti-y += $(STDIO_OUT)/vfwprintf.o $(STDIO_OUT)/vfwscanf.o
 endif

-objclean-y += stdio_clean
+objclean-y += CLEAN_libc/stdio

-stdio_clean:
+CLEAN_libc/stdio:
 	$(do_rm) $(addprefix $(STDIO_OUT)/*., o os oS)
--- a/libc/stdlib/Makefile.in
+++ b/libc/stdlib/Makefile.in
@ -72,7 +72,7 @@ libc-nonshared-y += $(STDLIB_OUT)/atexit.os
 libc-nomulti-y += $(STDLIB_OUT)/labs.o $(STDLIB_OUT)/atol.o $(STDLIB_OUT)/_stdlib_strto_l.o $(STDLIB_OUT)/_stdlib_strto_ll.o
 libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STDLIB_OUT)/_stdlib_strto_l_l.o $(STDLIB_OUT)/_stdlib_strto_ll_l.o

-objclean-y += stdlib_clean
+objclean-y += CLEAN_libc/stdlib

-stdlib_clean:
+CLEAN_libc/stdlib:
 	$(do_rm) $(addprefix $(STDLIB_OUT)/*., o os oS)
--- a/libc/stdlib/malloc-simple/Makefile.in
+++ b/libc/stdlib/malloc-simple/Makefile.in
@ -18,7 +18,7 @@ STDLIB_MALLOC_SIMPLE_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_SIMPLE_OUT)/%.o,$(CSR

 libc-$(MALLOC_SIMPLE) += $(STDLIB_MALLOC_SIMPLE_OBJ)

-objclean-y += stdlib_malloc_simple_clean
+objclean-y += CLEAN_libc/stdlib/malloc-simple

-stdlib_malloc_simple_clean:
+CLEAN_libc/stdlib/malloc-simple:
 	$(do_rm) $(addprefix $(STDLIB_MALLOC_SIMPLE_OUT)/*., o os)
--- a/libc/stdlib/malloc-standard/Makefile.in
+++ b/libc/stdlib/malloc-standard/Makefile.in
@ -19,7 +19,7 @@ STDLIB_MALLOC_STANDARD_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_STANDARD_OUT)/%.o,$

 libc-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ)

-objclean-y += stdlib_malloc_standard_clean
+objclean-y += CLEAN_libc/stdlib/malloc-standard

-stdlib_malloc_standard_clean:
+CLEAN_libc/stdlib/malloc-standard:
 	$(do_rm) $(addprefix $(STDLIB_MALLOC_STANDARD_OUT)/*., o os)
--- a/libc/stdlib/malloc/Makefile.in
+++ b/libc/stdlib/malloc/Makefile.in
@ -29,9 +29,9 @@ STDLIB_MALLOC_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC))

 libc-$(MALLOC) += $(STDLIB_MALLOC_OBJ)

-objclean-y += stdlib_malloc_clean
+objclean-y += CLEAN_libc/stdlib/malloc

-stdlib_malloc_clean:
+CLEAN_libc/stdlib/malloc:
 	$(do_rm) $(addprefix $(STDLIB_MALLOC_OUT)/*., o os)

 malloc.o free.o realloc.o memalign.o: malloc.h
--- a/libc/string/Makefile.in
+++ b/libc/string/Makefile.in
@ -135,7 +135,7 @@ libc-y += $(STRING_COBJ)
 libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STRING_OUT)/wcsxfrm_l.o
 libc-nomulti-y += $(STRING_OUT)/__xpg_strerror_r.o

-objclean-y += string_clean
+objclean-y += CLEAN_libc/string

-string_clean:
+CLEAN_libc/string:
 	$(do_rm) $(addprefix $(STRING_OUT)/,$(addprefix *., o os oS) $(addprefix */*., o os oS) $(addprefix */*/*., o os oS))
--- a/libc/sysdeps/linux/Makefile.commonarch
+++ b/libc/sysdeps/linux/Makefile.commonarch
@ -18,12 +18,12 @@ ARCH_OBJS := $(ARCH_COBJ) $(ARCH_SOBJ)
 crt-y          := FORCE
 libc-y         += $(ARCH_OBJS)
 libc-nomulti-y += $(ARCH_SOBJ)
-objclean-y     += arch_clean
+objclean-y     += CLEAN_$(subst $(top_builddir),,$(ARCH_OUT))

 CFLAGS-crti.S+=$(PICFLAG)
 CFLAGS-crtn.S+=$(PICFLAG)

-arch_clean:
+CLEAN_$(subst $(top_builddir),,$(ARCH_OUT)):
 	$(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS)

 ifneq ($(ARCH_HEADERS),)
@ -34,8 +34,8 @@ $(ARCH_HEADERS_OUT):
 	$(do_ln) -fs $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) $@

 headers-y += $(ARCH_HEADERS_OUT)
-headers_clean-y += arch_headers_clean
-arch_headers_clean:
+headers_clean-y += HEADERCLEAN_$(subst $(top_builddir),,$(ARCH_OUT))
+HEADERCLEAN_$(subst $(top_builddir),,$(ARCH_OUT)):
 	$(RM) $(ARCH_HEADERS_OUT)

 endif
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@ -96,7 +96,7 @@ libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o \
 	$(COMMON_OUT)/stat.o
 libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o

-objclean-y += common_clean
+objclean-y += CLEAN_libc/sysdeps/linux/common

-common_clean:
+CLEAN_libc/sysdeps/linux/common:
 	$(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS)
--- a/libc/termios/Makefile.in
+++ b/libc/termios/Makefile.in
@ -15,7 +15,7 @@ TERMIOS_OBJ := $(patsubst $(TERMIOS_DIR)/%.c,$(TERMIOS_OUT)/%.o,$(TERMIOS_SRC))

 libc-y += $(TERMIOS_OBJ)

-objclean-y += termios_clean
+objclean-y += CLEAN_libc/termios

-termios_clean:
+CLEAN_libc/termios:
 	$(do_rm) $(addprefix $(TERMIOS_OUT)/*., o os)
--- a/libc/unistd/Makefile.in
+++ b/libc/unistd/Makefile.in
@ -46,7 +46,7 @@ UNISTD_OBJ := $(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC))

 libc-y += $(UNISTD_OBJ)

-objclean-y += unistd_clean
+objclean-y += CLEAN_libc/unistd

-unistd_clean:
+CLEAN_libc/unistd:
 	$(do_rm) $(addprefix $(UNISTD_OUT)/*., o os)
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@ -34,7 +34,7 @@ libcrypt-so-y := $(libcrypt_OBJ:.o=.os)

 lib-a-$(UCLIBC_HAS_CRYPT)  += $(top_builddir)lib/libcrypt.a
 lib-so-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.so
-objclean-y += libcrypt_clean
+objclean-y += CLEAN_libcrypt

 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@ -61,5 +61,5 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-libcrypt_clean:
+CLEAN_libcrypt:
 	$(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a)
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@ -39,7 +39,7 @@ libintl-so-y := $(libintl_MOBJ:.o=.os)

 lib-a-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.a
 lib-so-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.so
-objclean-y += libintl_clean
+objclean-y += CLEAN_libintl

 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@ -72,5 +72,5 @@ $(libintl_MOBJ): $(libintl_MSRC)
 $(libintl_MOBJ:.o=.os): $(libintl_MSRC)
 	$(compile.m)

-libintl_clean:
+CLEAN_libintl:
 	$(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a)
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@ -270,7 +270,7 @@ libm-so-y += $(libm_OBJS:.o=.os)

 lib-a-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.a
 lib-so-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.so
-objclean-y += libm_clean
+objclean-y += CLEAN_libm

 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@ -316,5 +316,5 @@ $(libm_MOBJ_FL:.o=.i): $(libm_MSRC_FL)
 $(libm_MOBJ_LD:.o=.i): $(libm_MSRC_LD)
 	$(compile.mi)

-libm_clean:
+CLEAN_libm:
 	$(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e))))
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@ -30,7 +30,7 @@ libnsl-so-y := $(libnsl_OBJ:.o=.os)

 lib-a-$(UCLIBC_HAS_LIBNSL_STUB) += $(top_builddir)lib/libnsl.a
 lib-so-$(UCLIBC_HAS_LIBNSL_STUB) += $(top_builddir)lib/libnsl.so
-objclean-y += libnsl_clean
+objclean-y += CLEAN_libnsl

 ifeq ($(DOPIC),y)
 $(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc.depend)
@ -48,5 +48,5 @@ $(top_builddir)lib/libnsl.a: $(libnsl-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-libnsl_clean:
+CLEAN_libnsl:
 	$(do_rm) $(addprefix $(libnsl_OUT)/*., o os a)
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@ -117,10 +117,10 @@ linuxthreads_headers := $(top_builddir)include/pthread.h \
 $(linuxthreads_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h))
 headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers)

-objclean-y += libpthread_clean
-headers_clean-y += linuxthreads_headers_clean
-linuxthreads_headers_clean:
+objclean-y += CLEAN_libpthread/linuxthreads.old
+headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old
+HEADERCLEAN_libpthread/linuxthreads.old:
 	$(do_rm) $(linuxthreads_headers)

-libpthread_clean:
+CLEAN_libpthread/linuxthreads.old:
 	$(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a)
--- a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
+++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
@ -17,7 +17,7 @@ libpthread-so-y+=$(libpthread_ARCH_OBJ:.o=.os)

 libpthread-multi-y+=$(libpthread_ARCH_SRC)

-objclean-y+=libpthread_arch_clean
+objclean-y += CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT))

 # We need to build as SHcompact for tas..
 $(libpthread_ARCH_OBJ): %.o : %.c
@ -26,5 +26,5 @@ $(libpthread_ARCH_OBJ): %.o : %.c
 $(libpthread_ARCH_OBJ:.o=.os): %.os : %.c
 	$(compile.c:32media=compact)

-libpthread_arch_clean:
+CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT)):
 	$(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os)
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@ -68,11 +68,11 @@ linuxthreads_db_headers := $(top_builddir)include/thread_db.h
 $(linuxthreads_db_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h))
 headers-$(PTHREADS_DEBUG_SUPPORT) += $(linuxthreads_db_headers)

-objclean-y += libthread_db_clean
-headers_clean-y += linuxthreads_db_headers_clean
+objclean-y += CLEAN_libpthread/linuxthreads.old_db
+headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old_db

-linuxthreads_db_headers_clean:
+HEADERCLEAN_libpthread/linuxthreads.old_db:
 	$(do_rm) $(linuxthreads_db_headers)

-libthread_db_clean:
+CLEAN_libpthread/linuxthreads.old_db:
 	$(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a)
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@ -132,10 +132,10 @@ linuxthreads_headers := $(top_builddir)include/pthread.h \
 $(linuxthreads_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h))
 headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers)

-objclean-y += libpthread_clean
-headers_clean-y += linuxthreads_headers_clean
-linuxthreads_headers_clean:
+objclean-y += CLEAN_libpthread/linuxthreads
+headers_clean-y += HEADERCLEAN_libpthread/linuxthreads
+HEADERCLEAN_libpthread/linuxthreads:
 	$(do_rm) $(linuxthreads_headers)

-libpthread_clean:
+CLEAN_libpthread/linuxthreads:
 	$(do_rm) $(addprefix $(libpthread_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*. */*/*/*.,$(d)$(e))))
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@ -68,11 +68,11 @@ linuxthreads_db_headers := $(top_builddir)include/thread_db.h
 $(linuxthreads_db_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h))
 headers-$(PTHREADS_DEBUG_SUPPORT) += $(linuxthreads_db_headers)

-objclean-y += libthread_db_clean
-headers_clean-y += linuxthreads_db_headers_clean
+objclean-y += CLEAN_libpthread/linuxthreads_db
+headers_clean-y += HEADERCLEAN_libpthread/linuxthreads_db

-linuxthreads_db_headers_clean:
+HEADERCLEAN_libpthread/linuxthreads_db:
 	$(do_rm) $(linuxthreads_db_headers)

-libthread_db_clean:
+CLEAN_libpthread/linuxthreads_db:
 	$(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a)
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@ -30,7 +30,7 @@ libresolv-so-y := $(libresolv_OBJ:.o=.os)

 lib-a-$(UCLIBC_HAS_LIBRESOLV_STUB)  += $(top_builddir)lib/libresolv.a
 lib-so-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(top_builddir)lib/libresolv.so
-objclean-y += libresolv_clean
+objclean-y += CLEAN_libresolv

 ifeq ($(DOPIC),y)
 $(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc.depend)
@ -48,5 +48,5 @@ $(top_builddir)lib/libresolv.a: $(libresolv-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-libresolv_clean:
+CLEAN_libresolv:
 	$(do_rm) $(addprefix $(libresolv_OUT)/*., o os a)
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@ -49,7 +49,7 @@ $(top_builddir)lib/librt.a: $(librt-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-objclean-y += librt_clean
+objclean-y += CLEAN_librt

-librt_clean:
+CLEAN_librt:
 	$(do_rm) $(addprefix $(librt_OUT)/*., o os oS a)
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@ -37,7 +37,7 @@ libutil-so-y := $(libutil_OBJ:.o=.os)

 lib-a-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.a
 lib-so-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.so
-objclean-y += libutil_clean
+objclean-y += CLEAN_libutil

 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@ -64,5 +64,5 @@ $(top_builddir)lib/libutil.a: $(libutil-a-y)
 	$(Q)$(RM) $@
 	$(do_ar)

-libutil_clean:
+CLEAN_libutil:
 	$(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@ -125,9 +125,9 @@ ifeq ($(UCLIBC_HAS_LOCALE),y)
 endif


-objclean-y += utils_clean
+objclean-y += CLEAN_utils

-utils_clean:
+CLEAN_utils:
 	$(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd iconv locale *.host)
 	# This is a hack..
 	$(Q)$(RM) $(utils_OUT)/.*.dep