summaryrefslogtreecommitdiff
path: root/libc/misc/wchar
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-02-13 09:57:02 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-02-13 09:57:02 +0000
commit4390d8e705e11eec6c2eed552ceea25277fdbde3 (patch)
treec71e47cbc69b1b40dd222fcee66e36da1d340fd7 /libc/misc/wchar
parent9f88426bbabbe3518c6017961f041e41ddbd3d27 (diff)
libc-{a,so,multi}-y replaced by libc-y covering common objects both in libc.a/libc.so, the diffs go into libc-static-y/libc-shared-y exclusively, add IMA to libc, don't use any MSRC anymore
Diffstat (limited to 'libc/misc/wchar')
-rw-r--r--libc/misc/wchar/Makefile.in35
1 files changed, 12 insertions, 23 deletions
diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in
index f1d5f3876..64171eb96 100644
--- a/libc/misc/wchar/Makefile.in
+++ b/libc/misc/wchar/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for uClibc
#
# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
@@ -17,35 +17,24 @@
# wcsftime
#
-MSRC:=wchar.c
-MOBJ:= btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \
- wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \
- mbsnrtowcs.o wcsnrtombs.o wcwidth.o wcswidth.o
+# multi source wchar.c
+CSRC := btowc.c wctob.c mbsinit.c mbrlen.c mbrtowc.c wcrtomb.c mbsrtowcs.c \
+ wcsrtombs.c _wchar_utf8sntowcs.c _wchar_wcsntoutf8s.c \
+ mbsnrtowcs.c wcsnrtombs.c wcwidth.c wcswidth.c
ifeq ($(UCLIBC_HAS_LOCALE),y)
-MOBJ+=iconv.o
+CSRC += iconv.c
endif
-MISC_WCHAR_DIR:=$(top_srcdir)libc/misc/wchar
-MISC_WCHAR_OUT:=$(top_builddir)libc/misc/wchar
+MISC_WCHAR_DIR := $(top_srcdir)libc/misc/wchar
+MISC_WCHAR_OUT := $(top_builddir)libc/misc/wchar
-MISC_WCHAR_MSRC:=$(MISC_WCHAR_DIR)/$(MSRC)
-MISC_WCHAR_MOBJ:=$(patsubst %.o,$(MISC_WCHAR_OUT)/%.o,$(MOBJ))
-MISC_WCHAR_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_WCHAR_MOBJ))))
+MISC_WCHAR_SRC := $(patsubst %.c,$(MISC_WCHAR_DIR)/%.c,$(CSRC))
+MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC))
-$(MISC_WCHAR_MOBJ): $(MISC_WCHAR_MSRC)
- $(compile.m)
+libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ)
-$(MISC_WCHAR_MOBJ:.o=.os): $(MISC_WCHAR_MSRC)
- $(compile.m)
-
-libc-a-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MOBJ)
-libc-so-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MOBJ:.o=.os)
-
-CFLAGS-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_DEF)
-libc-multi-$(UCLIBC_HAS_WCHAR)+=$(MISC_WCHAR_MSRC)
-
-objclean-y+=misc_wchar_objclean
+objclean-y += misc_wchar_objclean
misc_wchar_objclean:
$(RM) $(MISC_WCHAR_OUT)/*.{o,os}