diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
| commit | aae3eb9256affb18cff589b52ee26e0a4e557bbd (patch) | |
| tree | 003711a54e7dfbde0b50979e2942fd3e0d3451c8 /libcrypt | |
| parent | ef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff) | |
| parent | 2864786ad884369ab5397be864e9f43d32bc2726 (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 'libcrypt')
| -rw-r--r-- | libcrypt/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index cb1c5d326..964c74f2e 100644 --- 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) |