diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-02-27 16:56:42 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-02-27 16:56:42 +0000 |
| commit | 97e50ee5ae43e6e067eba7943453d7e61963ebe9 (patch) | |
| tree | 324242c4fa8ac52510a4324b93fdf73b0fce16ce /cpp/src/IceGrid | |
| parent | ICE-5967 add cancelation to Ice.Trace.Retry tracing (diff) | |
| download | ice-97e50ee5ae43e6e067eba7943453d7e61963ebe9.tar.bz2 ice-97e50ee5ae43e6e067eba7943453d7e61963ebe9.tar.xz ice-97e50ee5ae43e6e067eba7943453d7e61963ebe9.zip | |
ICE-6337: small fix to C++ source code to allow building with DB 6.x
Diffstat (limited to 'cpp/src/IceGrid')
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 0fcb6e7e453..33ed98f7a81 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -114,12 +114,12 @@ $(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS) $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS) rm -f $@ $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lGlacier2 -lIcePatch2 \ - -lFreeze -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) + $(DB_RPATH_LINK) -lFreeze -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS) rm -f $@ $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \ - -lFreeze -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) + $(DB_RPATH_LINK) -lFreeze -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) ../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB) rm -f $(*F).h $(*F).cpp |