summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-28 16:20:18 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-28 16:20:18 +0000
commitd2e1267b014a06611f994ec980377bbc0fbbd56a (patch)
tree5db3c3cb2fdac04ef335eb6b2ff453fca8d03d13
parent5eef441142b5e70daab13c0edf378f36209280ed (diff)
Correct building locales and backport the changes
-rw-r--r--Makefile1
-rw-r--r--Makefile.in1
-rw-r--r--libc/misc/locale/Makefile7
-rw-r--r--libc/misc/locale/Makefile.in6
4 files changed, 6 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 08b114f63..ccf81eaed 100644
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,6 @@ defconfig: extra/config/conf
clean:
@$(RM) -r lib include/bits
$(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
- $(RM) libc/misc/locale/locale_data.c
$(RM) libc/misc/internals/interp.c
$(RM) ldso/libdl/*.a
$(RM) include/fpu_control.h include/dl-osinfo.h
diff --git a/Makefile.in b/Makefile.in
index 6935717a2..80a41f3d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -343,7 +343,6 @@ defconfig: extra/config/conf
clean:
@$(RM) -r lib include/bits
$(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
- $(RM) libc/misc/locale/locale_data.c
$(RM) libc/misc/internals/interp.c
$(RM) include/fpu_control.h include/dl-osinfo.h
$(MAKE) -C extra/locale clean
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index 7b8b35ac3..296d04dcf 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -57,11 +57,10 @@ $(MOBJ): $(MSRC)
$(MOBJx): $(MSRC)
$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-locale_data.o:
- $(LN) -sf ../../../extra/locale/locale_data.c
- $(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I../../../extra/locale locale_data.c -o $@
+locale_data.o: ../../../extra/locale/locale_data.c
+ $(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I$(notdir $<) $< -o $@
clean:
- $(RM) *.o *~ core locale_data.c
+ $(RM) *.o *~ core
.PHONY: data
diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in
index f93abef33..bdf42204d 100644
--- a/libc/misc/locale/Makefile.in
+++ b/libc/misc/locale/Makefile.in
@@ -40,13 +40,13 @@ $(MISC_LOCALE_MOBJx) $(MISC_LOCALE_MOBJx:.o=.os): $(MISC_LOCALE_MSRC)
$(compile.m) -D__UCLIBC_DO_XLOCALE
$(MISC_LOCALE_DATA) $(MISC_LOCALE_DATA:.o=.os): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c))
- $(compile.c) -D__WCHAR_ENABLED -I$<
+ $(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-a-pic-y+=$(MISC_LOCALE_MOBJ:.o=.os)
-libc-a-pic-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os)
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)