12 files changed, 18 insertions, 16 deletions
diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile
index 237bce322d5..f70baad3f6a 100644
--- a/cpp/demo/IceBox/hello/Makefile
+++ b/cpp/demo/IceBox/hello/Makefile
@@ -12,8 +12,11 @@ top_srcdir	= ../../..
 
 CLIENT		= client
 
-NAME		= libHelloService.so
-VERSIONED_NAME	= $(NAME).$(VERSION)
+BASE		= libHelloService.so
+VERSIONED_BASE	= $(BASE).$(VERSION)
+
+NAME		= $(BASE)
+VERSIONED_NAME	= $(VERSIONED_BASE)
 
 TARGETS		= $(CLIENT) $(NAME) $(VERSIONED_NAME)
 
@@ -34,7 +37,7 @@ CPPFLAGS	:= -I. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) $(SOBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) -shared -o $@ $(OBJS) $(SOBJS) $(LDFLAGS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 349dc49d68c..ed266d73e3f 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -40,7 +40,7 @@ LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index f943c88c6c3..952b8f43fea 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -48,7 +48,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 7ada271cf6d..064f1047c83 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -95,7 +95,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index a6d3e45d4d1..49857151c44 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -43,7 +43,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index ea8f94b9924..660a8bb25f6 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index 6bc4e00cf61..f258ede544d 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -45,7 +45,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index 0c4b877b61c..4a6e619a2b5 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -68,7 +68,7 @@ LDFLAGS		:= $(LDFLAGS) $(OPENSSL_LIBS) $(XERCESC_LIBS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) -shared -o $@ $(OBJS) $(LDFLAGS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 7b84bfa7e01..625032064df 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -60,7 +60,7 @@ LDFLAGS		:= $(LDFLAGS) -L$(DB_HOME)/lib
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile
index d42f0e0a66b..05382a1c716 100644
--- a/cpp/src/IceUtil/Makefile
+++ b/cpp/src/IceUtil/Makefile
@@ -1,5 +1,4 @@
-# **********************************************************************
-#
+# ********************************************************************** #
 # Copyright (c) 2001
 # MutableRealms, Inc.
 # Huntsville, AL, USA
@@ -35,7 +34,7 @@ include $(top_srcdir)/config/Make.rules
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index 9f7fa17cf6a..d46ff2941c3 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS) $(XERCESC_FLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) $(XERCESC_LIBS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS) $(XERCESC_LIBS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index 9faa3c0bf23..96c8d93866c 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -32,7 +32,7 @@ CPPFLAGS	:= -I.. $(CPPFLAGS)
 
 $(VERSIONED_NAME): $(OBJS)
 	rm -f $@
-	$(CXX) $(CXXFLAGS) $(BASELDFLAGS) -shared -o $@ $(OBJS)
+	$(CXX) -Xlinker -soname -Xlinker $(VERSIONED_BASE) $(LDFLAGS) -shared -o $@ $(OBJS)
 
 $(NAME): $(VERSIONED_NAME)
 	rm -f $@