svn commit: trunk/uClibc/libc: misc/ctype misc/locale misc/time misc/wc etc...

psm at uclibc.org psm at uclibc.org
Fri Nov 4 22:22:34 UTC 2005


Author: psm
Date: 2005-11-04 14:22:31 -0800 (Fri, 04 Nov 2005)
New Revision: 12153

Log:
Correct XLOCALE enabled builds pointed out by nitinkg

Modified:
   trunk/uClibc/libc/misc/ctype/Makefile.in
   trunk/uClibc/libc/misc/locale/Makefile.in
   trunk/uClibc/libc/misc/time/Makefile.in
   trunk/uClibc/libc/misc/wctype/Makefile.in
   trunk/uClibc/libc/string/Makefile.in


Changeset:
Modified: trunk/uClibc/libc/misc/ctype/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/ctype/Makefile.in	2005-11-04 20:45:54 UTC (rev 12152)
+++ trunk/uClibc/libc/misc/ctype/Makefile.in	2005-11-04 22:22:31 UTC (rev 12153)
@@ -18,7 +18,7 @@
 	__ctype_assert.o isctype.o
 endif
 
-MOBJx=	isalnum_l.o isalpha_l.o isascii_l.o iscntrl_l.o isdigit_l.o \
+MOBJx:=	isalnum_l.o isalpha_l.o isascii_l.o iscntrl_l.o isdigit_l.o \
 	isgraph_l.o islower_l.o isprint_l.o ispunct_l.o isspace_l.o \
 	isupper_l.o isxdigit_l.o toascii_l.o tolower_l.o toupper_l.o \
 	isblank_l.o # isxlower_l.o isxupper_l.o
@@ -28,7 +28,7 @@
 
 MISC_CTYPE_MSRC:=$(MISC_CTYPE_DIR)/$(MSRC)
 MISC_CTYPE_MOBJ:=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJ))
-MISC_CTYPE_MOBJx=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJx))
+MISC_CTYPE_MOBJx:=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJx))
 
 MISC_CTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_CTYPE_MOBJ))))
 

Modified: trunk/uClibc/libc/misc/locale/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/locale/Makefile.in	2005-11-04 20:45:54 UTC (rev 12152)
+++ trunk/uClibc/libc/misc/locale/Makefile.in	2005-11-04 22:22:31 UTC (rev 12153)
@@ -8,17 +8,17 @@
 
 MSRC:=locale.c
 MOBJ:=setlocale.o localeconv.o _locale_init.o nl_langinfo.o
-MOBJx=
+MOBJx:=
 
 ifeq ($(UCLIBC_HAS_LOCALE),y)
 MOBJ+=newlocale.o __locale_mbrtowc_l.o
 endif
 
 ifeq ($(UCLIBC_HAS_XLOCALE),y)
-MOBJx+=nl_langinfo_l.o duplocale.o freelocale.o uselocale.o __curlocale.o
+MOBJx:=nl_langinfo_l.o duplocale.o freelocale.o uselocale.o __curlocale.o
 endif
 
-DATA=
+DATA:=
 ifeq ($(UCLIBC_HAS_LOCALE),y)
 DATA:=locale_data.o
 endif
@@ -30,8 +30,8 @@
 
 MISC_LOCALE_MSRC:=$(MISC_LOCALE_DIR)/$(MSRC)
 MISC_LOCALE_MOBJ:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJ))
-MISC_LOCALE_MOBJx=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJx))
-MISC_LOCALE_DATA=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(DATA))
+MISC_LOCALE_MOBJx:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJx))
+MISC_LOCALE_DATA:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(DATA))
 
 MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_LOCALE_NO_MULTI),$(notdir $(MISC_LOCALE_MOBJ)))))
 

Modified: trunk/uClibc/libc/misc/time/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/time/Makefile.in	2005-11-04 20:45:54 UTC (rev 12152)
+++ trunk/uClibc/libc/misc/time/Makefile.in	2005-11-04 22:22:31 UTC (rev 12153)
@@ -11,13 +11,13 @@
 	localtime.o localtime_r.o mktime.o strftime.o strptime.o tzset.o \
 	_time_t2tm.o __time_tm.o _time_mktime.o dysize.o timegm.o \
 	_time_mktime_tzi.o _time_localtime_tzi.o
-MOBJx=
+MOBJx:=
 
 ifeq ($(UCLIBC_HAS_FLOATS),y)
 MOBJ+=difftime.o 
 endif
 ifeq ($(UCLIBC_HAS_XLOCALE),y)
-MOBJx+=strftime_l.o strptime_l.o
+MOBJx:=strftime_l.o strptime_l.o
 endif
 
 ifeq ($(UCLIBC_HAS_WCHAR),y)
@@ -39,7 +39,7 @@
 
 MISC_TIME_MSRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(MSRC))
 MISC_TIME_MOBJ:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJ))
-MISC_TIME_MOBJx=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJx))
+MISC_TIME_MOBJx:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJx))
 
 MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_TIME_NO_MULTI),$(notdir $(MISC_TIME_MOBJ)))))
 

Modified: trunk/uClibc/libc/misc/wctype/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/wctype/Makefile.in	2005-11-04 20:45:54 UTC (rev 12152)
+++ trunk/uClibc/libc/misc/wctype/Makefile.in	2005-11-04 22:22:31 UTC (rev 12153)
@@ -12,7 +12,7 @@
 	iswxdigit.o iswblank.o wctrans.o towctrans.o \
 	wctype.o iswctype.o towlower.o towupper.o
 
-MOBJx=	iswalnum_l.o iswalpha_l.o iswcntrl_l.o iswdigit_l.o iswgraph_l.o \
+MOBJx:=	iswalnum_l.o iswalpha_l.o iswcntrl_l.o iswdigit_l.o iswgraph_l.o \
 	iswlower_l.o iswprint_l.o iswpunct_l.o iswspace_l.o iswupper_l.o \
 	iswxdigit_l.o iswblank_l.o \
 	wctype_l.o iswctype_l.o wctrans_l.o towctrans_l.o towlower_l.o towupper_l.o
@@ -22,7 +22,7 @@
 
 MISC_WCTYPE_MSRC:=$(MISC_WCTYPE_DIR)/$(MSRC)
 MISC_WCTYPE_MOBJ:=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJ))
-MISC_WCTYPE_MOBJx=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJx))
+MISC_WCTYPE_MOBJx:=$(patsubst %.o,$(MISC_WCTYPE_OUT)/%.o,$(MOBJx))
 
 MISC_WCTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCTYPE_MOBJ))))
 

Modified: trunk/uClibc/libc/string/Makefile.in
===================================================================
--- trunk/uClibc/libc/string/Makefile.in	2005-11-04 20:45:54 UTC (rev 12152)
+++ trunk/uClibc/libc/string/Makefile.in	2005-11-04 22:22:31 UTC (rev 12153)
@@ -20,9 +20,9 @@
 	_string_syssigmsgs.o sys_siglist.o strsignal.o psignal.o \
 	 __xpg_basename.o strlcat.o strlcpy.o sys_errlist.o memmem.o
 
-MOBJW=
+MOBJW:=
 ifeq ($(UCLIBC_HAS_WCHAR),y)
-MOBJW=	wcscasecmp.o wcscat.o wcschrnul.o wcschr.o wcscmp.o wcscpy.o wcscspn.o \
+MOBJW:=	wcscasecmp.o wcscat.o wcschrnul.o wcschr.o wcscmp.o wcscpy.o wcscspn.o \
 	wcsdup.o wcslen.o wcsncasecmp.o wcsncat.o wcsncmp.o wcsncpy.o \
 	wcsnlen.o wcspbrk.o wcsrchr.o wcsspn.o wcsstr.o wcstok.o wmemchr.o \
 	wmemcmp.o wmemcpy.o wmemmove.o wmempcpy.o wmemset.o wcpcpy.o wcpncpy.o \
@@ -30,12 +30,12 @@
 	wcsxfrm.o strxfrm.o # wcscoll strcoll.o
 endif
 
-MOBJx=
-MOBJWx=
+MOBJx:=
+MOBJWx:=
 ifeq ($(UCLIBC_HAS_XLOCALE),y)
-MOBJx+=strcasecmp_l.o strncasecmp_l.o
+MOBJx:=strcasecmp_l.o strncasecmp_l.o
 ifeq ($(UCLIBC_HAS_WCHAR),y)
-MOBJWx+=wcscasecmp_l.o wcsncasecmp_l.o wcsxfrm_l.o strxfrm_l.o
+MOBJWx:=wcscasecmp_l.o wcsncasecmp_l.o wcsxfrm_l.o strxfrm_l.o
 endif
 endif
 
@@ -58,13 +58,13 @@
 
 STRING_MSRC:=$(patsubst %.c,$(STRING_DIR)/%.c,$(MSRC))
 STRING_MOBJ:=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJ))
-STRING_MOBJW=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJW))
-STRING_MOBJx=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJx))
-STRING_MOBJWx=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJWx))
+STRING_MOBJW:=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJW))
+STRING_MOBJx:=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJx))
+STRING_MOBJWx:=$(patsubst %.o,$(STRING_OUT)/%.o,$(MOBJWx))
 
 #STRING_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_MOBJ))))
 
-STRING_Wx=$(STRING_MOBJW) $(STRING_MOBJx) $(STRING_MOBJWx)
+STRING_Wx:=$(STRING_MOBJW) $(STRING_MOBJx) $(STRING_MOBJWx)
 STRING_OBJS:=$(STRING_MOBJ) $(STRING_Wx)
 
 $(STRING_MOBJ): $(STRING_MSRC)




More information about the uClibc-cvs mailing list