svn commit: branches/uClibc-nptl/libc/string

[carmelo at uclibc.org]

Author: carmelo
Date: 2008-06-19 00:24:43 -0700 (Thu, 19 Jun 2008)
New Revision: 22447

Log:
Filter-out _memcpy_fwd.c and fix clean target to remove objects into deeper folder

Modified:
   branches/uClibc-nptl/libc/string/Makefile.in


Changeset:
Modified: branches/uClibc-nptl/libc/string/Makefile.in
===================================================================
--- branches/uClibc-nptl/libc/string/Makefile.in	2008-06-19 07:23:49 UTC (rev 22446)
+++ branches/uClibc-nptl/libc/string/Makefile.in	2008-06-19 07:24:43 UTC (rev 22447)
@@ -34,6 +34,7 @@
 endif
 
 STRING_ARCH_SOBJ := $(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC))
+
 STRING_ARCH_OBJS := $(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ)
 
 libc-$(UCLIBC_HAS_STRING_ARCH_OPT) += $(STRING_ARCH_OBJS) $(STRING_SUBARCH_OBJS)
@@ -47,6 +48,7 @@
 STRING_GENERIC_OUT := $(top_builddir)libc/string/generic
 
 STRING_GENERIC_SRC := $(wildcard $(STRING_GENERIC_DIR)/*.c)
+STRING_GENERIC_SRC := $(filter-out $(STRING_GENERIC_DIR)/_memcpy_fwd.c, $(STRING_GENERIC_SRC)) 
 
 ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
 ifneq ($(strip $(STRING_ARCH_OBJS)),)
@@ -129,8 +131,9 @@
 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_objclean
 
 string_objclean:
-	$(RM) $(STRING_OUT)/{,*/}*.{o,os}
+	$(RM) $(STRING_OUT)/{,*/}{,*/}*.{o,os,oS}