From 26da047f376abd5da2561be914b93179c7230afa Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 16 Jun 1996 09:31:23 +0000
Subject: * hurd/hurdinit.c (map0): Remove [!PIC] conditional.

	* shlib-versions (*-*-*): Add libutil=1.

	* rpm/Makefile (install-lib): Add libc.a et al.
	(install-others): Only add libc.so if $(build-shared) is yes.

	* math/Makefile (install-lib): New variable, list libieee.a.
	(non-lib.a): Likewise.
	(extra-objs): Likewise, and ieee-math.o.
	($(objpfx)libieee.a): New target, link to ieee-math.o.
	* math/ieee-math.c: New file.
	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=math]: Remove setfpucw
	and libieee.a stuff.
	* sysdeps/unix/sysv/linux/ieee-fpucw.c: File removed.
	* sysdeps/unix/sysv/linux/i386/ieee_fpu.c: File removed.
---
 rpm/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'rpm')

diff --git a/rpm/Makefile b/rpm/Makefile
index 5ffa19ab88..1bf6b6ed51 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -38,6 +38,11 @@ install-lib += $(foreach lib,$(versioned),\
 			 $(patsubst %.so,%-$(version).so,$(lib)) \
 			 $(lib)$($(lib)-version) $(lib))
 
+# Add libc.a and libc_p.a.
+install-lib += $(foreach o,$(filter-out .so,$(object-suffixes)),\
+			 $(patsubst %,$(libtype$o),c))
+
+ifeq (yes,$(build-shared))
 # Add libc.so itself, which is a special case in Makerules.
 ifndef libc.so-version
 install-others += $(slibdir)/libc.so
@@ -46,6 +51,7 @@ install-others += $(libdir)/libc.so \
 		  $(slibdir)/libc-$(version).so \
 		  $(slibdir)/libc.so$(libc.so-version)
 endif
+endif
 
 
 all: glibc-$(version).$(config).rpm
-- 
cgit 1.4.1