From d06b536dc10bd096d7141fc058399e83275c8e3b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 29 May 1996 05:09:31 +0000 Subject: [PATCH] Wed May 29 00:52:20 1996 Roland McGrath * extra-lib.mk (alltypes-$(lib)): Don't append $(objpfx)$(lib).so. (others): Instead, make this depend on it. --- ChangeLog | 5 +++++ extra-lib.mk | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23c0695..fcdf91c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 29 00:52:20 1996 Roland McGrath + + * extra-lib.mk (alltypes-$(lib)): Don't append $(objpfx)$(lib).so. + (others): Instead, make this depend on it. + Tue May 28 04:38:10 1996 Ulrich Drepper * limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646 diff --git a/extra-lib.mk b/extra-lib.mk index ea5812c..99fce5b 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -23,9 +23,6 @@ extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o)) alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ $(objpfx)$(patsubst %,$(libtype$o),\ $(lib:lib%=%))) -ifneq (,$(filter .so,$(object-suffixes-$(lib)))) -alltypes-$(lib) += $(objpfx)$(lib).so -endif ifeq (,$($(lib)-no-lib-dep)) lib-noranlib: $(alltypes-$(lib)) @@ -33,6 +30,13 @@ else others: $(alltypes-$(lib)) endif +# The linked shared library is never a dependent of lib-noranlib, +# because linking it will depend on libc.so already being built. +ifneq (,$(filter .so,$(object-suffixes-$(lib)))) +others: $(objpfx)$(lib).so +endif + + # Use o-iterator.mk to generate a rule for each flavor of library. define o-iterator-doit $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ -- 2.7.4