diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-31 21:05:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-31 21:05:59 +0000 |
| commit | 55e2d5c7c4f5fdc23c8d0b2bf057c1559f862eec (patch) | |
| tree | b6fd328b07e6f8a7a048b20748326283d9af45ec /intl/Makefile | |
| parent | 69071b2ab6e27435b9a2d610b1b5b8c48ea92940 (diff) | |
Update.
* intl/Makefile (tests): Depend in mtrace-tst-gettext.
Make this a new rule depending on tst-gettext.out and run mtrace.
* intl/tst-gettext.c: Call mtrace.
* intl/tst-gettext.sh: Put MALLOC_TRACE in environment of tst-gettext.
* elf/dl-reloc.c: Add a few more __builtin_expect.
* configure.in: Remove --with-gettext option.
* intl/dcigettext.c (free_mem): Correct freeing of
_nl_domain_bindings list.
Diffstat (limited to 'intl/Makefile')
| -rw-r--r-- | intl/Makefile | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/intl/Makefile b/intl/Makefile index 966dad3e82..e6fa79643f 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -50,10 +50,13 @@ ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) ifneq ($(strip $(MSGFMT)),:) .PHONY: do-gettext-test do-translit-test -tests: do-gettext-test do-translit-test +tests: $(objpfx)mtrace-tst-gettext do-translit-test +$(objpfx)mtrace-tst-gettext: do-gettext-test + $(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@ do-gettext-test: $(objpfx)tst-gettext.out $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext - $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ + $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ \ + $(objpfx)tst-gettext.mtrace do-translit-test: $(objpfx)tst-translit.out $(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit $(SHELL) -e $< $(common-objpfx) $(common-objpfx)intl/ @@ -76,27 +79,3 @@ YFLAGS = --name-prefix=__gettext --output $(inst_msgcatdir)/locale.alias: locale.alias $(+force) $(do-install) - -ifdef gettext-srcdir - -%.h:: ../gpl2lgpl.sed $(gettext-srcdir)/intl/%.glibc; $(copysrc) -%.c:: ../gpl2lgpl.sed $(gettext-srcdir)/intl/%.c; $(copysrc) -%.h:: ../gpl2lgpl.sed $(gettext-srcdir)/intl/%.h; $(copysrc) -locale.alias:: ../gpl2lgpl.sed $(gettext-srcdir)/misc/locale.alias; $(copysrc) - -ifeq ($(with-cvs),yes) -define copysrc -sed -f $^ > $@.new -chmod a-w $@.new -mv -f $@.new $@ -test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $<' $@ -endef -else -define copysrc -sed -f $^ > $@.new -chmod a-w $@.new -mv -f $@.new $@ -endef -endif - -endif |