summaryrefslogtreecommitdiff
path: root/libutil
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 /libutil
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 'libutil')
-rw-r--r--libutil/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index b0182015c..d45760296 100644
--- 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)