summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules1
-rw-r--r--cpp/config/Make.rules.HP-UX2
-rw-r--r--cpp/config/Make.rules.Linux2
-rw-r--r--cpp/config/Make.rules.SunOS2
-rw-r--r--cpp/demo/IceBox/hello/Makefile2
-rw-r--r--cpp/demo/IceGrid/simple/Makefile2
-rw-r--r--cpp/src/Freeze/Makefile2
-rw-r--r--cpp/src/Glacier2/Makefile2
-rw-r--r--cpp/src/IceBox/Makefile2
-rw-r--r--cpp/src/IceGrid/Makefile2
-rw-r--r--cpp/src/IcePatch2/Makefile2
-rw-r--r--cpp/src/IceSSL/Makefile2
-rw-r--r--cpp/src/IceStorm/Makefile4
-rw-r--r--cpp/test/IceGrid/deployer/Makefile2
-rw-r--r--cpp/test/IceGrid/replication/Makefile2
-rw-r--r--cpp/test/IceGrid/session/Makefile2
-rw-r--r--cpp/test/IceGrid/update/Makefile2
17 files changed, 18 insertions, 17 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 87a13a3df72..719a96cc331 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -195,6 +195,7 @@ OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/
BZIP2_FLAGS = $(if $(BZIP2_HOME),-I$(BZIP2_HOME)/include)
BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
+BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
DB_FLAGS = $(if $(DB_HOME),-I$(DB_HOME)/include)
DB_LIBS = $(if $(DB_HOME),-L$(DB_HOME)/$(libsubdir)) -ldb_cxx
diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX
index 85e49a07c90..1e65925e0c7 100644
--- a/cpp/config/Make.rules.HP-UX
+++ b/cpp/config/Make.rules.HP-UX
@@ -67,7 +67,7 @@ rpathlink = -L$(1)
BASELIBS = -lIceUtil -lxnet -lpthread
-LIBS = -lIce $(BASELIBS)
+LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
ICEUTIL_OS_LIBS = -lpthread -lrt
ICE_OS_LIBS =
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index df262438738..1e2e050d981 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -139,7 +139,7 @@ ifeq ($(CXX),icpc)
endif
BASELIBS = -lIceUtil $(STLPORT_LIBS) -lpthread
-LIBS = -lIce $(BASELIBS)
+LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
ICEUTIL_OS_LIBS =
ICE_OS_LIBS = -ldl
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 3113423f8f3..11183623e65 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -115,7 +115,7 @@ endif
rpathlink = -L$(1)
BASELIBS = -lIceUtil -lpthread
-LIBS = -lIce $(BASELIBS)
+LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
ICEUTIL_OS_LIBS = -lpthread -lrt
ICE_OS_LIBS = -ldl -lsocket
diff --git a/cpp/demo/IceBox/hello/Makefile b/cpp/demo/IceBox/hello/Makefile
index 444e127b6b3..9e6771d724a 100644
--- a/cpp/demo/IceBox/hello/Makefile
+++ b/cpp/demo/IceBox/hello/Makefile
@@ -32,7 +32,7 @@ SLICE_SRCS = Hello.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
-LINKWITH := -lIceBox -lIce -lIceUtil
+LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(LIBFILENAME): $(OBJS) $(SOBJS)
rm -f $@
diff --git a/cpp/demo/IceGrid/simple/Makefile b/cpp/demo/IceGrid/simple/Makefile
index 854b3da562d..aa7fa84fb01 100644
--- a/cpp/demo/IceGrid/simple/Makefile
+++ b/cpp/demo/IceGrid/simple/Makefile
@@ -30,7 +30,7 @@ SLICE_SRCS = Hello.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 92013323dd9..ce0e6f3d0f7 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -60,7 +60,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS)
SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
-LINKWITH := -lIce -lIceUtil $(DB_LIBS)
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_LIBS)
$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index c5e7b0f3ade..570428fafd7 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -52,7 +52,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS $(OPENSSL_FLAGS)
SLICE2CPPFLAGS := --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(libdir)/$(LIBFILENAME): $(OBJS)
rm -f $@
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index a90d96efd75..0533d617d7a 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -41,7 +41,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I.. $(CPPFLAGS) -DICE_BOX_API_EXPORTS
SLICE2CPPFLAGS := --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(libdir)/$(LIBFILENAME): $(OBJS)
rm -f $@
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index bed4084b350..e284d45c5b6 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -106,7 +106,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. -DICE_GRID_API_EXPORTS $(READLINE_FLAGS)
ICECPPFLAGS := $(ICECPPFLAGS) -I..
SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
-LINKWITH := -lGlacier2 -lIce -lIceUtil
+LINKWITH := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(libdir)/$(LIBFILENAME): $(LIB_OBJS)
rm -f $@
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
index c3fe278628c..034d238afe2 100644
--- a/cpp/src/IcePatch2/Makefile
+++ b/cpp/src/IcePatch2/Makefile
@@ -48,7 +48,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS $(OPENSSL_FLAGS) $(BZIP2_FLAGS)
SLICE2CPPFLAGS := --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
-LINKWITH := -lIce -lIceUtil $(OPENSSL_LIBS) $(BZIP2_LIBS)
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(BZIP2_LIBS)
$(libdir)/$(LIBFILENAME): $(OBJS)
rm -f $@
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index a54bdec4328..cba8175d784 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -64,7 +64,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS)
SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
-LINKWITH := $(EXPAT_RPATH_LINK) -lIceXML -lIce -lIceUtil $(OPENSSL_LIBS) $(CXXLIBS)
+LINKWITH := $(EXPAT_RPATH_LINK) -lIceXML $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(CXXLIBS)
$(libdir)/$(LIBFILENAME): $(OBJS)
rm -f $@
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index d1cde49ee3a..2bb9dde43da 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -69,8 +69,8 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS)
ICECPPFLAGS := $(ICECPPFLAGS) -I..
SLICE2CPPFLAGS := --checksum --ice --dll-export ICE_STORM_API --include-dir IceStorm $(SLICE2CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
-SVCLINKWITH := $(DB_RPATH_LINK) -lFreeze -lIceBox -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
+SVCLINKWITH := $(DB_RPATH_LINK) -lFreeze -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
IceStorm.o: IceStorm.cpp
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_API_EXPORTS $<
diff --git a/cpp/test/IceGrid/deployer/Makefile b/cpp/test/IceGrid/deployer/Makefile
index 7bfbda2d214..dcce208b67d 100644
--- a/cpp/test/IceGrid/deployer/Makefile
+++ b/cpp/test/IceGrid/deployer/Makefile
@@ -38,7 +38,7 @@ SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-LINKWITH := -lIceBox -lIce -lIceUtil
+LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
diff --git a/cpp/test/IceGrid/replication/Makefile b/cpp/test/IceGrid/replication/Makefile
index d1faa8d7a2a..9da999d0092 100644
--- a/cpp/test/IceGrid/replication/Makefile
+++ b/cpp/test/IceGrid/replication/Makefile
@@ -38,7 +38,7 @@ SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-LINKWITH := -lIceBox -lIce -lIceUtil
+LINKWITH := -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
diff --git a/cpp/test/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile
index f3e28f93d78..bd308a3a8c5 100644
--- a/cpp/test/IceGrid/session/Makefile
+++ b/cpp/test/IceGrid/session/Makefile
@@ -25,7 +25,7 @@ SRCS = $(COBJS:.o=.cpp) \
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(CLIENT): $(COBJS)
rm -f $@
diff --git a/cpp/test/IceGrid/update/Makefile b/cpp/test/IceGrid/update/Makefile
index 0f826461a0f..7325e7ab71f 100644
--- a/cpp/test/IceGrid/update/Makefile
+++ b/cpp/test/IceGrid/update/Makefile
@@ -31,7 +31,7 @@ SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-LINKWITH := -lIce -lIceUtil
+LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 17:32:53 +0000