about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--iconvdata/Makefile4
-rw-r--r--iconvdata/tst-iconv4.c (renamed from iconv/tst-iconv4.c)0
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2b1a88987..be335e49ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/Makefile (tests): Remove tst-iconv4.c
+	* iconv/tst-iconv4.c: Moved to...
+	* iconvdata/tst-iconv4.c: ...here.  New file.
+	* iconvdata/Makefile (tests): Add tst-iconv4.  Add dependencies.
+
 2002-11-25  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/mach/hurd/i386/init-first.c: Include <ldsodefs.h>
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 413ab05230..0b36ead013 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -58,7 +58,7 @@ modules.so := $(addsuffix .so, $(modules))
 include ../Makeconfig
 
 ifeq (yes,$(build-shared))
-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big
+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4
 
 test-srcs := tst-table-from tst-table-to
 endif
@@ -321,6 +321,8 @@ $(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so))
 $(objpfx)tst-loading.out: $(objpfx)gconv-modules \
 			  $(addprefix $(objpfx),$(modules.so))
+$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
+			 $(addprefix $(objpfx),$(modules.so))
 
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
 			 $(addprefix $(objpfx),$(modules.so)) \
diff --git a/iconv/tst-iconv4.c b/iconvdata/tst-iconv4.c
index e099ca8715..e099ca8715 100644
--- a/iconv/tst-iconv4.c
+++ b/iconvdata/tst-iconv4.c