diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2008-03-24 20:06:21 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2008-03-24 20:06:21 -0230 |
commit | af46d194bc0b1734f965472519bb0aaa9e925ffe (patch) | |
tree | 8edf2f2a4c0aba7034b1963efbac36ed131c7128 /cppe/src | |
parent | MEF email (diff) | |
download | ice-af46d194bc0b1734f965472519bb0aaa9e925ffe.tar.bz2 ice-af46d194bc0b1734f965472519bb0aaa9e925ffe.tar.xz ice-af46d194bc0b1734f965472519bb0aaa9e925ffe.zip |
Bug 2911 - convert *.mak to dos
Diffstat (limited to 'cppe/src')
-rwxr-xr-x | cppe/src/IceE/Makefile.mak | 292 | ||||
-rwxr-xr-x | cppe/src/IceEC/Makefile.mak | 264 | ||||
-rwxr-xr-x | cppe/src/Makefile.mak | 42 |
3 files changed, 299 insertions, 299 deletions
diff --git a/cppe/src/IceE/Makefile.mak b/cppe/src/IceE/Makefile.mak index dee82e90576..65ec01fc90c 100755 --- a/cppe/src/IceE/Makefile.mak +++ b/cppe/src/IceE/Makefile.mak @@ -1,146 +1,146 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\icee$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icee$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -TRANSPORT_DIR = $(top_srcdir)\src\TcpTransport - -TRANSPORT_OBJS = Acceptor.obj \ - Connector.obj \ - EndpointFactory.obj \ - TcpEndpoint.obj \ - Transceiver.obj - -LOCAL_OBJS = BasicStream.obj \ - Buffer.obj \ - BuiltinSequences.obj \ - Communicator.obj \ - Cond.obj \ - Connection.obj \ - ConvertUTF.obj \ - Current.obj \ - DefaultsAndOverrides.obj \ - Endpoint.obj \ - ExceptionBase.obj \ - FactoryTable.obj \ - FactoryTableDef.obj \ - Identity.obj \ - Incoming.obj \ - IncomingConnectionFactory.obj \ - Initialize.obj \ - Instance.obj \ - LocalException.obj \ - Locator.obj \ - LocatorInfo.obj \ - Logger.obj \ - LoggerI.obj \ - LoggerUtil.obj \ - Network.obj \ - Object.obj \ - ObjectAdapter.obj \ - ObjectAdapterFactory.obj \ - OperationMode.obj \ - Outgoing.obj \ - OutgoingConnectionFactory.obj \ - Properties.obj \ - Protocol.obj \ - Proxy.obj \ - ProxyFactory.obj \ - RecMutex.obj \ - Reference.obj \ - ReferenceFactory.obj \ - Router.obj \ - RouterInfo.obj \ - SafeStdio.obj \ - ServantManager.obj \ - Shared.obj \ - StaticMutex.obj \ - StringConverter.obj \ - StringUtil.obj \ - Thread.obj \ - ThreadException.obj \ - Time.obj \ - TraceLevels.obj \ - TraceUtil.obj \ - UnknownEndpoint.obj \ - Unicode.obj \ - UUID.obj - -SRCS = $(LOCAL_OBJS:.obj=.cpp) \ - $(TRANSPORT_DIR)\Acceptor.cpp \ - $(TRANSPORT_DIR)\Connector.cpp \ - $(TRANSPORT_DIR)\EndpointFactory.cpp \ - $(TRANSPORT_DIR)\TcpEndpoint.cpp \ - $(TRANSPORT_DIR)\Transceiver.cpp - - -HDIR = $(includedir)\IceE -SDIR = $(slicedir)\IceE - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -WX -DWIN32_LEAN_AND_MEAN -SLICE2CPPEFLAGS = --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS) - -!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -{$(TRANSPORT_DIR)\}.cpp.obj:: - $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $< - -!if "$(STATICLIBS)" == "yes" - -$(DLLNAME): - -$(LIBNAME): $(LOCAL_OBJS) $(TRANSPORT_OBJS) - $(AR) $(ARFLAGS) $(PDBFLAGS) $(LOCAL_OBJS) $(TRANSPORT_OBJS) /out:$(LIBNAME) - -!else - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(LOCAL_OBJS) $(TRANSPORT_OBJS) - $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(LOCAL_OBJS) $(TRANSPORT_OBJS) /out:$(DLLNAME) $(BASELIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -!endif - -clean:: - del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h - del /q Identity.cpp $(HDIR)\Identity.h - del /q LocatorF.cpp $(HDIR)\LocatorF.h - del /q Locator.cpp $(HDIR)\Locator.h - del /q RouterF.cpp $(HDIR)\RouterF.h - del /q Router.cpp $(HDIR)\Router.h - del /q $(LIBNAME:.lib=.*) - -install:: all - copy $(LIBNAME) $(install_libdir) - -!if "$(STATICLIBS)" != "yes" - -clean:: - del /q $(DLLNAME:.dll=.*) - -install:: all - copy $(LIBNAME) $(install_libdir) - copy $(DLLNAME) $(install_bindir) - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\icee$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\icee$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+TRANSPORT_DIR = $(top_srcdir)\src\TcpTransport
+
+TRANSPORT_OBJS = Acceptor.obj \
+ Connector.obj \
+ EndpointFactory.obj \
+ TcpEndpoint.obj \
+ Transceiver.obj
+
+LOCAL_OBJS = BasicStream.obj \
+ Buffer.obj \
+ BuiltinSequences.obj \
+ Communicator.obj \
+ Cond.obj \
+ Connection.obj \
+ ConvertUTF.obj \
+ Current.obj \
+ DefaultsAndOverrides.obj \
+ Endpoint.obj \
+ ExceptionBase.obj \
+ FactoryTable.obj \
+ FactoryTableDef.obj \
+ Identity.obj \
+ Incoming.obj \
+ IncomingConnectionFactory.obj \
+ Initialize.obj \
+ Instance.obj \
+ LocalException.obj \
+ Locator.obj \
+ LocatorInfo.obj \
+ Logger.obj \
+ LoggerI.obj \
+ LoggerUtil.obj \
+ Network.obj \
+ Object.obj \
+ ObjectAdapter.obj \
+ ObjectAdapterFactory.obj \
+ OperationMode.obj \
+ Outgoing.obj \
+ OutgoingConnectionFactory.obj \
+ Properties.obj \
+ Protocol.obj \
+ Proxy.obj \
+ ProxyFactory.obj \
+ RecMutex.obj \
+ Reference.obj \
+ ReferenceFactory.obj \
+ Router.obj \
+ RouterInfo.obj \
+ SafeStdio.obj \
+ ServantManager.obj \
+ Shared.obj \
+ StaticMutex.obj \
+ StringConverter.obj \
+ StringUtil.obj \
+ Thread.obj \
+ ThreadException.obj \
+ Time.obj \
+ TraceLevels.obj \
+ TraceUtil.obj \
+ UnknownEndpoint.obj \
+ Unicode.obj \
+ UUID.obj
+
+SRCS = $(LOCAL_OBJS:.obj=.cpp) \
+ $(TRANSPORT_DIR)\Acceptor.cpp \
+ $(TRANSPORT_DIR)\Connector.cpp \
+ $(TRANSPORT_DIR)\EndpointFactory.cpp \
+ $(TRANSPORT_DIR)\TcpEndpoint.cpp \
+ $(TRANSPORT_DIR)\Transceiver.cpp
+
+
+HDIR = $(includedir)\IceE
+SDIR = $(slicedir)\IceE
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -WX -DWIN32_LEAN_AND_MEAN
+SLICE2CPPEFLAGS = --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS)
+
+!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+{$(TRANSPORT_DIR)\}.cpp.obj::
+ $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(LOCAL_OBJS) $(TRANSPORT_OBJS)
+ $(AR) $(ARFLAGS) $(PDBFLAGS) $(LOCAL_OBJS) $(TRANSPORT_OBJS) /out:$(LIBNAME)
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(LOCAL_OBJS) $(TRANSPORT_OBJS)
+ $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(LOCAL_OBJS) $(TRANSPORT_OBJS) /out:$(DLLNAME) $(BASELIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+!endif
+
+clean::
+ del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
+ del /q Identity.cpp $(HDIR)\Identity.h
+ del /q LocatorF.cpp $(HDIR)\LocatorF.h
+ del /q Locator.cpp $(HDIR)\Locator.h
+ del /q RouterF.cpp $(HDIR)\RouterF.h
+ del /q Router.cpp $(HDIR)\Router.h
+ del /q $(LIBNAME:.lib=.*)
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+
+!if "$(STATICLIBS)" != "yes"
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+ copy $(DLLNAME) $(install_bindir)
+
+!endif
+
+!include .depend
diff --git a/cppe/src/IceEC/Makefile.mak b/cppe/src/IceEC/Makefile.mak index 13084e55887..f86d72dbc1b 100755 --- a/cppe/src/IceEC/Makefile.mak +++ b/cppe/src/IceEC/Makefile.mak @@ -1,132 +1,132 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -LIBNAME = $(top_srcdir)\lib\iceec$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\iceec$(SOVERSION)$(LIBSUFFIX).dll - -TARGETS = $(LIBNAME) $(DLLNAME) - -TRANSPORT_DIR = $(top_srcdir)\src\TcpTransport -ICEE_DIR = $(top_srcdir)\src\IceE - -TRANSPORT_OBJS = Connector.obj \ - EndpointFactory.obj \ - TcpEndpoint.obj \ - Transceiver.obj - -ICEE_OBJS = BasicStream.obj \ - Buffer.obj \ - BuiltinSequences.obj \ - Communicator.obj \ - Cond.obj \ - Connection.obj \ - ConvertUTF.obj \ - DefaultsAndOverrides.obj \ - Endpoint.obj \ - ExceptionBase.obj \ - FactoryTable.obj \ - FactoryTableDef.obj \ - Identity.obj \ - Initialize.obj \ - Instance.obj \ - LocalException.obj \ - Locator.obj \ - LocatorInfo.obj \ - Logger.obj \ - LoggerI.obj \ - LoggerUtil.obj \ - Network.obj \ - OperationMode.obj \ - Outgoing.obj \ - OutgoingConnectionFactory.obj \ - Properties.obj \ - Protocol.obj \ - Proxy.obj \ - ProxyFactory.obj \ - RecMutex.obj \ - Reference.obj \ - ReferenceFactory.obj \ - Router.obj \ - RouterInfo.obj \ - SafeStdio.obj \ - Shared.obj \ - StaticMutex.obj \ - StringConverter.obj \ - StringUtil.obj \ - Thread.obj \ - ThreadException.obj \ - Time.obj \ - TraceLevels.obj \ - TraceUtil.obj \ - UnknownEndpoint.obj \ - Unicode.obj - -HDIR = $(includedir)\IceE -SDIR = $(slicedir)\IceE - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DICEE_PURE_CLIENT -DWIN32_LEAN_AND_MEAN -SLICE2CPPEFLAGS = --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS) - -!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) -!endif - -{$(SDIR)\}.ice{$(HDIR)}.h: - del /q $(HDIR)\$(*F).h $(ICEE_DIR)\$(*F).cpp - $(SLICE2CPP) $(SLICE2CPPEFLAGS) $< - move $(*F).h $(HDIR) - move $(*F).cpp $(ICEE_DIR) - -{$(TRANSPORT_DIR)\}.cpp.obj:: - $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $< - -{$(ICEE_DIR)\}.cpp.obj:: - $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $< - -!if "$(STATICLIBS)" == "yes" - -$(DLLNAME): - -$(LIBNAME): $(ICEE_OBJS) $(TRANSPORT_OBJS) - $(AR) $(ARFLAGS) $(PDBFLAGS) $(ICEE_OBJS) $(TRANSPORT_OBJS) /out:$(LIBNAME) - -!else - -$(LIBNAME): $(DLLNAME) - -$(DLLNAME): $(ICEE_OBJS) $(TRANSPORT_OBJS) - $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(ICEE_OBJS) $(TRANSPORT_OBJS) /out:$(DLLNAME) $(BASELIBS) - move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest - @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) - -!endif - -clean:: - del /q $(LIBNAME:.lib=.*) - -install:: all - copy $(LIBNAME) $(install_libdir) - -!if "$(STATICLIBS)" != "yes" - -clean:: - del /q $(DLLNAME:.dll=.*) - -install:: all - copy $(DLLNAME) $(install_bindir) - -!endif - -!include .depend +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..
+
+LIBNAME = $(top_srcdir)\lib\iceec$(LIBSUFFIX).lib
+DLLNAME = $(top_srcdir)\bin\iceec$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS = $(LIBNAME) $(DLLNAME)
+
+TRANSPORT_DIR = $(top_srcdir)\src\TcpTransport
+ICEE_DIR = $(top_srcdir)\src\IceE
+
+TRANSPORT_OBJS = Connector.obj \
+ EndpointFactory.obj \
+ TcpEndpoint.obj \
+ Transceiver.obj
+
+ICEE_OBJS = BasicStream.obj \
+ Buffer.obj \
+ BuiltinSequences.obj \
+ Communicator.obj \
+ Cond.obj \
+ Connection.obj \
+ ConvertUTF.obj \
+ DefaultsAndOverrides.obj \
+ Endpoint.obj \
+ ExceptionBase.obj \
+ FactoryTable.obj \
+ FactoryTableDef.obj \
+ Identity.obj \
+ Initialize.obj \
+ Instance.obj \
+ LocalException.obj \
+ Locator.obj \
+ LocatorInfo.obj \
+ Logger.obj \
+ LoggerI.obj \
+ LoggerUtil.obj \
+ Network.obj \
+ OperationMode.obj \
+ Outgoing.obj \
+ OutgoingConnectionFactory.obj \
+ Properties.obj \
+ Protocol.obj \
+ Proxy.obj \
+ ProxyFactory.obj \
+ RecMutex.obj \
+ Reference.obj \
+ ReferenceFactory.obj \
+ Router.obj \
+ RouterInfo.obj \
+ SafeStdio.obj \
+ Shared.obj \
+ StaticMutex.obj \
+ StringConverter.obj \
+ StringUtil.obj \
+ Thread.obj \
+ ThreadException.obj \
+ Time.obj \
+ TraceLevels.obj \
+ TraceUtil.obj \
+ UnknownEndpoint.obj \
+ Unicode.obj
+
+HDIR = $(includedir)\IceE
+SDIR = $(slicedir)\IceE
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DICEE_PURE_CLIENT -DWIN32_LEAN_AND_MEAN
+SLICE2CPPEFLAGS = --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS)
+
+!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
+PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+{$(SDIR)\}.ice{$(HDIR)}.h:
+ del /q $(HDIR)\$(*F).h $(ICEE_DIR)\$(*F).cpp
+ $(SLICE2CPP) $(SLICE2CPPEFLAGS) $<
+ move $(*F).h $(HDIR)
+ move $(*F).cpp $(ICEE_DIR)
+
+{$(TRANSPORT_DIR)\}.cpp.obj::
+ $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
+
+{$(ICEE_DIR)\}.cpp.obj::
+ $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(ICEE_OBJS) $(TRANSPORT_OBJS)
+ $(AR) $(ARFLAGS) $(PDBFLAGS) $(ICEE_OBJS) $(TRANSPORT_OBJS) /out:$(LIBNAME)
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(ICEE_OBJS) $(TRANSPORT_OBJS)
+ $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(ICEE_OBJS) $(TRANSPORT_OBJS) /out:$(DLLNAME) $(BASELIBS)
+ move $(DLLNAME:.dll=.lib) $(LIBNAME)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+ @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+!endif
+
+clean::
+ del /q $(LIBNAME:.lib=.*)
+
+install:: all
+ copy $(LIBNAME) $(install_libdir)
+
+!if "$(STATICLIBS)" != "yes"
+
+clean::
+ del /q $(DLLNAME:.dll=.*)
+
+install:: all
+ copy $(DLLNAME) $(install_bindir)
+
+!endif
+
+!include .depend
diff --git a/cppe/src/Makefile.mak b/cppe/src/Makefile.mak index 84baeb66df8..f5b24b6e38e 100755 --- a/cppe/src/Makefile.mak +++ b/cppe/src/Makefile.mak @@ -1,21 +1,21 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -!include $(top_srcdir)/config/Make.rules.mak - -SUBDIRS = IceE \ - IceEC - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @if exist %i \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +# **********************************************************************
+#
+# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SUBDIRS = IceE \
+ IceEC
+
+$(EVERYTHING)::
+ @for %i in ( $(SUBDIRS) ) do \
+ @if exist %i \
+ @echo "making $@ in %i" && \
+ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
|