1999-07-19 Andreas Schwab <schwab@suse.de>

	* libio/Makefile (routines): Add fwprintf.

	PowerPC has own version of w_sqrt.c and w_sqrtf.c.
	* math/w_sqrt.c: Moved to ...
	* sysdeps/generic/w_sqrt.c: ... here.
	* math/w_sqrtf.c: Moved to ...
	* sysdeps/generic/w_sqrtf.c: ... here.

	* Make-dist (generic-dirs): New variable.
	(try-sysdeps, +sysdep-names): Use it.
	* extra-lib.mk (all-$(lib)-routines): New variable.  Use it
	instead of $(lib)-routines.
	* elf/Makefile (distribute): Add dl-cache.h.
	* db2/Makefile (distribute): Add all new files.
	* iconvdata/Makefile (distribute): Don't distribute CVS
	directory.
	* math/Makefile (distribute): Remove machine/endian.h, add
	math_ldbl.h.
	* stdio-common/Makefile (distribute): Add _itowa.h.
	* sysdeps/generic/Dist: Remove make_siglist.c, add siglist.h.
	* sysdeps/gnu/Dist: Add eval.c
	* sysdeps/gnu/Makefile (libdl-sysdep_routines) [$(subdir) =
	dlfcn]: Add to this instead of libdl-routines.
	* sysdeps/ieee754/ldbl-128/Dist: New file.
	* sysdeps/mach/hurd/Dist: Add siglist.h
	* sysdeps/unix/sysv/linux/Dist: Add kernel-features.h.

16 files changed, 62 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index af8b40b538..363a2936c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+1999-07-19  Andreas Schwab  <schwab@suse.de>
+
+	* libio/Makefile (routines): Add fwprintf.
+
+	PowerPC has own version of w_sqrt.c and w_sqrtf.c.
+	* math/w_sqrt.c: Moved to ...
+	* sysdeps/generic/w_sqrt.c: ... here.
+	* math/w_sqrtf.c: Moved to ...
+	* sysdeps/generic/w_sqrtf.c: ... here.
+
+	* Make-dist (generic-dirs): New variable.
+	(try-sysdeps, +sysdep-names): Use it.
+	* extra-lib.mk (all-$(lib)-routines): New variable.  Use it
+	instead of $(lib)-routines.
+	* elf/Makefile (distribute): Add dl-cache.h.
+	* db2/Makefile (distribute): Add all new files.
+	* iconvdata/Makefile (distribute): Don't distribute CVS
+	directory.
+	* math/Makefile (distribute): Remove machine/endian.h, add
+	math_ldbl.h.
+	* stdio-common/Makefile (distribute): Add _itowa.h.
+	* sysdeps/generic/Dist: Remove make_siglist.c, add siglist.h.
+	* sysdeps/gnu/Dist: Add eval.c
+	* sysdeps/gnu/Makefile (libdl-sysdep_routines) [$(subdir) =
+	dlfcn]: Add to this instead of libdl-routines.
+	* sysdeps/ieee754/ldbl-128/Dist: New file.
+	* sysdeps/mach/hurd/Dist: Add siglist.h
+	* sysdeps/unix/sysv/linux/Dist: Add kernel-features.h.
+
 1999-07-18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/sparc/Dist: Add ldd-rewrite.sed.
diff --git a/Make-dist b/Make-dist
index c68b98da8c..376911c4ce 100644
--- a/Make-dist
+++ b/Make-dist
@@ -90,14 +90,17 @@ sources += $(addsuffix .c,$(elided-routines) \
 		  $(filter %.c %.S %.s %.h %.sub,$(distribute))
 foo:=$(shell echo '+maybe-sysdeps=$(+maybe-sysdeps)'>&2)
 # Find all the files that have a generic version.
-try-sysdeps := $(foreach dir,$(..)sysdeps/generic $(..)sysdeps/libm-ieee754,\
+generic-dirs = $(..)sysdeps/generic $(..)sysdeps/ieee754 \
+	       $(..)sysdeps/ieee754/flt-32 $(..)sysdeps/ieee754/dbl-64 \
+	       $(..)sysdeps/ieee754/ldbl-96 $(..)sysdeps/ieee754/ldbl-128
+try-sysdeps := $(foreach dir,$(generic-dirs),\
 			     $(addprefix $(dir)/,$(+maybe-sysdeps)))
 foo:=$(shell echo 'try-sysdeps=$(try-sysdeps)'>&2)
 +sysdeps := $(wildcard $(try-sysdeps))
 foo:=$(shell echo 'generic +sysdeps=$(+sysdeps)'>&2)
-+sysdep-names := $(sort $(patsubst $(..)sysdeps/generic/%,%,\
-				   $(patsubst $(..)sysdeps/libm-ieee754/%,%,\
-					      $(+sysdeps))))
++sysdep-names := $(sort $(foreach dir, $(generic-dirs),\
+				  $(patsubst $(dir)/%,%,\
+					     $(filter $(dir)/%,$(+sysdeps)))))
 foo:=$(shell echo '+sysdep-names=$(+sysdep-names)' >&2)
 
 ifdef subdir-dirs
diff --git a/db2/Makefile b/db2/Makefile
index 9020ce5f6a..77aa60ce6a 100644
--- a/db2/Makefile
+++ b/db2/Makefile
@@ -37,8 +37,8 @@ distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \
 	     txn/txn.src README LICENSE \
 	     $(addprefix include/,btree.h btree_auto.h btree_ext.h \
 				  clib_ext.h common_ext.h cxx_int.h \
-				  db_am.h db_auto.h \
-				  db_cxx.h db_dispatch.h db_ext.h \
+				  db_185.h.src db_am.h db_auto.h db_cxx.h \
+				  db_dispatch.h db_ext.h db_join.h \
 				  db_page.h db_shash.h db_swap.h \
 				  hash.h hash_auto.h hash_ext.h lock.h \
 				  lock_ext.h log.h log_auto.h log_ext.h \
@@ -46,7 +46,10 @@ distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \
 				  shqueue.h txn.h txn_auto.h txn_ext.h \
 				  os.h os_jump.h xa.h xa_ext.h) \
 	     $(addprefix mutex/,x86.gcc uts4_cc.s sparc.gcc parisc.gcc \
-				README 68020.gcc tsl_parisc.s sco.cc)
+				README 68020.gcc tsl_parisc.s sco.cc) \
+	     $(addprefix progs/db_printlog/,README commit.awk count.awk \
+					    pgno.awk range.awk status.awk \
+					    txn.awk)
 
 vpath %.c $(subdir-dirs)
 
diff --git a/elf/Makefile b/elf/Makefile
index d063a4d007..225b56fb69 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -36,7 +36,7 @@ elide-routines.os = $(dl-routines) dl-support enbl-secure
 # interpreter and operating independent of libc.
 rtld-routines	:= rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
 distribute	:= $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
-		   dl-hash.h soinit.c sofini.c ldd.bash.in \
+		   dl-cache.h dl-hash.h soinit.c sofini.c ldd.bash.in \
 		   genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
 		   dl-librecon.h interp.c sln.c dl-dst.h hp-timing.h \
 		   do-lookup.h sprof.c gen-trusted-dirs.awk \
diff --git a/extra-lib.mk b/extra-lib.mk
index 6216ce9e3b..cdb48e2fff 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -3,7 +3,8 @@
 # is initialized first to $(extra-libs) so that with each
 # inclusion, we advance $(lib) to the next library name (e.g. libfoo).
 # The variable $($(lib)-routines) defines the list of modules
-# to be included in that library.
+# to be included in that library.  A sysdep Makefile can add to
+# $(lib)-sysdep_routines to include additional modules.
 
 lib := $(firstword $(extra-libs-left))
 extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
@@ -17,14 +18,17 @@ ifneq (,$(object-suffixes-$(lib)))
 install-lib := $(install-lib)
 extra-objs := $(extra-objs)
 
+# The modules that go in $(lib).
+all-$(lib)-routines := $($(lib)-routines) $($(lib)-sysdep_routines)
+
 # Add each flavor of library to the lists of things to build and install.
 install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
 extra-objs += $(foreach o,$(object-suffixes-$(lib):.os=),\
 			$(patsubst %,%$o,$(filter-out \
 					   $($(lib)-shared-only-routines),\
-					   $($(lib)-routines))))
+					   $(all-$(lib)-routines))))
 ifneq (,$(filter .os,$(object-suffixes-$(lib))))
-extra-objs += $($(lib)-routines:=.os)
+extra-objs += $(all-$(lib)-routines:%=%.os)
 endif
 alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
 			     $(objpfx)$(patsubst %,$(libtype$o),\
@@ -52,7 +56,7 @@ define o-iterator-doit
 $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
   $(patsubst %,$(objpfx)%$o,\
 	     $(filter-out $($(lib)-shared-only-routines),\
-			  $($(lib)-routines))); \
+			  $(all-$(lib)-routines))); \
 	$$(build-extra-lib)
 endef
 object-suffixes-left = $(object-suffixes-$(lib):.os=)
@@ -61,7 +65,7 @@ endif
 
 ifneq (,$(filter .os,$(object-suffixes-$(lib))))
 $(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \
-  $($(lib)-routines:%=$(objpfx)%.os)
+  $(all-$(lib)-routines:%=$(objpfx)%.os)
 	$(build-extra-lib)
 endif
 
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 4c77568619..9789fa3e20 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -81,8 +81,8 @@ LDFLAGS-libCNS.so = -Wl,-soname,$(@F)
 
 distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh		    \
-	      TESTS $(wildcard testdata/*) run-iconv-test.sh		    \
-	      8bit-generic.c 8bit-gap.c					    \
+	      TESTS $(filter-out testdata/CVS%, $(wildcard testdata/*))	    \
+	      run-iconv-test.sh 8bit-generic.c 8bit-gap.c		    \
 	      ansi_x3.110.c asmo_449.c baltic.c big5.c cp737.c cp737.h	    \
 	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
 	      cns11643l1.c cns11643l1.h cp1250.c cp1251.c cp1252.c cp1253.c \
diff --git a/math/Makefile b/math/Makefile
index d5434f79df..34136b91c9 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -26,7 +26,7 @@ headers		:= math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
 		   fenv.h bits/fenv.h bits/mathdef.h tgmath.h
 
 # Internal header files.
-distribute	:= math_private.h machine/asm.h machine/endian.h
+distribute	:= math_ldbl.h math_private.h machine/asm.h
 
 # FPU support code.
 aux		:= setfpucw fpu_control
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 74900189a8..2ca21c5de9 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -42,7 +42,7 @@ include ../Makeconfig
 install-others := $(inst_includedir)/bits/stdio_lim.h
 
 aux	:= errlist siglist
-distribute := _itoa.h printf-parse.h stdio_lim.h.in
+distribute := _itoa.h _itowa.h printf-parse.h stdio_lim.h.in
 
 tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
diff --git a/sysdeps/generic/Dist b/sysdeps/generic/Dist
index be8c4a8811..14baf3eef2 100644
--- a/sysdeps/generic/Dist
+++ b/sysdeps/generic/Dist
@@ -1,4 +1,3 @@
-make_siglist.c
 signame.c
 signame.h
 det_endian.c
@@ -15,3 +14,4 @@ setutxent.c
 updwtmpx.c
 utmpxname.c
 bits/libc-tsd.h
+siglist.h
diff --git a/math/w_sqrt.c b/sysdeps/generic/w_sqrt.c
index be15d959ea..be15d959ea 100644
--- a/math/w_sqrt.c
+++ b/sysdeps/generic/w_sqrt.c
diff --git a/math/w_sqrtf.c b/sysdeps/generic/w_sqrtf.c
index f5ccc73868..f5ccc73868 100644
--- a/math/w_sqrtf.c
+++ b/sysdeps/generic/w_sqrtf.c
diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
index 7055326e2e..b3d642cb02 100644
--- a/sysdeps/gnu/Dist
+++ b/sysdeps/gnu/Dist
@@ -1,4 +1,5 @@
 errlist.awk
+eval.c
 utmpx.h
 bits/utmpx.h
 netinet/tcp.h
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 4806c0df1d..21f658f560 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -48,5 +48,5 @@ endif
 
 
 ifeq ($(subdir),dlfcn)
-libdl-routines	+= eval
+libdl-sysdep_routines += eval
 endif
diff --git a/sysdeps/ieee754/ldbl-128/Dist b/sysdeps/ieee754/ldbl-128/Dist
new file mode 100644
index 0000000000..d78de40205
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128/Dist
@@ -0,0 +1 @@
+ieee754.h
diff --git a/sysdeps/mach/hurd/Dist b/sysdeps/mach/hurd/Dist
index 04c9faa9bb..95f2a33555 100644
--- a/sysdeps/mach/hurd/Dist
+++ b/sysdeps/mach/hurd/Dist
@@ -12,3 +12,4 @@ net/if_arp.h
 net/if_ether.h
 net/if_ppp.h
 net/route.h
+siglist.h
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 452b4f02a5..b8166e5c75 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -4,6 +4,7 @@ errlist.h
 getdirentries.c
 getdirentries64.c
 init-first.h
+kernel-features.h
 kernel_sigaction.h
 kernel_stat.h
 kernel_termios.h