Minor build system fixes

8 files changed, 15 insertions, 15 deletions

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 3169d105650..03e1d2cbb27 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -316,11 +316,11 @@ ifeq ($(SLICE_LIBS),)
 endif
 
 ifeq ($(ICESSL_LIBS),)
-    ICESSL_LIBS         = -lIceSSL $(LIBS)
+    ICESSL_LIBS         = -lIceSSL
 endif
 
 ifeq ($(ICEWS_LIBS),)
-    ICEWS_LIBS          = -lIceWS $(LIBS)
+    ICEWS_LIBS          = -lIceWS
 endif
 
 EVERYTHING		= all depend clean install
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 8705a3aaa44..eba47be808a 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -150,6 +150,7 @@ ifneq ($(NPTL_LIB),)
     BASELIBS		:= $(NPTL_LIB) $(BASELIBS)
 endif
 
+ICESSL_LIBS             = $(OPENSSL_RPATH_LINK) -lIceSSL
 LIBS			= $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
 
 ICEUTIL_OS_LIBS         = -lrt
diff --git a/cpp/demo/IceGrid/customLoadBalancing/Makefile b/cpp/demo/IceGrid/customLoadBalancing/Makefile
index 47b4b2bca0a..69b24ebb96d 100644
--- a/cpp/demo/IceGrid/customLoadBalancing/Makefile
+++ b/cpp/demo/IceGrid/customLoadBalancing/Makefile
@@ -36,19 +36,19 @@ SLICE_SRCS	= Pricing.ice
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I. $(CPPFLAGS)
-LINKWITH	:= -lIceGrid $(BZIP2_RPATH_LINK) -lGlacier2 -lIce -lIceUtil
+LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceGrid -lGlacier2 $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceGrid -lGlacier2 $(LINKWITH)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LINKWITH)
 
 $(LIBFILENAME): $(POBJS)
 	rm -f $@
-	$(call mkshlib,$@,$(SONAME),$(POBJS),$(LINKWITH))
+	$(call mkshlib,$@,$(SONAME),$(POBJS),-lIceGrid -lGlacier2 $(LINKWITH))
 
 $(SONAME): $(LIBFILENAME)
 	rm -f $@
diff --git a/cpp/test/Glacier2/ssl/Makefile b/cpp/test/Glacier2/ssl/Makefile
index 178daa6ace9..1af1164eeda 100644
--- a/cpp/test/Glacier2/ssl/Makefile
+++ b/cpp/test/Glacier2/ssl/Makefile
@@ -31,6 +31,6 @@ $(CLIENT): $(OBJS) $(COBJS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(ICESSL_LIBS) -lGlacier2 $(OPENSSL_RPATH_LINK)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS)
 
 include .depend
diff --git a/cpp/test/Ice/info/Makefile b/cpp/test/Ice/info/Makefile
index 824ab70de37..c7d79e68da1 100644
--- a/cpp/test/Ice/info/Makefile
+++ b/cpp/test/Ice/info/Makefile
@@ -35,10 +35,10 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
-	$(call mktest,$@,$(COBJS),$(OPENSSL_RPATH_LINK) $(ICESSL_LIBS) $(ICEWS_LIBS))
+	$(call mktest,$@,$(COBJS),$(ICESSL_LIBS) $(ICEWS_LIBS) $(LIBS))
 
 $(SERVER): $(SOBJS)
 	rm -f $@
-	$(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(ICEWS_LIBS))
+	$(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(ICEWS_LIBS) $(LIBS))
 
 include .depend
diff --git a/cpp/test/Ice/stringConverter/Makefile b/cpp/test/Ice/stringConverter/Makefile
index 2f261350f16..f1bd1ab9b03 100644
--- a/cpp/test/Ice/stringConverter/Makefile
+++ b/cpp/test/Ice/stringConverter/Makefile
@@ -34,7 +34,7 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
-	$(call mktest,$@,$(COBJS),$(OPENSSL_RPATH_LINK) $(LINKWITH))
+	$(call mktest,$@,$(COBJS),$(LINKWITH))
 
 $(SERVER): $(SOBJS)
 	rm -f $@
diff --git a/cpp/test/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile
index 1cb698d6031..7a0ce2c2b9c 100644
--- a/cpp/test/IceGrid/session/Makefile
+++ b/cpp/test/IceGrid/session/Makefile
@@ -36,11 +36,10 @@ GENPIC          = no
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 
 $(CLIENT): $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(COBJS) $(OPENSSL_RPATH_LINK) -lIceGrid -lGlacier2 $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS)
 
 $(VERIFIER): $(VOBJS)
 	rm -f $@
@@ -48,7 +47,7 @@ $(VERIFIER): $(VOBJS)
 
 $(SERVER): $(SOBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(OPENSSL_RPATH_LINK)
+	$(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS)
 
 clean::
 	-rm -rf db/node db/registry db/node-1 db/replica-*
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index 22f21f45bac..ff8a2c9091d 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -35,10 +35,10 @@ CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
-	$(call mktest,$@,$(COBJS),$(OPENSSL_RPATH_LINK) $(ICESSL_LIBS))
+	$(call mktest,$@,$(COBJS),$(ICESSL_LIBS) $(LIBS))
 
 $(SERVER): $(SOBJS)
 	rm -f $@
-	$(call mktest,$@,$(SOBJS),$(OPENSSL_RPATH_LINK) $(ICESSL_LIBS))
+	$(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(LIBS))
 
 include .depend