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