summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-04 22:22:31 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-04 22:22:31 +0000
commit4373aca4722ac410e983728e5a961859d5ca7f4f (patch)
tree5d09d84fd36f4a340a6370bdd5d7e8cdfe5a5b2d
parente050c1a78ae6d5edb1c0f6d23c72687dd1513a60 (diff)
Correct XLOCALE enabled builds pointed out by nitinkg
-rw-r--r--libc/misc/ctype/Makefile.in4
-rw-r--r--libc/misc/locale/Makefile.in10
-rw-r--r--libc/misc/time/Makefile.in6
-rw-r--r--libc/misc/wctype/Makefile.in4
-rw-r--r--libc/string/Makefile.in20
5 files changed, 22 insertions, 22 deletions
diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in
index 0999d8334..0e194cbff 100644
--- a/libc/misc/ctype/Makefile.in
+++ b/libc/misc/ctype/Makefile.in
@@ -18,7 +18,7 @@ MOBJ+= __C_ctype_b.o __C_ctype_tolower.o __C_ctype_toupper.o \
__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_OUT:=$(top_builddir)libc/misc/ctype
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))))
diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in
index 5f363ac65..9d0074521 100644
--- a/libc/misc/locale/Makefile.in
+++ b/libc/misc/locale/Makefile.in
@@ -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_OUT:=$(top_builddir)libc/misc/locale
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)))))
diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in
index 64cbfe253..b62032a25 100644
--- a/libc/misc/time/Makefile.in
+++ b/libc/misc/time/Makefile.in
@@ -11,13 +11,13 @@ MOBJ:= asctime.o asctime_r.o clock.o ctime.o ctime_r.o gmtime.o gmtime_r.o \
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_OBJ:=$(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC))
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)))))
diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in
index c6855cd21..dc008ec7d 100644
--- a/libc/misc/wctype/Makefile.in
+++ b/libc/misc/wctype/Makefile.in
@@ -12,7 +12,7 @@ MOBJ:= iswalnum.o iswalpha.o iswcntrl.o iswdigit.o iswgraph.o \
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_OUT:=$(top_builddir)libc/misc/wctype
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))))
diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in
index 256d21a9f..ed6b83ce2 100644
--- a/libc/string/Makefile.in
+++ b/libc/string/Makefile.in
@@ -20,9 +20,9 @@ MOBJ:= basename.o bcopy.o bzero.o dirname.o ffs.o memccpy.o memchr.o memcmp.o \
_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 @@ MOBJW= wcscasecmp.o wcscat.o wcschrnul.o wcschr.o wcscmp.o wcscpy.o wcscspn.o \
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_OUT:=$(top_builddir)libc/string
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)