aboutsummaryrefslogtreecommitdiff
path: root/rpm
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-16 09:31:23 +0000
committerRoland McGrath <roland@gnu.org>1996-06-16 09:31:23 +0000
commit26da047f376abd5da2561be914b93179c7230afa (patch)
treec2f1ae03ba5e26ee38a222f6a27ee027ac13a264 /rpm
parent3433189e8a3934084db3945f1e9c0c8fa3f8f166 (diff)
downloadglibc-26da047f376abd5da2561be914b93179c7230afa.tar
glibc-26da047f376abd5da2561be914b93179c7230afa.tar.gz
glibc-26da047f376abd5da2561be914b93179c7230afa.tar.bz2
glibc-26da047f376abd5da2561be914b93179c7230afa.zip
* hurd/hurdinit.c (map0): Remove [!PIC] conditional.cvs/libc-960616
* 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.
Diffstat (limited to 'rpm')
-rw-r--r--rpm/Makefile6
1 files changed, 6 insertions, 0 deletions
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