diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-09-14 17:24:23 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-09-14 17:24:23 -0400 |
| commit | 57dcbbca82dda291a44c7c0edd425da2ff386b1b (patch) | |
| tree | c1930cc5ac7208e6cef94d1cda2540ef4b5c74cb /cpp | |
| parent | ICE-7346: link only with required libs on Linux (diff) | |
| download | ice-57dcbbca82dda291a44c7c0edd425da2ff386b1b.tar.bz2 ice-57dcbbca82dda291a44c7c0edd425da2ff386b1b.tar.xz ice-57dcbbca82dda291a44c7c0edd425da2ff386b1b.zip | |
Revert "ICE-7346: link only with required libs on Linux"
This reverts commit 98927d362141a854ea2d857e513aa0dd4f5f7545.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mk | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mk | 2 | ||||
| -rw-r--r-- | cpp/src/icegriddb/Makefile.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index 4bb1e5d9743..6bbae208ab9 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -72,9 +72,11 @@ $(project)_targetdir := $(bindir) icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB +icegridnode_libs := lmdb icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) +icegridregistry_libs := lmdb icegridadmin_dependencies := IcePatch2 IceBox IceXML icegridadmin_sources := $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice \ diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk index 105c80bd192..cbed5440bb7 100644 --- a/cpp/src/IceStorm/Makefile.mk +++ b/cpp/src/IceStorm/Makefile.mk @@ -15,6 +15,7 @@ $(project)_dependencies := IceStorm Ice IceStormService_targetdir := $(libdir) IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB +IceStormService_libs := lmdb IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ InstrumentationI.cpp \ NodeI.cpp \ @@ -47,6 +48,7 @@ icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ icestormdb_targetdir := $(bindir) icestormdb_dependencies := IcePatch2 IceDB +icestormdb_libs := lmdb icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) projects += $(project) diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk index 37f8eaae3e7..e021aeda53f 100644 --- a/cpp/src/icegriddb/Makefile.mk +++ b/cpp/src/icegriddb/Makefile.mk @@ -16,7 +16,7 @@ $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h icegriddb_targetdir := $(bindir) icegriddb_dependencies := Ice IceDB Glacier2 - +icegriddb_libs := lmdb icegriddb_sources := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \ $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice) |