diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-25 15:33:02 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-11-25 15:33:02 +0000 |
| commit | 44d990198218146dd9a486e0055c7914f7407be9 (patch) | |
| tree | 32d30e93465dc03d85e50b2a2e35c69e88f9e00c /libc | |
| parent | 3c45ffd272420d301ae29120517a9b8d531a4928 (diff) | |
Integrate locales into new build system, move everything locale related to extra/locale, as download, unpack, locale_data.o
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/misc/locale/Makefile.in | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index 9d0074521..f4439cdf5 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -18,11 +18,6 @@ ifeq ($(UCLIBC_HAS_XLOCALE),y) MOBJx:=nl_langinfo_l.o duplocale.o freelocale.o uselocale.o __curlocale.o endif -DATA:= -ifeq ($(UCLIBC_HAS_LOCALE),y) -DATA:=locale_data.o -endif - MISC_LOCALE_NO_MULTI=localeconv.o MISC_LOCALE_DIR:=$(top_srcdir)libc/misc/locale @@ -31,7 +26,6 @@ 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_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_LOCALE_NO_MULTI),$(notdir $(MISC_LOCALE_MOBJ))))) @@ -47,26 +41,17 @@ $(MISC_LOCALE_MOBJx): $(MISC_LOCALE_MSRC) $(MISC_LOCALE_MOBJx:.o=.os): $(MISC_LOCALE_MSRC) $(compile.m) -D__UCLIBC_DO_XLOCALE -$(MISC_LOCALE_DATA): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c)) - $(compile.c) -D__WCHAR_ENABLED -I$(dir $<) - -$(MISC_LOCALE_DATA:.o=.os): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c)) - $(compile.c) -D__WCHAR_ENABLED -I$(dir $<) - libc-a-y+=$(MISC_LOCALE_MOBJ) -libc-a-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA) libc-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) libc-so-y+=$(MISC_LOCALE_MOBJ:.o=.os) -libc-so-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA:.o=.os) libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os) CFLAGS-multi-y+=$(MISC_LOCALE_DEF) libc-multi-y+=$(MISC_LOCALE_MSRC) libc-nomulti-y+=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MISC_LOCALE_NO_MULTI)) -libc-nomulti-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA) libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) objclean-y+=misc_locale_objclean misc_locale_objclean: - $(RM) $(MISC_LOCALE_OUT)/{*.{o,os},locale_data.c} + $(RM) $(MISC_LOCALE_OUT)/{*.{o,os}} |