Wed May 29 00:52:20 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

* extra-lib.mk (alltypes-$(lib)): Don't append $(objpfx)$(lib).so.
	(others): Instead, make this depend on it.
This commit is contained in:
Roland McGrath 1996-05-29 05:09:31 +00:00
parent 0200214b28
commit d06b536dc1
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Wed May 29 00:52:20 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* 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 <drepper@cygnus.com> Tue May 28 04:38:10 1996 Ulrich Drepper <drepper@cygnus.com>
* limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646 * limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646

View File

@ -23,9 +23,6 @@ extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o))
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
$(objpfx)$(patsubst %,$(libtype$o),\ $(objpfx)$(patsubst %,$(libtype$o),\
$(lib:lib%=%))) $(lib:lib%=%)))
ifneq (,$(filter .so,$(object-suffixes-$(lib))))
alltypes-$(lib) += $(objpfx)$(lib).so
endif
ifeq (,$($(lib)-no-lib-dep)) ifeq (,$($(lib)-no-lib-dep))
lib-noranlib: $(alltypes-$(lib)) lib-noranlib: $(alltypes-$(lib))
@ -33,6 +30,13 @@ else
others: $(alltypes-$(lib)) others: $(alltypes-$(lib))
endif 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. # Use o-iterator.mk to generate a rule for each flavor of library.
define o-iterator-doit define o-iterator-doit
$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \