diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-01-17 13:32:47 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-01-17 13:32:47 +0000 |
| commit | 84b8cf96be91a1e23a7c57a634e84cd433f9084b (patch) | |
| tree | 9e63e16e21599fc99259fbb2099c33a090023af6 /cpp/src | |
| parent | Added missing print method to loggers (diff) | |
| download | ice-84b8cf96be91a1e23a7c57a634e84cd433f9084b.tar.bz2 ice-84b8cf96be91a1e23a7c57a634e84cd433f9084b.tar.xz ice-84b8cf96be91a1e23a7c57a634e84cd433f9084b.zip | |
OpenSLL is now linked with the IcePatch library
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePatch2/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index 72729a193cc..a7acadb60fb 100644 --- a/cpp/src/IcePatch2/Makefile +++ b/cpp/src/IcePatch2/Makefile @@ -47,7 +47,7 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS $(OPENSSL_FLAGS) $(BZIP2_FLAGS) SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS) -LINKWITH := -lIce -lIceUtil +LINKWITH := -lIce -lIceUtil $(OPENSSL_LIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ @@ -63,15 +63,15 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) $(SERVER): $(SOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIcePatch2 $(LIBS) $(OPENSSL_LIBS) + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lIcePatch2 $(LIBS) $(CLIENT): $(COBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch2 $(LIBS) $(OPENSSL_LIBS) + $(CXX) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch2 $(LIBS) $(CALC): $(CALCOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(CALCOBJS) -lIcePatch2 $(LIBS) $(OPENSSL_LIBS) + $(CXX) $(LDFLAGS) -o $@ $(CALCOBJS) -lIcePatch2 $(LIBS) install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) |