summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-02 09:17:30 -0700
commitaae3eb9256affb18cff589b52ee26e0a4e557bbd (patch)
tree003711a54e7dfbde0b50979e2942fd3e0d3451c8 /utils
parentef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff)
parent2864786ad884369ab5397be864e9f43d32bc2726 (diff)
Merge commit 'origin/master' into nptl
Conflicts: Makefile.in extra/Configs/Config.in libc/sysdeps/linux/common/bits/kernel-features.h libc/sysdeps/linux/common/poll.c libc/sysdeps/linux/common/sysdep.h libc/sysdeps/linux/sh/sysdep.h Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/Makefile.in b/utils/Makefile.in
index c2466542c..2aae1df71 100644
--- 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)# This is a hack..
$(Q)$(RM) $(utils_OUT)/.*.dep