diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-04-28 18:21:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-04-28 18:21:03 +0000 |
| commit | 8406a53a2502e0896878bfc2fd5f5726be39604a (patch) | |
| tree | ae3cd0feeb2f071e4e713184ab99f624bdaf7270 /intl/Makefile | |
| parent | 572028fa7e0d679b537c66f10d44fa8bb94bde50 (diff) | |
| download | glibc-8406a53a2502e0896878bfc2fd5f5726be39604a.tar.gz | |
* sysdeps/i386/i686/memcmp.S: Move misplaced END.
2005-03-27 Bruno Haible <bruno@clisp.org>
Make it possible for multiple threads to use gettext() in different
locales.
* intl/dcigettext.c (HAVE_PER_THREAD_LOCALE): New macro.
(struct known_translation_t): If HAVE_PER_THREAD_LOCALE, add localename
field.
(transcmp): If HAVE_PER_THREAD_LOCALE, compare localename fields.
(DCIGETTEXT): If HAVE_PER_THREAD_LOCALE, fill the localename field in
search and newp.
* intl/tst-gettext4.c: New file.
* intl/tst-gettext4.sh: New file.
* intl/tst-gettext4-de.po: New file.
* intl/tst-gettext4-fr.po: New file.
* intl/tst-gettext5.c: New file.
* intl/tst-gettext5.sh: New file.
* intl/Makefile (distribute): Add tst-gettext4.sh, tst-gettext4-de.po,
tst-gettext4-fr.po, tst-gettext5.sh.
(multithread-test-srcs): New variable.
(test-srcs): Add its contents.
(tests): Depend on tst-gettext4.out, tst-gettext5.out.
(tst-gettext4.out, tst-gettext5.out): New rules.
(CFLAGS-tst-gettext4.c, CFLAGS-tst-gettext5.c): New variables.
Add rule for linking the multithread-test-srcs with the appropriate
thread-library.
2005-04-28 Ulrich Drepper <drepper@redhat.com>
* po/rw.po: New file. From translation team.
Diffstat (limited to 'intl/Makefile')
| -rw-r--r-- | intl/Makefile | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/intl/Makefile b/intl/Makefile index 81557a3457..19853974d7 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -30,9 +30,17 @@ distribute = gmo.h gettextP.h hash-string.h loadinfo.h locale.alias \ tst-translit.sh translit.po \ tst-gettext2.sh tstlang1.po tstlang2.po \ tst-codeset.sh tstcodeset.po \ - tst-gettext3.sh + tst-gettext3.sh \ + tst-gettext4.sh tst-gettext4-de.po tst-gettext4-fr.po \ + tst-gettext5.sh +include ../Makeconfig + +multithread-test-srcs := tst-gettext4 tst-gettext5 test-srcs := tst-gettext tst-translit tst-gettext2 tst-codeset tst-gettext3 +ifeq ($(have-thread-library),yes) +test-srcs += $(multithread-test-srcs) +endif tests = tst-ngettext before-compile = $(objpfx)msgs.h @@ -42,8 +50,6 @@ install-others = $(inst_msgcatdir)/locale.alias generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace generated-dirs := domaindir localedir -include ../Makeconfig - ifneq (no,$(BISON)) plural.c: plural.y $(BISON) $(BISONFLAGS) $@ $^ @@ -60,6 +66,9 @@ ifeq (yes,$(build-shared)) ifneq ($(strip $(MSGFMT)),:) tests: $(objpfx)tst-translit.out $(objpfx)tst-gettext2.out \ $(objpfx)tst-codeset.out $(objpfx)tst-gettext3.out +ifeq ($(have-thread-library),yes) +tests: $(objpfx)tst-gettext4.out $(objpfx)tst-gettext5.out +endif ifneq (no,$(PERL)) tests: $(objpfx)mtrace-tst-gettext endif @@ -77,6 +86,10 @@ $(objpfx)tst-codeset.out: tst-codeset.sh $(objpfx)tst-codeset $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ $(objpfx)tst-gettext3.out: tst-gettext3.sh $(objpfx)tst-gettext3 $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ +$(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4 + $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ +$(objpfx)tst-gettext5.out: tst-gettext5.sh $(objpfx)tst-gettext5 + $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ endif endif @@ -89,11 +102,26 @@ CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-gettext2.c = -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-codeset.c = -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-gettext3.c = -DOBJPFX=\"$(objpfx)\" +CFLAGS-tst-gettext4.c = -DOBJPFX=\"$(objpfx)\" +CFLAGS-tst-gettext5.c = -DOBJPFX=\"$(objpfx)\" + +ifeq ($(have-thread-library),yes) +ifeq (yes,$(build-shared)) +$(addprefix $(objpfx),$(multithread-test-srcs)): $(shared-thread-library) +else +$(addprefix $(objpfx),$(multithread-test-srcs)): $(static-thread-library) +endif +ifeq (yes,$(build-bounded)) +$(multithread-test-srcs:%=$(objpfx)%-bp): $(bounded-thread-library) +endif +endif $(objpfx)tst-translit.out: $(objpfx)tst-gettext.out $(objpfx)tst-gettext2.out: $(objpfx)tst-gettext.out $(objpfx)tst-codeset.out: $(objpfx)tst-gettext.out $(objpfx)tst-gettext3.out: $(objpfx)tst-gettext.out +$(objpfx)tst-gettext4.out: $(objpfx)tst-gettext.out +$(objpfx)tst-gettext5.out: $(objpfx)tst-gettext.out CPPFLAGS += -D'LOCALEDIR="$(msgcatdir)"' \ -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' |