Bug 2911 - convert *.mak to dos

16 files changed, 856 insertions, 856 deletions

diff --git a/cppe/test/Common/Makefile.mak b/cppe/test/Common/Makefile.mak
index 541a0e1f0a8..634ca4bf0a2 100755
--- a/cppe/test/Common/Makefile.mak
+++ b/cppe/test/Common/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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\testcommon$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\testcommon$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS  		= TestCommon.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-		
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\include $(CPPFLAGS) -DICE_TEST_COMMON_API_EXPORTS
-
-!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(EMBEDDED_DEVICE)" != ""
-LIBS		= $(LIBS) 
-!endif
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-        $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) /out:$(LIBNAME)
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS)
-	$(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(OBJS) /out:$(DLLNAME) $(LIBS)
-	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:.dll=.*)
-
-!if "$(STATICLIBS)" != "yes"
-
-clean::
-	del /q $(DLLNAME:.dll=.*)
-
-!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\testcommon$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\testcommon$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS		= $(LIBNAME) $(DLLNAME)

+

+OBJS  		= TestCommon.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+		

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\include $(CPPFLAGS) -DICE_TEST_COMMON_API_EXPORTS

+

+!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+!if "$(EMBEDDED_DEVICE)" != ""

+LIBS		= $(LIBS) 

+!endif

+

+!if "$(STATICLIBS)" == "yes"

+

+$(DLLNAME):

+

+$(LIBNAME): $(OBJS)

+        $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) /out:$(LIBNAME)

+

+!else

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS)

+	$(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(OBJS) /out:$(DLLNAME) $(LIBS)

+	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:.dll=.*)

+

+!if "$(STATICLIBS)" != "yes"

+

+clean::

+	del /q $(DLLNAME:.dll=.*)

+

+!endif

+

+!include .depend

diff --git a/cppe/test/IceE/Makefile.mak b/cppe/test/IceE/Makefile.mak
index b933a578736..833bcb97cb8 100644
--- a/cppe/test/IceE/Makefile.mak
+++ b/cppe/test/IceE/Makefile.mak
@@ -1,35 +1,35 @@
-# **********************************************************************
-#
-# 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		= proxy \
-                  operations \
-		  exceptions \
-		  inheritance \
-		  facets \
-		  location \
-		  slicing \
-		  custom \
-		  retry \
-		  thread \
-		  uuid
-
-!if "$(EMBEDDED_DEVICE)" == ""
-SUBDIRS		= $(SUBDIRS) \
-		  faultTolerance \
-		  adapterDeactivation \
-!endif
-
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @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		= proxy \

+                  operations \

+		  exceptions \

+		  inheritance \

+		  facets \

+		  location \

+		  slicing \

+		  custom \

+		  retry \

+		  thread \

+		  uuid

+

+!if "$(EMBEDDED_DEVICE)" == ""

+SUBDIRS		= $(SUBDIRS) \

+		  faultTolerance \

+		  adapterDeactivation \

+!endif

+

+$(EVERYTHING)::

+	@for %i in ( $(SUBDIRS) ) do \

+	    @echo "making $@ in %i" && \

+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1

diff --git a/cppe/test/IceE/adapterDeactivation/Makefile.mak b/cppe/test/IceE/adapterDeactivation/Makefile.mak
index d41e817c9a1..197e390a001 100644
--- a/cppe/test/IceE/adapterDeactivation/Makefile.mak
+++ b/cppe/test/IceE/adapterDeactivation/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/custom/Makefile.mak b/cppe/test/IceE/custom/Makefile.mak
index 53025cc6d27..712f846660a 100644
--- a/cppe/test/IceE/custom/Makefile.mak
+++ b/cppe/test/IceE/custom/Makefile.mak
@@ -1,76 +1,76 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS           = Test.obj \
-		  Wstring.obj \
-		  Client.obj \
-		  AllTests.obj \
-		  MyByteSeq.obj \
-		  StringConverterI.obj
-
-SOBJS           = Test.obj \
-		  Wstring.obj \
-		  TestI.obj \
-		  WstringI.obj \
-		  Server.obj \
-		  MyByteSeq.obj \
-		  StringConverterI.obj
-
-COLOBJS         = Test.obj \
-		  Wstring.obj \
-		  TestI.obj \
-		  WstringI.obj \
-		  Collocated.obj \
-		  AllTests.obj \
-		  MyByteSeq.obj \
-		  StringConverterI.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -Zm200 -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-	del /q Wstring.cpp Wstring.h
-	del /q WstringAMD.cpp WstringAMD.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS           = Test.obj \

+		  Wstring.obj \

+		  Client.obj \

+		  AllTests.obj \

+		  MyByteSeq.obj \

+		  StringConverterI.obj

+

+SOBJS           = Test.obj \

+		  Wstring.obj \

+		  TestI.obj \

+		  WstringI.obj \

+		  Server.obj \

+		  MyByteSeq.obj \

+		  StringConverterI.obj

+

+COLOBJS         = Test.obj \

+		  Wstring.obj \

+		  TestI.obj \

+		  WstringI.obj \

+		  Collocated.obj \

+		  AllTests.obj \

+		  MyByteSeq.obj \

+		  StringConverterI.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -Zm200 -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+	del /q Wstring.cpp Wstring.h

+	del /q WstringAMD.cpp WstringAMD.h

+

+!include .depend

diff --git a/cppe/test/IceE/exceptions/Makefile.mak b/cppe/test/IceE/exceptions/Makefile.mak
index d41e817c9a1..197e390a001 100644
--- a/cppe/test/IceE/exceptions/Makefile.mak
+++ b/cppe/test/IceE/exceptions/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/facets/Makefile.mak b/cppe/test/IceE/facets/Makefile.mak
index d41e817c9a1..197e390a001 100644
--- a/cppe/test/IceE/facets/Makefile.mak
+++ b/cppe/test/IceE/facets/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/faultTolerance/Makefile.mak b/cppe/test/IceE/faultTolerance/Makefile.mak
index d6866d0dd04..f684dc5fe89 100644
--- a/cppe/test/IceE/faultTolerance/Makefile.mak
+++ b/cppe/test/IceE/faultTolerance/Makefile.mak
@@ -1,50 +1,50 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+

+TARGETS		= $(CLIENT) $(SERVER)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/inheritance/Makefile.mak b/cppe/test/IceE/inheritance/Makefile.mak
index d41e817c9a1..197e390a001 100644
--- a/cppe/test/IceE/inheritance/Makefile.mak
+++ b/cppe/test/IceE/inheritance/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/location/Makefile.mak b/cppe/test/IceE/location/Makefile.mak
index 16ce9b2fcec..97d7027769c 100644
--- a/cppe/test/IceE/location/Makefile.mak
+++ b/cppe/test/IceE/location/Makefile.mak
@@ -1,51 +1,51 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  ServerLocator.obj \
-		  Server.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+

+TARGETS		= $(CLIENT) $(SERVER)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  ServerLocator.obj \

+		  Server.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/operations/Makefile.mak b/cppe/test/IceE/operations/Makefile.mak
index 48b8c16b681..fe771745f43 100644
--- a/cppe/test/IceE/operations/Makefile.mak
+++ b/cppe/test/IceE/operations/Makefile.mak
@@ -1,67 +1,67 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj \
-		  Twoways.obj \
-		  BatchOneways.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj \
-		  Twoways.obj \
-		  BatchOneways.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj \

+		  Twoways.obj \

+		  BatchOneways.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj \

+		  Twoways.obj \

+		  BatchOneways.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/proxy/Makefile.mak b/cppe/test/IceE/proxy/Makefile.mak
index d41e817c9a1..197e390a001 100644
--- a/cppe/test/IceE/proxy/Makefile.mak
+++ b/cppe/test/IceE/proxy/Makefile.mak
@@ -1,63 +1,63 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
-
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-COLOBJS		= Test.obj \
-		  TestI.obj \
-		  Collocated.obj \
-		  AllTests.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+COLLOCATED	= collocated.exe

+

+TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+COLOBJS		= Test.obj \

+		  TestI.obj \

+		  Collocated.obj \

+		  AllTests.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp) \

+		  $(COLOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(COLLOCATED): $(COLOBJS)

+	$(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/retry/Makefile.mak b/cppe/test/IceE/retry/Makefile.mak
index d6866d0dd04..f684dc5fe89 100644
--- a/cppe/test/IceE/retry/Makefile.mak
+++ b/cppe/test/IceE/retry/Makefile.mak
@@ -1,50 +1,50 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-		  TestI.obj \
-		  Server.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+

+TARGETS		= $(CLIENT) $(SERVER)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+		  TestI.obj \

+		  Server.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+

+!include .depend

diff --git a/cppe/test/IceE/slicing/Makefile.mak b/cppe/test/IceE/slicing/Makefile.mak
index cf2171020e1..a79bc420c2b 100755
--- a/cppe/test/IceE/slicing/Makefile.mak
+++ b/cppe/test/IceE/slicing/Makefile.mak
@@ -1,53 +1,53 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-COBJS		= Test.obj \
-		  Client.obj \
-		  AllTests.obj
-
-SOBJS		= Test.obj \
-    		  ServerPrivate.obj \
-		  TestI.obj \
-		  Server.obj
-
-SRCS		= $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SLICE2CPPEFLAGS	= -I. $(SLICE2CPPEFLAGS)
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
-	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
-	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
-	del /q Test.cpp Test.h
-	del /q ServerPrivate.cpp ServerPrivate.h
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+SERVER		= server.exe

+

+TARGETS		= $(CLIENT) $(SERVER)

+

+COBJS		= Test.obj \

+		  Client.obj \

+		  AllTests.obj

+

+SOBJS		= Test.obj \

+    		  ServerPrivate.obj \

+		  TestI.obj \

+		  Server.obj

+

+SRCS		= $(COBJS:.obj=.cpp) \

+		  $(SOBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+SLICE2CPPEFLAGS	= -I. $(SLICE2CPPEFLAGS)

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)

+!endif

+

+$(CLIENT): $(COBJS)

+	$(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+$(SERVER): $(SOBJS)

+	$(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+clean::

+	del /q Test.cpp Test.h

+	del /q ServerPrivate.cpp ServerPrivate.h

+

+!include .depend

diff --git a/cppe/test/IceE/thread/Makefile.mak b/cppe/test/IceE/thread/Makefile.mak
index d7dc720750a..e80670979e1 100644
--- a/cppe/test/IceE/thread/Makefile.mak
+++ b/cppe/test/IceE/thread/Makefile.mak
@@ -1,43 +1,43 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-
-TARGETS		= $(CLIENT)
-
-OBJS		= TestBase.obj \
-		  CreateTest.obj \
-		  AliveTest.obj \
-		  StartTest.obj \
-		  RecMutexTest.obj \
-		  StaticMutexTest.obj \
-		  MutexTest.obj \
-		  MonitorMutexTest.obj \
-		  MonitorRecMutexTest.obj \
-		  TestSuite.obj \
-		  Client.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS)
-	$(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+

+TARGETS		= $(CLIENT)

+

+OBJS		= TestBase.obj \

+		  CreateTest.obj \

+		  AliveTest.obj \

+		  StartTest.obj \

+		  RecMutexTest.obj \

+		  StaticMutexTest.obj \

+		  MutexTest.obj \

+		  MonitorMutexTest.obj \

+		  MonitorRecMutexTest.obj \

+		  TestSuite.obj \

+		  Client.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+PDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+!endif

+

+$(CLIENT): $(OBJS)

+	$(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+!include .depend

diff --git a/cppe/test/IceE/uuid/Makefile.mak b/cppe/test/IceE/uuid/Makefile.mak
index a76017c1e12..d748371ff93 100644
--- a/cppe/test/IceE/uuid/Makefile.mak
+++ b/cppe/test/IceE/uuid/Makefile.mak
@@ -1,33 +1,33 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-CLIENT		= client.exe
-
-TARGETS		= $(CLIENT)
-
-OBJS		= Client.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS)
-	$(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-!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	= ..\..\..

+

+CLIENT		= client.exe

+

+TARGETS		= $(CLIENT)

+

+OBJS		= Client.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN

+

+!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"

+PDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)

+!endif

+

+$(CLIENT): $(OBJS)

+	$(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+

+!include .depend

diff --git a/cppe/test/Makefile.mak b/cppe/test/Makefile.mak
index c3cf8a3da30..a39b70e86ac 100755
--- a/cppe/test/Makefile.mak
+++ b/cppe/test/Makefile.mak
@@ -1,20 +1,20 @@
-# **********************************************************************
-#
-# 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		= Common \
-		  IceE
-
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @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		= Common \

+		  IceE

+

+$(EVERYTHING)::

+	@for %i in ( $(SUBDIRS) ) do \

+	    @echo "making $@ in %i" && \

+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1