Update.

1998-05-18 11:38  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/run-iconv-test.sh: Extend library-path by iconvdata
	directory.

1998-05-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* rpm/Makefile: Delete inclusion of version.mk.

1998-05-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libc.map: Add all libio functions needed libstdc++ with version
	2.0, sort entries.

1998-05-18  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* iconvdata/Makefile (generated): Add *.stmp files.

1998-05-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* timezone/Makefile (testdata, build-testdata): New variables, use
	them in rules for test data.
	($(objpfx)tst-timezone.out): Depend on test data.
	($(testdata)/Europe/Berlin, $(testdata)/Universal,
	$(testdata)/Australia/Melbourne, $(testdata)/America/Sao_Paulo):
	New rules to build test data.
	(tst-timezone-ENV): Pass TZDIR to point to test data.

6 files changed, 94 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index c7f585d819..a355f6eb38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+1998-05-18 11:38  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconvdata/run-iconv-test.sh: Extend library-path by iconvdata
+	directory.
+
+1998-05-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* rpm/Makefile: Delete inclusion of version.mk.
+
+1998-05-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* libc.map: Add all libio functions needed libstdc++ with version
+	2.0, sort entries.
+
+1998-05-18  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* iconvdata/Makefile (generated): Add *.stmp files.
+
+1998-05-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* timezone/Makefile (testdata, build-testdata): New variables, use
+	them in rules for test data.
+	($(objpfx)tst-timezone.out): Depend on test data.
+	($(testdata)/Europe/Berlin, $(testdata)/Universal,
+	$(testdata)/Australia/Melbourne, $(testdata)/America/Sao_Paulo):
+	New rules to build test data.
+	(tst-timezone-ENV): Pass TZDIR to point to test data.
+
 1998-05-18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* iconvdata/TESTS: ISO-2022-KR has not really ASCII as a subset
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index f438b3d49e..c29a4b018d 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -263,7 +263,9 @@ perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h	 \
 			  iso8859-7.h iso8859-8.h iso8859-10.h		 \
 			  iso8859-7jp.h
 
-generated = $(sed-generated-headers) $(perl-generated-headers) iconv-test.out
+generated = $(sed-generated-headers) $(sed-generated-headers:%.h=%.stmp) \
+	    $(perl-generated-headers) $(perl-generated-headers:%.h=%.stmp) \
+	    iconv-test.out
 ifdef objpfx
 generated += $(objpfx)gconv-modules
 endif
diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index 72b566bdcb..c28bb02270 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -32,8 +32,11 @@ trap "rm -f $temp1 $temp2" 1 2 3 15
 GCONV_PATH=$codir/iconvdata
 export GCONV_PATH
 
+# We have to have some directories in the library path.
+LIBPATH=$codir:$codir/iconvdata
+
 # How the start the iconv(1) program.
-ICONV="$codir/elf/ld.so --library-path $codir $codir/iconv/iconv_prog"
+ICONV="$codir/elf/ld.so --library-path $LIBPATH $codir/iconv/iconv_prog"
 
 # We read the file named TESTS.  All non-empty lines not starting with
 # `#' are interpreted as commands.
diff --git a/libc.map b/libc.map
index 5f50ad43b1..dff8d6fcca 100644
--- a/libc.map
+++ b/libc.map
@@ -78,25 +78,7 @@ GLIBC_2.0 {
     __select; __sched_get_priority_max; __sched_get_priority_min;
     __sched_getparam; __sched_getscheduler; __sched_setscheduler;
     __sched_yield; __on_exit; __gettimeofday; __fork; __clone;
-    __nss_configure_lookup; _dl_open; _dl_close; _dl_addr; _IO_file_setbuf;
-    _IO_file_init; _IO_file_attach; _IO_do_write; _IO_seekoff;
-    _IO_link_in; _IO_file_open; _IO_file_doallocate; _IO_file_fopen;
-    _IO_file_overflow; _IO_file_underflow; _IO_file_sync; _IO_file_seekoff;
-    _IO_file_close_it; _IO_file_read; _IO_file_seek; _IO_file_write;
-    _IO_file_stat; _IO_file_close; _IO_file_xsputn; _IO_sgetn;
-    _IO_seekpos; _IO_padn; _IO_getline; _IO_vfprintf;
-    _IO_proc_open; _IO_proc_close; _IO_vfscanf; _IO_free_backup_area;
-    _IO_un_link; _IO_switch_to_get_mode; _IO_default_uflow;
-    _IO_default_xsputn; _IO_default_xsgetn; _IO_default_pbackfail;
-    _IO_setb; _IO_default_doallocate; _IO_doallocbuf; _IO_init;
-    _IO_default_finish; _IO_sputbackc; _IO_sungetc; _IO_adjust_column;
-    _IO_flush_all; _IO_flush_all_linebuffered; _IO_init_marker;
-    _IO_remove_marker; _IO_marker_difference; _IO_marker_delta;
-    _IO_seekmark; _IO_unsave_markers; _IO_str_overflow;
-    _IO_str_underflow; _IO_str_init_static; _IO_str_init_readonly;
-    _IO_str_seekoff; _IO_str_pbackfail; _IO_file_jumps;
-    _IO_peekc_locked; _IO_flockfile; _IO_funlockfile;
-    _IO_fopen; _IO_fclose; _IO_file_open;
+    __nss_configure_lookup; _dl_open; _dl_close; _dl_addr; 
     __vsscanf; __vfscanf; __vsnprintf;
     _rpc_dtablesize; _null_auth; _seterr_reply;
     __res_randomid;  __getpid;
@@ -106,6 +88,32 @@ GLIBC_2.0 {
     __close; __connect; __fcntl; __lseek; __open; __read; __send; __wait;
     __ieee_get_fp_control; __ieee_set_fp_control;
     __dgettext;
+    # libio
+    _IO_adjust_column; _IO_clearerr; _IO_default_doallocate;
+    _IO_default_finish; _IO_default_pbackfail; _IO_default_uflow;
+    _IO_default_xsgetn; _IO_default_xsputn; _IO_do_write;
+    _IO_doallocbuf; _IO_fclose; _IO_fdopen; _IO_feof; _IO_ferror;
+    _IO_fflush; _IO_fgetc; _IO_fgetpos; _IO_fgets; _IO_file_attach;
+    _IO_file_close; _IO_file_close_it; _IO_file_doallocate;
+    _IO_file_fopen; _IO_file_init; _IO_file_jumps; _IO_file_open;
+    _IO_file_overflow; _IO_file_read; _IO_file_seek; _IO_file_seekoff;
+    _IO_file_setbuf; _IO_file_stat; _IO_file_sync; _IO_file_underflow;
+    _IO_file_write; _IO_file_xsputn; _IO_fileno; _IO_flockfile;
+    _IO_flush_all; _IO_flush_all_linebuffered; _IO_fopen; _IO_fprintf;
+    _IO_fputs; _IO_fread; _IO_free_backup_area; _IO_freopen;
+    _IO_fscanf; _IO_fseek; _IO_fsetpos; _IO_ftell; _IO_funlockfile;
+    _IO_fwrite; _IO_getc; _IO_getline; _IO_getline_info; _IO_gets;
+    _IO_init; _IO_init_marker; _IO_link_in; _IO_marker_delta;
+    _IO_marker_difference; _IO_padn; _IO_pclose; _IO_peekc_locked;
+    _IO_perror; _IO_popen; _IO_printf; _IO_proc_close; _IO_proc_open;
+    _IO_putc; _IO_puts; _IO_remove_marker; _IO_rewind; _IO_scanf;
+    _IO_seekmark; _IO_seekoff; _IO_seekpos; _IO_setb; _IO_setbuf;
+    _IO_setbuffer; _IO_setlinebuf; _IO_setvbuf; _IO_sgetn;
+    _IO_sprintf; _IO_sputbackc; _IO_sscanf; _IO_str_init_readonly;
+    _IO_str_init_static; _IO_str_overflow; _IO_str_pbackfail;
+    _IO_str_seekoff; _IO_str_underflow; _IO_sungetc;
+    _IO_switch_to_get_mode; _IO_un_link; _IO_ungetc;
+    _IO_unsave_markers; _IO_vfprintf; _IO_vfscanf; _IO_vsprintf;
 
     # Exception handling support functions from libgcc
     __register_frame; __register_frame_table; __deregister_frame;
diff --git a/rpm/Makefile b/rpm/Makefile
index d6f82d2167..8c5a1a35f6 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -7,7 +7,6 @@ all:
 subdir := rpm
 include ../Makeconfig
 include $(common-objpfx)soversions.mk
-include $(common-objpfx)version.mk
 
 distinfo := $(common-objpfx)distinfo \
 	    $(wildcard $(subdirs:%=$(common-objpfx)%/distinfo))
diff --git a/timezone/Makefile b/timezone/Makefile
index 1b26d1ab4d..3f3f944e8b 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -166,22 +166,39 @@ CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID
 CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
 
 # We have to make sure the data for testing the tz functions is available.
-$(objpfx)test-tz.out: $(addprefix $(objpfx)testdata/, America/New_York \
-						      Etc/UTC UTC)
-
-$(objpfx)testdata/America/New_York: northamerica $(objpfx)zic \
-				    $(leapseconds) yearistype
-	$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
-	  -y yearistype northamerica
-$(objpfx)testdata/Etc/UTC: etcetera $(objpfx)zic $(leapseconds) yearistype
-	$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
-	  -y yearistype etcetera
-$(objpfx)testdata/UTC: simplebackw $(objpfx)zic $(objpfx)testdata/Etc/UTC \
-		       $(leapseconds) yearistype
-	$(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \
-	  -y yearistype simplebackw
+testdata = $(objpfx)testdata
+define build-testdata
+$(built-program-cmd) -d $(testdata) -L $(leapseconds) -y ./yearistype $<
+endef
 
-test-tz-ENV = TZDIR=$(objpfx)testdata
+$(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
+$(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
+				       Europe/Berlin Universal \
+				       Australia/Melbourne \
+				       America/Sao_Paulo)
+
+test-tz-ENV = TZDIR=$(testdata)
+tst-timezone-ENV = TZDIR=$(testdata)
+
+$(testdata)/America/New_York: northamerica $(objpfx)zic $(leapseconds) \
+			      yearistype
+	$(build-testdata)
+$(testdata)/Etc/UTC: etcetera $(objpfx)zic $(leapseconds) yearistype
+	$(build-testdata)
+$(testdata)/UTC: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \
+		 $(leapseconds) yearistype
+	$(build-testdata)
+$(testdata)/Europe/Berlin: europe $(objpfx)zic $(leapseconds) yearistype
+	$(build-testdata)
+$(testdata)/Universal: simplebackw $(objpfx)zic $(testdata)/Etc/UTC \
+		       $(leapseconds) yearistype
+	$(build-testdata)
+$(testdata)/Australia/Melbourne: australasia $(objpfx)zic $(leapseconds) \
+				 yearistype
+	$(build-testdata)
+$(testdata)/America/Sao_Paulo: southamerica $(objpfx)zic $(leapseconds) \
+			       yearistype
+	$(build-testdata)
 
 
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make