summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-02-01 23:24:19 +0100
committerJose <jose@zeroc.com>2013-02-01 23:24:19 +0100
commitae9584247364f32e4308b9fa3d0600d499aee4d0 (patch)
treed38d3a45d05086f7ac5c1fb109a797efabf69f13 /cpp/src
parentFix for ICE-5140 - an opaque endpoint which doesn't specify -e is assumed to ... (diff)
downloadice-ae9584247364f32e4308b9fa3d0600d499aee4d0.tar.bz2
ice-ae9584247364f32e4308b9fa3d0600d499aee4d0.tar.xz
ice-ae9584247364f32e4308b9fa3d0600d499aee4d0.zip
Fixed (ICE-5211) - use @loader_path in OS X libraries and binaries instead of the hard coding path
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/FreezeScript/Makefile6
-rw-r--r--cpp/src/Glacier2/Makefile1
-rw-r--r--cpp/src/IceBox/Makefile5
-rw-r--r--cpp/src/IceGrid/Makefile6
-rw-r--r--cpp/src/IcePatch2/Makefile6
-rw-r--r--cpp/src/IceStorm/Makefile6
-rw-r--r--cpp/src/slice2confluence/Makefile6
-rw-r--r--cpp/src/slice2cpp/Makefile6
-rw-r--r--cpp/src/slice2cs/Makefile6
-rw-r--r--cpp/src/slice2freeze/Makefile6
-rw-r--r--cpp/src/slice2freezej/Makefile6
-rw-r--r--cpp/src/slice2html/Makefile6
-rw-r--r--cpp/src/slice2java/Makefile6
-rw-r--r--cpp/src/slice2php/Makefile6
-rw-r--r--cpp/src/slice2py/Makefile6
-rw-r--r--cpp/src/slice2rb/Makefile6
16 files changed, 90 insertions, 0 deletions
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 55cab10a8a2..aefbc02cc44 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -37,6 +37,12 @@ SRCS = $(COMMON_OBJS:.o=.cpp) $(TRANSFORM_OBJS:.o=.cpp) $(DUMP_OBJS:.o=.cpp)
HDIR = $(headerdir)/FreezeScript
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS)
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index 54d695202b3..17fcd86fe47 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -31,6 +31,7 @@ OBJS = Blobject.o \
SRCS = $(OBJS:.o=.cpp)
SLICE_SRCS = Instrumentation.ice
+RPATH_DIR = @loader_path/../lib
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 9039c7a0c52..a734126913d 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -36,6 +36,11 @@ SLICE_SRCS = $(SDIR)/IceBox.ice
HDIR = $(headerdir)/IceBox
SDIR = $(slicedir)/IceBox
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 49fc81d4ae6..b1d86701bfb 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -91,6 +91,12 @@ SLICE_SRCS = ../IceGrid/Internal.ice
HDIR = $(headerdir)/IceGrid
SDIR = $(slicedir)/IceGrid
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS)
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
index 1af3f6a3f96..739f0924c5f 100644
--- a/cpp/src/IcePatch2/Makefile
+++ b/cpp/src/IcePatch2/Makefile
@@ -26,6 +26,12 @@ SRCS = $(SOBJS:.o=.cpp) \
$(COBJS:.o=.cpp) \
$(CALCOBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) $(BZIP2_FLAGS)
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 486feda466c..ce1df2ef93e 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -57,6 +57,12 @@ SLICE_SRCS = ../IceStorm/Instrumentation.ice \
HDIR = $(headerdir)/IceStorm
SDIR = $(slicedir)/IceStorm
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. -DICESTORM_SERVICE_API_EXPORTS $(READLINE_FLAGS)
diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile
index 9f208b78d42..e089f793a3a 100644
--- a/cpp/src/slice2confluence/Makefile
+++ b/cpp/src/slice2confluence/Makefile
@@ -19,6 +19,12 @@ OBJS = Gen.o \
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index 23878a96552..2422a83f79b 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -18,6 +18,12 @@ OBJS = Gen.o \
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile
index 80fe27c260d..983407fc6a4 100644
--- a/cpp/src/slice2cs/Makefile
+++ b/cpp/src/slice2cs/Makefile
@@ -18,6 +18,12 @@ OBJS = Gen.o \
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile
index fd2bbf3d914..eaadda3cbac 100644
--- a/cpp/src/slice2freeze/Makefile
+++ b/cpp/src/slice2freeze/Makefile
@@ -17,6 +17,12 @@ OBJS = Main.o
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile
index cd08aef06fb..5e618c5ec1e 100644
--- a/cpp/src/slice2freezej/Makefile
+++ b/cpp/src/slice2freezej/Makefile
@@ -17,6 +17,12 @@ OBJS = Main.o
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile
index db66645c7e6..cbee8632156 100644
--- a/cpp/src/slice2html/Makefile
+++ b/cpp/src/slice2html/Makefile
@@ -18,6 +18,12 @@ OBJS = Gen.o \
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index e21e18b0d27..c5c28ed2d1d 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -18,6 +18,12 @@ OBJS = Gen.o \
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile
index a897e731637..b9a424bcfac 100644
--- a/cpp/src/slice2php/Makefile
+++ b/cpp/src/slice2php/Makefile
@@ -17,6 +17,12 @@ OBJS = Main.o
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index caff4973fe4..7757501aa14 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -17,6 +17,12 @@ OBJS = Main.o
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index 7e91e778da1..f56dbd07c07 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/Makefile
@@ -17,6 +17,12 @@ OBJS = Main.o
SRCS = $(OBJS:.o=.cpp)
+ifeq ($(CPP11),yes)
+RPATH_DIR = @loader_path/../../lib/c++11
+else
+RPATH_DIR = @loader_path/../lib
+endif
+
include $(top_srcdir)/config/Make.rules
CPPFLAGS := -I. $(CPPFLAGS)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:49:31 +0000