object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
+ifneq (,$(object-suffixes-$(lib)))
+
# Make sure these are simply-expanded variables before we append to them,
# since we want the expressions we append to be expanded right now.
install-lib := $(install-lib)
# Add each flavor of library to the lists of things to build and install.
install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
-extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o))
+extra-objs += $(foreach o,$(object-suffixes-$(lib)),\
+ $(patsubst %,%$o,$($(lib)-routines)))
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
- $(common-objpfx)$(patsubst %,$(libtype$o),\
+ $(objpfx)$(patsubst %,$(libtype$o),\
$(lib:lib%=%)))
-ifneq (,$(filter .so,$(object-suffixes-$(lib))))
-alltypes-$(lib) += $(common-objpfx)$(lib).so
-endif
-ifeq (,$($(lib)-no-lib-dep))
+ifeq (,$(filter $(lib),$(extra-libs-others)))
lib-noranlib: $(alltypes-$(lib))
+ifeq (yes,$(build-shared))
+extra_solibs: $(objpfx)$(lib).so$($(lib).so-version)
+endif
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))))
+extra_solibs: $(objpfx)$(lib).so
+endif
+
+
# Use o-iterator.mk to generate a rule for each flavor of library.
define o-iterator-doit
-$(common-objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
+$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
$($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
endef
object-suffixes-left = $(object-suffixes-$(lib))
include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
+
+endif