aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog27
-rw-r--r--Make-dist8
-rw-r--r--Makerules9
-rw-r--r--README6
-rw-r--r--Rules4
-rw-r--r--iconv/Makefile2
-rw-r--r--iconvdata/Makefile8
-rw-r--r--libio/Makefile3
-rw-r--r--localedata/Makefile10
-rw-r--r--posix/Makefile3
-rw-r--r--sunrpc/Makefile4
-rw-r--r--sysdeps/gnu/Dist2
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/i386/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/Dist1
16 files changed, 67 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index ed639cbab0..4fa22209d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+1998-05-08 16:36 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * iconvdata/Makefile (generated): Set to *-generated-headers
+ plus gconv-modules.
+ (tests): Set to iconv-test.
+ * localedata/Makefile (generated-dirs): Add ld-test-names to list.
+ * posix/Makefile (generated): Set to wordexp-test-result*.
+ * sunrpc/Makefile (generated): Remove rpcsvc/*.
+ (generated-dirs): Add rpcsvc.
+ * libio/Makefile: Clean up.
+
+1998-05-08 14:55 Ulrich Drepper <drepper@cygnus.com>
+
+ * Make-dist (+tsrcs): Also use tests-statc where tests is used.
+ * Makerules: Likewise.
+ (+depfiles): Also add sysdep-others.
+ * Rules: Likewise.
+ * iconv/Makefile (distribute): Add loop.s and skeleton.c.
+ * iconvdata/Makefile (distribute): Add TESTS.
+ * localedata/Makefile (repertoires): Rename to repertoiremaps.
+ * sysdeps/gnu/Dist: Add utmpx.h and bits/utmpx.h.
+ * sysdeps/unix/sysv/linux/Dist: Add ldd-rewrite.sed.
+ * sysdeps/unix/sysv/linux/i386/Makefile [subdir=elf]: Define
+ sysdep-others, not others.
+ * sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/Dist: Add sys/kernel_termios.h.
+
1998-05-08 12:26 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv_int.h (struct gconv_module): Remove cost field and add
diff --git a/Make-dist b/Make-dist
index 0d61f490ae..293598febc 100644
--- a/Make-dist
+++ b/Make-dist
@@ -149,10 +149,10 @@ ifdef subdir
foo:=$(shell echo subdir foo >&2)
-+tsrcs := Makefile $(+tsrcs) \
- $(addsuffix .c,$(others) $(tests) $(test-srcs)) \
- $(wildcard $(addsuffix .input,$(tests) $(test-srcs)) \
- $(addsuffix .args,$(tests) $(test-srcs)))
++tsrcs := Makefile $(+tsrcs) \
+ $(addsuffix .c,$(others) $(tests) $(tests-static) $(test-srcs)) \
+ $(wildcard $(addsuffix .input,$(tests) (tests-static) $(test-srcs)) \
+ $(addsuffix .args,$(tests) $(tests-static) $(test-srcs)))
+tardeps := $(strip $(+tsrcs))
verbose = v
diff --git a/Makerules b/Makerules
index 8be73d0235..6aca3083b2 100644
--- a/Makerules
+++ b/Makerules
@@ -449,7 +449,7 @@ endif
$(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
$(addsuffix .d,$(tests) $(test-srcs) $(tests-static))
ifeq ($(build-programs),yes)
-+depfiles += $(addsuffix .d,$(others))
++depfiles += $(addsuffix .d,$(others) $(sysdep-others))
endif
+depfiles := $(addprefix $(objpfx),\
$(filter-out $(addsuffix .d,$(omit-deps)),\
@@ -885,10 +885,11 @@ mostlyclean: common-mostlyclean
# Remove the object files.
common-mostlyclean:
-rm -f $(addprefix $(objpfx),$(tests) $(test-srcs) $(others) \
- $(tests-static) stubs \
+ $(sysdep-others) $(tests-static) stubs \
$(addsuffix .o,$(tests) $(test-srcs) \
$(tests-static) \
- $(others)) \
+ $(others) \
+ $(sysdep-others)) \
$(addsuffix .out,$(tests) $(test-srcs)) \
$(addsuffix .sout,$(tests-static)))
-rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \
@@ -957,7 +958,7 @@ echo > $@.new 'subdir := $(subdir)'
$(foreach var,subdir-dirs sources elided-routines sysdep_routines \
headers sysdep_headers distribute dont_distribute generated \
others tests test-srcs extra-libs $(extra-libs:%=%-routines) \
- $(extra-libs:%=%-map) versioned \
+ tests-static $(extra-libs:%=%-map) versioned \
$(addprefix install-,lib lib.so data bin sbin others),
echo >> $@.new '$(subdir)-$(var) := $($(var))'
echo >> $@.new '$(var) = $$($(subdir)-$(var))')
diff --git a/README b/README
index 7225da7b3c..54c9a6e939 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.0.92 test release of the GNU C Library.
+This directory contains the version 2.0.93 test release of the GNU C Library.
Many bugs have been fixed since the last release.
Some bugs surely remain.
@@ -12,6 +12,8 @@ configurations:
powerpc-*-linux-gnu Linux and MkLinux on PowerPC systems
sparc-*-linux-gnu Linux-2.x on SPARC
sparc64-*-linux-gnu Linux-2.x on UltraSPARC
+ arm-*-none ARM standalone systems
+ arm-*-linuxaout Linux-2.x on ARM using a.out binaries
Former releases of this library (version 1.09.1 and perhaps earlier
@@ -50,7 +52,7 @@ provides the Unix `crypt' function, plus some other entry points.
Because of the United States export restriction on DES implementations,
we are distributing this code separately from the rest of the C
library. There is an extra distribution tar file just for crypt; it is
-called `glibc-crypt-2.0.92.tar.gz'. You can just unpack the crypt
+called `glibc-crypt-2.0.93.tar.gz'. You can just unpack the crypt
distribution along with the rest of the C library and build; you can
also build the library without getting crypt. Users outside the USA
can get the crypt distribution via anonymous FTP from ftp.ifi.uio.no
diff --git a/Rules b/Rules
index 8ff4955cbf..20aa84a8fe 100644
--- a/Rules
+++ b/Rules
@@ -83,7 +83,7 @@ common-generated += dummy.o dummy.c empty.c \
.PHONY: others tests
ifeq ($(build-programs),yes)
-others: $(addprefix $(objpfx),$(others) $(extra-objs))
+others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
else
others: $(addprefix $(objpfx),$(extra-objs))
endif
@@ -94,7 +94,7 @@ tests: $(tests:%=$(objpfx)%.out) $(tests-static:%=$(objpfx)%.sout)
endif
ifeq ($(build-programs),yes)
-binaries-all = $(others) $(tests) $(test-srcs)
+binaries-all = $(others) $(sysdep-others) $(tests) $(test-srcs)
binaries-static = $(others-static) $(tests-static) $(test-srcs-static)
else
binaries-all = $(tests) $(test-srcs)
diff --git a/iconv/Makefile b/iconv/Makefile
index e4cd0fc53d..cd486b737e 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -33,7 +33,7 @@ else
CFLAGS-gconv_db.c = -DSTATIC_GCONV
endif
-distribute = gconv_builtin.h gconv_int.h
+distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c
others = iconv_prog
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index dcbb36375f..eca01b3b77 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -182,7 +182,7 @@ distribute := 8bit-generic.c 8bit-gap.c gap.pl gaptab.pl gconv-modules \
jis0208.c jis0212.c extra-module.mk euckr.c johab.c uhc.c \
ksc5601.c ksc5601.h iso646.c big5.c eucjp.c gb2312.c gb2312.h \
euccn.c euctw.c cns11643l1.c cns11643l1.h cns11643.h \
- cns11643.c run-iconv-test.sh $(wildcard testdata/*) \
+ cns11643.c run-iconv-test.sh TESTS $(wildcard testdata/*) \
ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c ebcdic-es-a.c \
ebcdic-es-s.c ebcdic-fi-se.c ebcdic-fi-se-a.c ebcdic-fr.c \
ebcdic-is-friss.c ebcdic-it.c ebcdic-pt.c ebcdic-uk.c \
@@ -270,6 +270,11 @@ 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)
+ifdef objpfx
+generated += gconv-modules
+endif
+
# The headers must be generated before the compilation.
before-compile = $(addprefix $(objpfx),$(sed-generated-headers)) \
$(addprefix $(objpfx),$(perl-generated-headers))
@@ -475,6 +480,7 @@ endif
include ../Rules
+tests = iconv-test
tests: $(objpfx)iconv-test.out
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
diff --git a/libio/Makefile b/libio/Makefile
index 779c93632b..61bd54f400 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -55,8 +55,7 @@ routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \
CPPFLAGS += -D_IO_MTSAFE_IO
endif
-aux := \
- fileops genops stdfiles stdio strops
+aux := fileops genops stdfiles stdio strops
ifeq ($(versioning),yes)
aux += oldfileops oldstdfiles
diff --git a/localedata/Makefile b/localedata/Makefile
index c4370d8082..0d27aec1d1 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -31,20 +31,20 @@ locales := $(filter-out $(addprefix locales/, CVS RCS %~), \
$(wildcard locales/*))
# List of repertoire maps.
-repertoires := $(filter-out $(addprefix repertoiremaps/, CVS RCS %~), \
- $(wildcard repertoiremaps/*))
+repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS %~), \
+ $(wildcard repertoiremaps/*))
test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch
test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1
test-output := $(foreach s, .out .xout, \
$(addsuffix $s, $(basename $(test-input))))
-generated := $(test-input) $(test-output)
-generated-dirs := $(basename $(test-input)) en_US
-
ld-test-names := test1 test2 test3 test4 test5
ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
$(addsuffix .def,$(ld-test-names)))
+generated := $(test-input) $(test-output)
+generated-dirs := $(basename $(test-input)) en_US $(ld-test-names)
+
distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \
README fr_CA,2.13.in de_DE.in da_DK.in $(repertoiremaps) \
$(charmaps) $(locales) $(ld-test-srcs) tst-rpmatch.sh \
diff --git a/posix/Makefile b/posix/Makefile
index 08f20b6256..069a470e75 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -61,6 +61,9 @@ gpl2lgpl := getopt.c getopt1.c getopt.h regex.c regex.h
before-compile := testcases.h
+# So they get cleaned up.
+generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10)
+
include ../Rules
ifeq (no,$(cross-compiling))
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 25a62a2155..5ea09e6a4b 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -54,9 +54,9 @@ headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \
des_crypt.h key_prot.h rpc_des.h) \
$(rpcsvc:%=rpcsvc/%)
install-others = $(inst_sysconfdir)/rpc
-generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) \
- $(rpcsvc:%.x=rpcsvc/%.stmp) $(rpcsvc:%.x=x%.stmp) \
+generated = $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
rpc-proto.c rpc-proto.d rpcgen
+generated-dirs = rpcsvc
routines := auth_none auth_unix authuxprot bindrsvprt \
clnt_gen clnt_perr clnt_raw clnt_simp clnt_tcp \
diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
index 093b211206..d20d528d03 100644
--- a/sysdeps/gnu/Dist
+++ b/sysdeps/gnu/Dist
@@ -1 +1,3 @@
errlist.awk
+utmpx.h
+bits/utmpx.h
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index b938504627..27b3077a65 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -5,6 +5,7 @@ init-first.h
kernel_sigaction.h
kernel_stat.h
kernel_termios.h
+ldd-rewrite.sed
lddlibc4.c
llseek.c
s_pread64.c
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index eff3e24622..7ef9e50085 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -4,6 +4,6 @@ sysdep_headers += sys/perm.h sys/vm86.h
endif
ifeq ($(subdir),elf)
-others += lddlibc4
+sysdep-others += lddlibc4
install-bin += lddlibc4
endif
diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile
index eb0921d9be..3cedf6322e 100644
--- a/sysdeps/unix/sysv/linux/m68k/Makefile
+++ b/sysdeps/unix/sysv/linux/m68k/Makefile
@@ -7,6 +7,6 @@ sysdep_routines += mremap
endif
ifeq ($(subdir),elf)
-others += lddlibc4
+sysdep-others += lddlibc4
install-bin += lddlibc4
endif
diff --git a/sysdeps/unix/sysv/linux/sparc/Dist b/sysdeps/unix/sysv/linux/sparc/Dist
index 7832507772..e7569d1ad3 100644
--- a/sysdeps/unix/sysv/linux/sparc/Dist
+++ b/sysdeps/unix/sysv/linux/sparc/Dist
@@ -1 +1,2 @@
+sys/kernel_termios.h
sys/trap.h