about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2010-03-17 09:01:34 -0700
committerUlrich Drepper <drepper@redhat.com>2010-03-17 09:01:34 -0700
commit234333153e5b29fec2c0b383249db6f245a877e9 (patch)
tree3a672b30e31d357e27f0b0c9e3b09aa6491dd0ce
parent94308fd0e071018cd823b654276acc103c8b509c (diff)
downloadglibc-234333153e5b29fec2c0b383249db6f245a877e9.tar.gz
glibc-234333153e5b29fec2c0b383249db6f245a877e9.tar.xz
glibc-234333153e5b29fec2c0b383249db6f245a877e9.zip
Fix missing dependency of localedata tests on gconv-modules
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/Makefile5
2 files changed, 9 insertions, 0 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index cc47bbaf70..4da53bc804 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-16  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* Makefile: Add missing gconv-modules dependency.
+
 2010-02-03  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10414]
diff --git a/localedata/Makefile b/localedata/Makefile
index d364001551..8f356ec861 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -107,6 +107,8 @@ install-others := $(addprefix $(inst_i18ndir)/, \
 			      $(addsuffix .gz, $(charmaps)) \
 			      $(locales))
 
+tests: $(objdir)/iconvdata/gconv-modules
+
 include ../Rules
 
 # Install the charmap files in gzipped format.
@@ -298,3 +300,6 @@ tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
 		LOCPATH=$(common-objpfx)localedata
 $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+
+$(objdir)/iconvdata/gconv-modules:
+	$(MAKE) -C ../iconvdata subdir=iconvdata $@