diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-10-02 17:06:32 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-10-02 17:06:32 -0230 |
| commit | d99efbbbd236fc5b64bf939796906d63fec24871 (patch) | |
| tree | 8a81ac9ad554fa942e970ad038754cd630ac5a19 /cpp | |
| parent | Resolve some BCC compiler warnings (diff) | |
| parent | Makefile fixes. (diff) | |
| download | ice-d99efbbbd236fc5b64bf939796906d63fec24871.tar.bz2 ice-d99efbbbd236fc5b64bf939796906d63fec24871.tar.xz ice-d99efbbbd236fc5b64bf939796906d63fec24871.zip | |
Merge branch 'makefile'
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Glacier2Lib/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index 297e96e3727..7f0ed6e3a1a 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -38,6 +38,7 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) SLICE2CPPFLAGS := --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) +LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(libdir)/$(LIBFILENAME): $(OBJS) PermissionsVerifierF.cpp RouterF.cpp rm -f $@ diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 39201a439b7..81cf480510b 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -103,7 +103,7 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS) $(QTSQL_FLAGS) ICECPPFLAGS := $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -LINKWITH := $(DB_RPATH_LINK) -lIceGrid -lGlacier2 -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil +LINKWITH := $(DB_RPATH_LINK) -lIceStorm -lIceGrid -lGlacier2 -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil ifneq ($(QTSQL_HOME),) LINKWITH += $(QTSQL_RPATH_LINK) $(QTSQL_LIBS) |