diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/Glacier2/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IcePatch2/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 4 |
7 files changed, 8 insertions, 8 deletions
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 $< |