summaryrefslogtreecommitdiff
path: root/cpp/demo
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-05-12 18:13:15 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-05-12 18:13:15 +0200
commit1b657cf6f72e668ac83b280396e18605cda98bfa (patch)
tree11a3a80cf41d1ef112f456843962f8fec4429e18 /cpp/demo
parenttest/Ice/StringConverter OS X build fix (diff)
downloadice-1b657cf6f72e668ac83b280396e18605cda98bfa.tar.bz2
ice-1b657cf6f72e668ac83b280396e18605cda98bfa.tar.xz
ice-1b657cf6f72e668ac83b280396e18605cda98bfa.zip
Minor build system fixes
Diffstat (limited to 'cpp/demo')
-rw-r--r--cpp/demo/IceGrid/customLoadBalancing/Makefile8
1 files changed, 4 insertions, 4 deletions
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 $@