diff options
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 4 | ||||
-rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/Makefile | 36 | ||||
-rw-r--r-- | cpp/src/IceSSL/Makefile | 31 | ||||
-rw-r--r-- | cpp/src/IceUtil/Makefile | 25 | ||||
-rw-r--r-- | cpp/src/Makefile | 7 | ||||
-rw-r--r-- | cpp/src/Slice/Makefile | 25 | ||||
-rw-r--r-- | cpp/src/slice2confluence/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Makefile | 17 | ||||
-rw-r--r-- | cpp/src/slice2cs/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2freeze/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2freezej/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2html/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2java/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2php/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2py/Makefile | 2 | ||||
-rw-r--r-- | cpp/src/slice2rb/Makefile | 16 |
17 files changed, 54 insertions, 125 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 947ede7fbed..b1638274089 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1708,8 +1708,8 @@ Ice::ConnectionI::finish() // _sendStreams to not call finished on a message which is already done. // if(message->requestId > 0 && - (message->out && _requests.find(message->requestId) == _requests.end() || - message->outAsync && _asyncRequests.find(message->requestId) == _asyncRequests.end())) + ((message->out && _requests.find(message->requestId) == _requests.end()) || + (message->outAsync && _asyncRequests.find(message->requestId) == _asyncRequests.end()))) { if(message->sent(this, true)) { diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index ab724a9847a..4fa7f1499e2 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -142,7 +142,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc lib += version; -# ifdef _DEBUG +# if defined(_DEBUG) && !defined(__MINGW32__) lib += 'd'; # endif diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 70edf85aa0b..60aa1f604c9 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -9,17 +9,10 @@ top_srcdir = ../.. -include $(top_srcdir)/config/Make.rules.common - -ifeq ($(MinGW), yes) - DLLNAME = $(top_srcdir)/bin/ice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll - TARGETS = $(DLLNAME) $(LIBNAME) -else - LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) - SONAME = $(call mksoname,Ice,$(SOVERSION)) - LIBNAME = $(call mklibname,Ice) - TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -endif +LIBFILENAME = $(call mklibfilename,Ice,$(VERSION)) +SONAME = $(call mksoname,Ice,$(SOVERSION)) +LIBNAME = $(call mklibname,Ice) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = Acceptor.o \ Application.o \ @@ -123,12 +116,11 @@ OBJS = Acceptor.o \ UdpTransceiver.o \ Version.o -ifneq ($(MinGW), yes) +ifeq ($(findstring MINGW,$(shell uname)),) OBJS := $(OBJS) \ SysLoggerI.o endif - SRCS = $(OBJS:.o=.cpp) \ DLLMain.cpp @@ -178,18 +170,18 @@ SDIR = $(slicedir)/Ice include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) -DICE_API_EXPORTS $(BZIP2_FLAGS) +ifneq ($(COMPSUFFIX),) +CPPFLAGS := $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\" +endif SLICE2CPPFLAGS := --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -ifeq ($(MinGW), yes) -CPPFLAGS := $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\" -LINKWITH := $(ICE_OS_LIBS) -l$(ICEUTIL_LIBNAME) $(BZIP2_LIBS) -$(DLLNAME): $(OBJS) - $(CXX) -shared $(LDFLAGS) -o $(DLLNAME) $(OBJS) $(LINKWITH) +LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICONV_LIBS) $(ICE_OS_LIBS) -install:: all - $(call installprogram,$(DLLNAME),$(install_bindir)) +ifeq ($(STATICLIBS),yes) +$(libdir)/$(LIBNAME): $(OBJS) + rm -f $@ + $(call mklib,$@,$(OBJS)) else -LINKWITH := -lIceUtil $(BZIP2_LIBS) $(ICONV_LIBS) $(ICE_OS_LIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -201,9 +193,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ln -s $(SONAME) $@ +endif install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) -endif include .depend diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index ab2d6ca690b..0ceb0bfe450 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -12,15 +12,10 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules.common -ifeq ($(MinGW), yes) - DLLNAME = $(top_srcdir)/bin/icessl$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll - TARGETS = $(DLLNAME) $(LIBNAME) -else - LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) - SONAME = $(call mksoname,IceSSL,$(SOVERSION)) - LIBNAME = $(call mklibname,IceSSL) - TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -endif +LIBFILENAME = $(call mklibfilename,IceSSL,$(VERSION)) +SONAME = $(call mksoname,IceSSL,$(SOVERSION)) +LIBNAME = $(call mklibname,IceSSL) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = AcceptorI.o \ Certificate.o \ @@ -48,19 +43,13 @@ 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) -ifeq ($(MinGW), yes) - -LINKWITH := -lice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX) -liceutil$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX) $(ICE_OS_LIBS) $(OPENSSL_LIBS) - -$(DLLNAME): $(OBJS) - $(CXX) -shared $(LDFLAGS) -o $(DLLNAME) $(OBJS) $(LINKWITH) - -install:: all - $(call installprogram,$(DLLNAME),$(install_bindir)) - -else LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_LIBS) $(CXXLIBS) +ifeq ($(STATICLIBS),yes) +$(libdir)/$(LIBNAME): $(OBJS) + rm -f $@ + $(call mklib,$@,$(OBJS)) +else $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) @@ -72,9 +61,9 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ln -s $(SONAME) $@ +endif install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) -endif include .depend diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index a3e19c0914f..ac76f2362c1 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -9,17 +9,10 @@ top_srcdir = ../.. -include $(top_srcdir)/config/Make.rules.common - -ifeq ($(MinGW), yes) - DLLNAME = $(top_srcdir)/bin/iceutil$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll - TARGETS = $(DLLNAME) $(LIBNAME) -else - LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) - SONAME = $(call mksoname,IceUtil,$(SOVERSION)) - LIBNAME = $(call mklibname,IceUtil) - TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -endif +LIBFILENAME = $(call mklibfilename,IceUtil,$(VERSION)) +SONAME = $(call mksoname,IceUtil,$(SOVERSION)) +LIBNAME = $(call mklibname,IceUtil) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = ArgVector.o \ Cond.o \ @@ -48,16 +41,8 @@ SRCS = $(OBJS:.o=.cpp) include $(top_srcdir)/config/Make.rules CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. - LINKWITH := $(ICEUTIL_OS_LIBS) -ifeq ($(MinGW), yes) -$(DLLNAME): $(OBJS) - $(CXX) -shared $(LDFLAGS) -o $(DLLNAME) $(OBJS) $(LINKWITH) - -install:: all - $(call installprogram,$(DLLNAME),$(install_bindir)) -else ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) rm -f $@ @@ -75,9 +60,9 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ln -s $(SONAME) $@ endif + install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) -endif include .depend diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 3c8cca006d0..610d72eeda3 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -11,16 +11,15 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules - -ifeq ($(MinGW), yes) - SUBDIRS = IceUtil \ +ifneq ($(findstring MINGW,$(UNAME)),) + SUBDIRS = IceUtil \ Slice \ slice2cpp \ slice2rb \ Ice \ IceSSL else - SUBDIRS = IceUtil \ + SUBDIRS = IceUtil \ Slice \ slice2cpp \ slice2cs \ diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index f07c97d1340..62121860458 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -11,15 +11,10 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules.common -ifeq ($(MinGW), yes) - DLLNAME = $(top_srcdir)/bin/slice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll - TARGETS = $(DLLNAME) $(LIBNAME) -else - LIBFILENAME = $(call mklibfilename,Slice,$(VERSION)) - SONAME = $(call mksoname,Slice,$(SOVERSION)) - LIBNAME = $(call mklibname,Slice) - TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -endif +LIBFILENAME = $(call mklibfilename,Slice,$(VERSION)) +SONAME = $(call mksoname,Slice,$(SOVERSION)) +LIBNAME = $(call mklibname,Slice) +TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) OBJS = Scanner.o \ ../Slice/Grammar.o \ @@ -46,15 +41,7 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS BISONFLAGS := --name-prefix "slice_" $(BISONFLAGS) -ifeq ($(MinGW), yes) -LINKWITH := -l$(ICEUTIL_LIBNAME) $(MCPP_LIBS) -$(DLLNAME): $(OBJS) - $(CXX) -shared $(LDFLAGS) -o $(DLLNAME) $(OBJS) $(LINKWITH) - -install:: all - $(call installprogram,$(DLLNAME),$(install_bindir)) -else -LINKWITH := -lIceUtil $(MCPP_LIBS) +LINKWITH := $(BASELIBS) $(MCPP_LIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) rm -f $@ @@ -71,7 +58,7 @@ $(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) rm -f $@ ln -s $(SONAME) $@ -endif + install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) endif diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index ac690206e08..bf617791faa 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -25,7 +25,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index 167f35e7dc8..573f53d96d0 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -9,13 +9,7 @@ top_srcdir = ../.. -include $(top_srcdir)/config/Make.rules.common - -ifeq ($(MinGW), yes) - NAME = $(top_srcdir)/bin/slice2cpp.exe -else - NAME = $(top_srcdir)/bin/slice2cpp -endif +NAME = $(top_srcdir)/bin/slice2cpp TARGETS = $(NAME) @@ -28,15 +22,10 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. $(CPPFLAGS) -ifeq ($(MinGW), yes) -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lslice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX) $(BASELIBS) $(MCPP_RPATH_LINK) -else $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) -endif + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) + install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index 8a9cfd14b3f..594b421e61c 100644 --- a/cpp/src/slice2cs/Makefile +++ b/cpp/src/slice2cs/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index c692a294270..38750f627e0 100644 --- a/cpp/src/slice2freeze/Makefile +++ b/cpp/src/slice2freeze/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index afe12524b0e..a65bda333a8 100644 --- a/cpp/src/slice2freezej/Makefile +++ b/cpp/src/slice2freezej/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile index 40f75120396..2caeaa9a23e 100644 --- a/cpp/src/slice2html/Makefile +++ b/cpp/src/slice2html/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index b834a9d94df..c39eb6c9375 100644 --- a/cpp/src/slice2java/Makefile +++ b/cpp/src/slice2java/Makefile @@ -24,7 +24,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2php/Makefile b/cpp/src/slice2php/Makefile index 34418b68ee5..0610db0ffc6 100644 --- a/cpp/src/slice2php/Makefile +++ b/cpp/src/slice2php/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile index 12472ff7104..1a549ecbdd1 100644 --- a/cpp/src/slice2py/Makefile +++ b/cpp/src/slice2py/Makefile @@ -23,7 +23,7 @@ CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile index 1e4df68e074..f3cd62653a3 100644 --- a/cpp/src/slice2rb/Makefile +++ b/cpp/src/slice2rb/Makefile @@ -9,13 +9,7 @@ top_srcdir = ../.. -include $(top_srcdir)/config/Make.rules.common - -ifeq ($(MinGW), yes) - NAME = $(top_srcdir)/bin/slice2rb.exe -else - NAME = $(top_srcdir)/bin/slice2rb -endif +NAME = $(top_srcdir)/bin/slice2rb TARGETS = $(NAME) @@ -27,15 +21,9 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. $(CPPFLAGS) -ifeq ($(MinGW), yes) -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lslice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX) $(BASELIBS) $(MCPP_RPATH_LINK) -else $(NAME): $(OBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(MCPP_RPATH_LINK) -endif + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SLICE_LIBS) $(MCPP_RPATH_LINK) install:: all $(call installprogram,$(NAME),$(install_bindir)) |