From cf2964e2b797e7525f02761e545283f6baff4bac Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 14 Jun 2000 03:46:36 +0000
Subject: [PATCH] Update.

	* Makefile (distribute): Add include/shlib-compat.h.
---
 ChangeLog            | 2 ++
 Makefile             | 2 +-
 localedata/ChangeLog | 2 ++
 localedata/Makefile  | 5 +++--
 soft-fp/Makefile     | 5 ++++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3588de418e..11c89e2ffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makefile (distribute): Add include/shlib-compat.h.
+
 	* Make-dist: Search for tests also in sysdeps hierachy.
 
 	* crypt/Makefile (distribute): Add ufc-crypt.h, crypt-private.h,
diff --git a/Makefile b/Makefile
index c7ef4b68aa..48b151b827 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,7 @@ distribute  :=	README README.libm INSTALL FAQ FAQ.in NOTES NEWS BUGS	\
 		libc-symbols.h version.h shlib-versions rpm/Makefile	\
 		rpm/template rpm/rpmrc glibcbug.in abi-tags stub-tag.h	\
 		test-skeleton.c include/des.h include/db_185.h		\
-		include/db.h Versions.def				\
+		include/db.h include/shlib-compat.h Versions.def	\
 		INTERFACE CONFORMANCE NAMESPACE				\
 		$(addprefix scripts/,					\
 			    rellns-sh config.sub config.guess		\
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 359fc10088..cd06f58413 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makefile (ld-test-srcs): Handle .ds files separately.
+
 	* Makefile (ld-test-srcs): Distribute all test6 input files.
 
 2000-05-28  Ulrich Drepper  <drepper@redhat.com>
diff --git a/localedata/Makefile b/localedata/Makefile
index 05b85e14ad..6f20ff96fa 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -45,7 +45,8 @@ test-output := $(foreach s, .out .xout, \
 ld-test-names := test1 test2 test3 test4 test5 test6
 ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
 				   $(addsuffix .def,$(ld-test-names)) \
-				   $(addsuffix .ds,$(ld-test-names)))
+				   $(addsuffix .ds,test5 test6) \
+				   test6.c trans.def)
 
 fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \
 	     y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
@@ -58,7 +59,7 @@ distribute := CHECKSUMS README SUPPORTED ChangeLog			\
 	      $(charmaps) $(locales) $(repertoiremaps)			\
 	      tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh	\
 	      tst-fmon.data $(test-input-data) $(ld-test-srcs)		\
-	      th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh trans.def
+	      th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh
 
 # Get $(inst_i18ndir) defined.
 include ../Makeconfig
diff --git a/soft-fp/Makefile b/soft-fp/Makefile
index c4cfbaa4e9..7b7e0edda6 100644
--- a/soft-fp/Makefile
+++ b/soft-fp/Makefile
@@ -35,6 +35,9 @@ gcc-quad-routines := negtf2 addtf3 subtf3 multf3 divtf3 eqtf2 \
 	trunctfdf2 sqrttf2
 
 distribute := double.h op-1.h op-2.h op-4.h op-common.h quad.h \
-	single.h soft-fp.h extended.h ChangeLog Banner configure
+	single.h soft-fp.h extended.h ChangeLog Banner configure \
+	$(addsuffix .c,$(gcc-single-routines)) \
+	$(addsuffix .c,$(gcc-double-routines)) \
+	$(addsuffix .c,$(gcc-quad-routines))
 
 include ../Rules