Updated.

1999-03-26  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* Makerules: Add $(common-objpfx)Versions.all to common-generated
	outside of ifndef avoid-generated.

	* libio/oldiofdopen.c (_IO_old_fdopen): Bring over recent changes
	in iofdopen.c.
	* libio/oldiofopen.c (_IO_old_fopen): Bring over recent changes in
	iofopen.c.
	* libio/oldiofclose.c (_IO_old_fclose): Bring over recent changes
	in iofclose.c.
	* libio/oldfileops.c (_IO_old_file_underflow, _IO_old_file_sync,
	_IO_old_file_seekoff): Bring over recent changes in fileops.c.

diff --git a/ChangeLog b/ChangeLog
index d75bd7b..cb59870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1999-03-26  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+       * Makerules: Add $(common-objpfx)Versions.all to common-generated
+       outside of ifndef avoid-generated.
+
+       * libio/oldiofdopen.c (_IO_old_fdopen): Bring over recent changes
+       in iofdopen.c.
+       * libio/oldiofopen.c (_IO_old_fopen): Bring over recent changes in
+       iofopen.c.
+       * libio/oldiofclose.c (_IO_old_fclose): Bring over recent changes
+       in iofclose.c.
+       * libio/oldfileops.c (_IO_old_file_underflow, _IO_old_file_sync,
+       _IO_old_file_seekoff): Bring over recent changes in fileops.c.
+
 1999-03-26  Mark Kettenis  <kettenis@gnu.org>
 
        * sysdeps/mach/hurd/Makefile: Only install libc_p.a linker script

diff --git a/Makerules b/Makerules
index 984a8ad..37b14ee 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -269,7 +269,7 @@ ifdef sysd-dirs-done
 ifeq ($(versioning),yes)
 -include $(common-objpfx)sysd-versions
 $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions
-common-generated += $(version-maps) sysd-versions
+common-generated += $(version-maps) sysd-versions $(common-objpfx)Versions.all
 
 ifndef avoid-generated
 ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
@@ -280,7 +280,6 @@ $(common-objpfx)Versions.all: $(..)Versions.def \
                              $(wildcard $(add-ons:%=$(..)%/Versions.def))
        cat $^ > $@T
        mv -f $@T $@
-common-generated += $(common-objpfx)Versions.all
 $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
                               $(..)scripts/versions.awk \
                               $(wildcard $(all-subdirs:%=$(..)%/Versions)) \