summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-02-11 04:34:24 +0000
committerBernard Normier <bernard@zeroc.com>2005-02-11 04:34:24 +0000
commit1fce8a731524035008d19bb80706a5f787afc2cd (patch)
tree55602170a9ef284c85ca4440c08f578c5f46e587 /cpp/src
parentversion updates (diff)
downloadice-1fce8a731524035008d19bb80706a5f787afc2cd.tar.bz2
ice-1fce8a731524035008d19bb80706a5f787afc2cd.tar.xz
ice-1fce8a731524035008d19bb80706a5f787afc2cd.zip
Removed bogus -lIceBox
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IcePack/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index 5c6981a426c..666e1370be5 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -98,7 +98,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. -DICE_PACK_API_EXPORTS $(READLINE_FLAGS)
ICECPPFLAGS := $(ICECPPFLAGS) -I..
SLICE2CPPFLAGS := --checksum --ice --include-dir IcePack --dll-export ICE_PACK_API $(SLICE2CPPFLAGS)
-LINKWITH := -lIceBox -lIce -lIceUtil
+LINKWITH := -lIce -lIceUtil
$(libdir)/$(LIBFILENAME): $(LIB_OBJS)
rm -f $@
@@ -114,15 +114,15 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
$(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lIceXML -lIcePack -lIceBox $(LIBS) $(READLINE_LIBS) $(EXPAT_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lIceXML -lIcePack $(LIBS) $(READLINE_LIBS) $(EXPAT_LIBS)
$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIcePack -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
$(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIcePack -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
$(LOCAL_HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP)
rm -f $(HDIR)/$(*F).h $(*F).cpp