Update.

[kopensolaris-gnu/glibc.git] / extra-lib.mk

diff --git a/extra-lib.mk b/extra-lib.mk
index 46eef03..0b79d4a 100644 (file)
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -25,7 +25,7 @@ alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
                             $(objpfx)$(patsubst %,$(libtype$o),\
                             $(lib:lib%=%)))
 
-ifeq (,$(filter $(lib),extra-libs-others))
+ifeq (,$(filter $(lib),$(extra-libs-others)))
 lib-noranlib: $(alltypes-$(lib))
 ifeq (yes,$(build-shared))
 lib-noranlib: $(objpfx)$(lib).so$($(lib).so-version)
@@ -36,8 +36,8 @@ 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
+ifneq (,$(filter .os,$(object-suffixes-$(lib))))
+others: $(objpfx)$(lib).so$($(lib).so-version)
 endif
 
 
@@ -49,4 +49,7 @@ endef
 object-suffixes-left = $(object-suffixes-$(lib))
 include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
 
+# Add the version script to the dependencies of the shared library.
+$(objpfx)$(lib).so: $(firstword $(wildcard $($(lib)-map) $(lib).map $(..)$(lib).map))
+
 endif