28 files changed, 2670 insertions, 2670 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index ba975019bba..b77ffc77bdb 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -1,128 +1,128 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\freeze$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll
-
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-
-OBJS		= BackgroundSaveEvictor.obj \
-                  BackgroundSaveEvictorI.obj \
-                  CatalogData.obj \
-                  Catalog.obj \
-                  CatalogIndexList.obj \
-                  ConnectionI.obj \
-                  Connection.obj \
-		  DB.obj \
-		  EvictorI.obj \
-                  EvictorIteratorI.obj \
-		  Evictor.obj \
-		  EvictorStorage.obj \
-                  Exception.obj \
-                  IndexI.obj \
-                  Index.obj \
-                  MapDb.obj \
-	  	  MapI.obj \
-                  ObjectStore.obj \
-		  PingObject.obj \
-                  SharedDbEnv.obj \
-                  TransactionalEvictor.obj \
-                  TransactionalEvictorI.obj \
-                  TransactionalEvictorContext.obj \
-                  TransactionHolder.obj \
-                  TransactionI.obj \
-                  Transaction.obj \
-                  Util.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\Freeze
-SDIR		= $(slicedir)\Freeze
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
-LINKWITH	= $(LIBS) $(DB_LIBS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Freeze.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Freeze.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	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)
-
-$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
-	del /q $(HDIR)\Catalog.h Catalog.cpp
-	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
-	Catalog $(slicedir)/Freeze/CatalogData.ice
-	move Catalog.h $(HDIR)
-clean::
-	del /q $(HDIR)\Catalog.h Catalog.cpp
-
-
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
-	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
-	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
-	CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice
-	move CatalogIndexList.h $(HDIR)
-
-Freeze.res: Freeze.rc
-	rc.exe $(RCFLAGS) Freeze.rc
-
-clean::
-	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
-
-clean::
-	del /q $(DLLNAME:.dll=.*)
-	del /q DB.cpp $(HDIR)\DB.h
-	del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
-	del /q CatalogData.cpp $(HDIR)\CatalogData.h
-	del /q Connection.cpp $(HDIR)\Connection.h
-	del /q ConnectionF.cpp $(HDIR)\ConnectionF.h 
-	del /q Exception.cpp $(HDIR)\Exception.h
-	del /q EvictorF.cpp $(HDIR)\EvictorF.h
-	del /q Evictor.cpp $(HDIR)\Evictor.h
-	del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
-	del /q Transaction.cpp $(HDIR)\Transaction.h
-	del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
-	del /q PingObject.cpp PingObject.h
-	del /q Freeze.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\freeze$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll
+
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+
+OBJS		= BackgroundSaveEvictor.obj \
+                  BackgroundSaveEvictorI.obj \
+                  CatalogData.obj \
+                  Catalog.obj \
+                  CatalogIndexList.obj \
+                  ConnectionI.obj \
+                  Connection.obj \
+		  DB.obj \
+		  EvictorI.obj \
+                  EvictorIteratorI.obj \
+		  Evictor.obj \
+		  EvictorStorage.obj \
+                  Exception.obj \
+                  IndexI.obj \
+                  Index.obj \
+                  MapDb.obj \
+	  	  MapI.obj \
+                  ObjectStore.obj \
+		  PingObject.obj \
+                  SharedDbEnv.obj \
+                  TransactionalEvictor.obj \
+                  TransactionalEvictorI.obj \
+                  TransactionalEvictorContext.obj \
+                  TransactionHolder.obj \
+                  TransactionI.obj \
+                  Transaction.obj \
+                  Util.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\Freeze
+SDIR		= $(slicedir)\Freeze
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS	= --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
+LINKWITH	= $(LIBS) $(DB_LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Freeze.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Freeze.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	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)
+
+$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
+	del /q $(HDIR)\Catalog.h Catalog.cpp
+	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
+	Catalog $(slicedir)/Freeze/CatalogData.ice
+	move Catalog.h $(HDIR)
+clean::
+	del /q $(HDIR)\Catalog.h Catalog.cpp
+
+
+$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
+	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
+	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
+	CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice
+	move CatalogIndexList.h $(HDIR)
+
+Freeze.res: Freeze.rc
+	rc.exe $(RCFLAGS) Freeze.rc
+
+clean::
+	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
+
+clean::
+	del /q $(DLLNAME:.dll=.*)
+	del /q DB.cpp $(HDIR)\DB.h
+	del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
+	del /q CatalogData.cpp $(HDIR)\CatalogData.h
+	del /q Connection.cpp $(HDIR)\Connection.h
+	del /q ConnectionF.cpp $(HDIR)\ConnectionF.h 
+	del /q Exception.cpp $(HDIR)\Exception.h
+	del /q EvictorF.cpp $(HDIR)\EvictorF.h
+	del /q Evictor.cpp $(HDIR)\Evictor.h
+	del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
+	del /q Transaction.cpp $(HDIR)\Transaction.h
+	del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
+	del /q PingObject.cpp PingObject.h
+	del /q Freeze.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
index 00db110d7e8..61fd4574e54 100644
--- a/cpp/src/FreezeScript/Makefile.mak
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -1,111 +1,111 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-TRANSFORMDB	= $(top_srcdir)\bin\transformdb.exe
-DUMPDB		= $(top_srcdir)\bin\dumpdb.exe
-
-TARGETS		= $(TRANSFORMDB) $(DUMPDB)
-
-COMMON_OBJS	= Grammar.obj \
-		  Scanner.obj \
-		  AssignVisitor.obj \
-		  Data.obj \
-		  Error.obj \
-		  Functions.obj \
-		  Exception.obj \
-		  Parser.obj \
-		  Print.obj \
-		  Util.obj
-
-TRANSFORM_OBJS	= TransformAnalyzer.obj \
-		  TransformVisitor.obj \
-		  Transformer.obj \
-		  transformdb.obj
-
-DUMP_OBJS	= DumpDescriptors.obj \
-		  DumpDB.obj
-
-SRCS		= $(COMMON_OBJS:.obj=.cpp) $(TRANSFORM_OBJS:.obj=.cpp) $(DUMP_OBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\FreezeScript
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-LINKWITH	= slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-TPDBFLAGS        = /pdb:$(TRANSFORMDB:.exe=.pdb)
-DPDBFLAGS        = /pdb:$(DUMPDB:.exe=.pdb)
-!endif
-
-$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res
-	$(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(LINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
-	$(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(LINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Scanner.cpp : Scanner.l
-	flex Scanner.l
-	del /q $@
-	echo #include "IceUtil/Config.h" > Scanner.cpp
-	type lex.yy.c >> Scanner.cpp
-	del /q lex.yy.c
-
-Grammar.cpp Grammar.h: Grammar.y
-	del /q Grammar.h Grammar.cpp
-	bison -dvt --name-prefix "freeze_script_" Grammar.y
-	move Grammar.tab.c Grammar.cpp
-	move Grammar.tab.h Grammar.h
-	del /q Grammar.output
-
-TransformDB.res: TransformDB.rc
-	rc.exe $(RCFLAGS) TransformDB.rc
-
-DumpDB.res: DumpDB.rc
-	rc.exe $(RCFLAGS) DumpDB.rc
-
-clean::
-	del /q $(TRANSFORMDB:.exe=.*)
-	del /q $(DUMPDB:.exe=.*)
-	del /q Grammar.cpp Grammar.h
-	del /q Scanner.cpp
-	del /q TransformDB.res DumpDB.res
-
-install:: all
-	copy $(TRANSFORMDB) $(install_bindir)
-	copy $(DUMPDB) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(TRANSFORMDB:.exe=.tds) $(install_bindir)
-	copy $(DUMPDB:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(TRANSFORMDB:.exe=.pdb) $(install_bindir)
-	copy $(DUMPDB:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+TRANSFORMDB	= $(top_srcdir)\bin\transformdb.exe
+DUMPDB		= $(top_srcdir)\bin\dumpdb.exe
+
+TARGETS		= $(TRANSFORMDB) $(DUMPDB)
+
+COMMON_OBJS	= Grammar.obj \
+		  Scanner.obj \
+		  AssignVisitor.obj \
+		  Data.obj \
+		  Error.obj \
+		  Functions.obj \
+		  Exception.obj \
+		  Parser.obj \
+		  Print.obj \
+		  Util.obj
+
+TRANSFORM_OBJS	= TransformAnalyzer.obj \
+		  TransformVisitor.obj \
+		  Transformer.obj \
+		  transformdb.obj
+
+DUMP_OBJS	= DumpDescriptors.obj \
+		  DumpDB.obj
+
+SRCS		= $(COMMON_OBJS:.obj=.cpp) $(TRANSFORM_OBJS:.obj=.cpp) $(DUMP_OBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\FreezeScript
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH	= slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+TPDBFLAGS        = /pdb:$(TRANSFORMDB:.exe=.pdb)
+DPDBFLAGS        = /pdb:$(DUMPDB:.exe=.pdb)
+!endif
+
+$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res
+	$(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) TransformDB.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)$(LINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res
+	$(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) DumpDB.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)$(LINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Scanner.cpp : Scanner.l
+	flex Scanner.l
+	del /q $@
+	echo #include "IceUtil/Config.h" > Scanner.cpp
+	type lex.yy.c >> Scanner.cpp
+	del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+	del /q Grammar.h Grammar.cpp
+	bison -dvt --name-prefix "freeze_script_" Grammar.y
+	move Grammar.tab.c Grammar.cpp
+	move Grammar.tab.h Grammar.h
+	del /q Grammar.output
+
+TransformDB.res: TransformDB.rc
+	rc.exe $(RCFLAGS) TransformDB.rc
+
+DumpDB.res: DumpDB.rc
+	rc.exe $(RCFLAGS) DumpDB.rc
+
+clean::
+	del /q $(TRANSFORMDB:.exe=.*)
+	del /q $(DUMPDB:.exe=.*)
+	del /q Grammar.cpp Grammar.h
+	del /q Scanner.cpp
+	del /q TransformDB.res DumpDB.res
+
+install:: all
+	copy $(TRANSFORMDB) $(install_bindir)
+	copy $(DUMPDB) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(TRANSFORMDB:.exe=.tds) $(install_bindir)
+	copy $(DUMPDB:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(TRANSFORMDB:.exe=.pdb) $(install_bindir)
+	copy $(DUMPDB:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak
index 8c958cc43fc..9e8c87fa454 100644
--- a/cpp/src/Glacier2/Makefile.mak
+++ b/cpp/src/Glacier2/Makefile.mak
@@ -1,141 +1,141 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\glacier2$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX).dll
-
-ROUTER		= $(top_srcdir)\bin\glacier2router.exe
-
-!ifdef BUILD_UTILS
-
-TARGETS         = $(ROUTER)
-
-!else
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-!endif
-
-OBJS		= PermissionsVerifier.obj \
-		  Router.obj \
-		  SSLInfo.obj \
-		  Session.obj
-
-ROBJS		= Blobject.obj \
-		  ClientBlobject.obj \
-		  CryptPermissionsVerifierI.obj \
-		  Glacier2Router.obj \
-		  Instance.obj \
-		  ProxyVerifier.obj \
-		  RequestQueue.obj \
-		  RouterI.obj \
-		  RoutingTable.obj \
-		  FilterI.obj \
-		  FilterManager.obj \
-		  ServerBlobject.obj \
-		  SessionRouterI.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(ROBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\Glacier2
-SDIR		= $(slicedir)\Glacier2
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-!ifdef BUILD_UTILS
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-LINKWITH 	= $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib
-!if "$(CPP_COMPILER)" != "BCC2006"
-LINKWITH	= $(LINKWITH) ws2_32.lib
-!endif
-
-!else
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS
-
-!endif
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-RPDBFLAGS       = /pdb:$(ROUTER:.exe=.pdb)
-!endif
-
-SLICE2CPPFLAGS	= --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Glacier2.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Glacier2.res $(PREOUT)$@ $(PRELIBS)$(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)
-
-$(ROUTER): $(ROBJS) Glacier2Router.res
-	$(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) Glacier2Router.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Glacier2.res: Glacier2.rc
-	rc.exe $(RCFLAGS) Glacier2.rc
-
-Glacier2Router.res: Glacier2Router.rc
-	rc.exe $(RCFLAGS) Glacier2Router.rc
-
-!ifdef BUILD_UTILS
-
-clean::
-	del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
-	del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
-	del /q RouterF.cpp $(HDIR)\RouterF.h
-	del /q Router.cpp $(HDIR)\Router.h
-	del /q SessionF.cpp $(HDIR)\SessionF.h
-	del /q Session.cpp $(HDIR)\Session.h
-	del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
-	del /q Glacier2Router.res Glacier2.res
-	del /q $(DLLNAME:.dll=.*)
-	del /q $(ROUTER:.exe=.*)
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-	copy $(ROUTER) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-	copy $(ROUTER:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-	copy $(ROUTER:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!else
-
-install:: all
-
-$(EVERYTHING)::
-	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\glacier2$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX).dll
+
+ROUTER		= $(top_srcdir)\bin\glacier2router.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS         = $(ROUTER)
+
+!else
+
+TARGETS         = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS		= PermissionsVerifier.obj \
+		  Router.obj \
+		  SSLInfo.obj \
+		  Session.obj
+
+ROBJS		= Blobject.obj \
+		  ClientBlobject.obj \
+		  CryptPermissionsVerifierI.obj \
+		  Glacier2Router.obj \
+		  Instance.obj \
+		  ProxyVerifier.obj \
+		  RequestQueue.obj \
+		  RouterI.obj \
+		  RoutingTable.obj \
+		  FilterI.obj \
+		  FilterManager.obj \
+		  ServerBlobject.obj \
+		  SessionRouterI.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(ROBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\Glacier2
+SDIR		= $(slicedir)\Glacier2
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+LINKWITH 	= $(LIBS) $(OPENSSL_LIBS) glacier2$(LIBSUFFIX).lib icessl$(LIBSUFFIX).lib
+!if "$(CPP_COMPILER)" != "BCC2006"
+LINKWITH	= $(LINKWITH) ws2_32.lib
+!endif
+
+!else
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS
+
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+RPDBFLAGS       = /pdb:$(ROUTER:.exe=.pdb)
+!endif
+
+SLICE2CPPFLAGS	= --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Glacier2.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Glacier2.res $(PREOUT)$@ $(PRELIBS)$(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)
+
+$(ROUTER): $(ROBJS) Glacier2Router.res
+	$(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) Glacier2Router.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Glacier2.res: Glacier2.rc
+	rc.exe $(RCFLAGS) Glacier2.rc
+
+Glacier2Router.res: Glacier2Router.rc
+	rc.exe $(RCFLAGS) Glacier2Router.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+	del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
+	del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
+	del /q RouterF.cpp $(HDIR)\RouterF.h
+	del /q Router.cpp $(HDIR)\Router.h
+	del /q SessionF.cpp $(HDIR)\SessionF.h
+	del /q Session.cpp $(HDIR)\Session.h
+	del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
+	del /q Glacier2Router.res Glacier2.res
+	del /q $(DLLNAME:.dll=.*)
+	del /q $(ROUTER:.exe=.*)
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+	copy $(ROUTER) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+	copy $(ROUTER:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+	copy $(ROUTER:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index 6594ca73f7a..3d638b323cb 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -1,211 +1,211 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\ice$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= Acceptor.obj \
-		  Application.obj \
-                  Base64.obj \
-		  Buffer.obj \
-		  BasicStream.obj \
-		  BuiltinSequences.obj \
-		  CommunicatorI.obj \
-		  Communicator.obj \
-		  ConnectRequestHandler.obj \
-		  ConnectionFactory.obj \
-		  ConnectionI.obj \
-		  ConnectionMonitor.obj \
-		  Connection.obj \
-		  Connector.obj \
-		  ConnectionRequestHandler.obj \
-		  Current.obj \
-		  DefaultsAndOverrides.obj \
-		  Direct.obj \
-                  DispatchInterceptor.obj \
-		  DLLMain.obj \
-		  DynamicLibrary.obj \
-		  EndpointFactoryManager.obj \
-		  EndpointFactory.obj \
-		  Endpoint.obj \
-		  EndpointI.obj \
-		  EventHandler.obj \
-		  EventLoggerI.obj \
-		  Exception.obj \
-		  FacetMap.obj \
-		  FactoryTableDef.obj \
-		  FactoryTable.obj \
-		  GC.obj \
-		  Identity.obj \
-		  ImplicitContextI.obj \
-		  ImplicitContext.obj \
-		  IncomingAsync.obj \
-		  Incoming.obj \
-		  Initialize.obj \
-		  Instance.obj \
-		  LocalException.obj \
-		  LocalObject.obj \
-		  LocatorInfo.obj \
-		  Locator.obj \
-		  LoggerI.obj \
-		  Logger.obj \
-		  LoggerUtil.obj \
-		  Network.obj \
-		  ObjectAdapterFactory.obj \
-		  ObjectAdapterI.obj \
-		  ObjectAdapter.obj \
-		  ObjectFactoryManager.obj \
-		  ObjectFactory.obj \
-		  Object.obj \
-		  OutgoingAsync.obj \
-		  Outgoing.obj \
-		  PluginManagerI.obj \
-		  Plugin.obj \
-		  Process.obj \
-		  PropertiesI.obj \
-		  Properties.obj \
-		  PropertyNames.obj \
-		  Protocol.obj \
-		  ProtocolPluginFacade.obj \
-		  ProxyFactory.obj \
-		  Proxy.obj \
-		  ReferenceFactory.obj \
-		  Reference.obj \
-		  RequestHandler.obj \
-		  RouterInfo.obj \
-		  Router.obj \
-		  SelectorThread.obj \
-		  ServantLocator.obj \
-		  ServantManager.obj \
-		  Service.obj \
-		  SliceChecksumDict.obj \
-		  SliceChecksums.obj \
-		  Stats.obj \
-		  StreamI.obj \
-		  Stream.obj \
-                  StringConverter.obj \
-		  TcpAcceptor.obj \
-		  TcpConnector.obj \
-		  TcpEndpointI.obj \
-		  TcpTransceiver.obj \
-	          ThreadPool.obj \
-		  TraceLevels.obj \
-		  TraceUtil.obj \
-		  Transceiver.obj \
-		  UdpConnector.obj \
-		  UdpEndpointI.obj \
-		  UdpTransceiver.obj \
-		  UnknownEndpointI.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\Ice
-SDIR		= $(slicedir)\Ice
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
-LINKWITH        = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-RES_FILE	= ,, EventLoggerMsg.res
-!else
-!if "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-LD_DLLFLAGS	= $(LD_DLLFLAGS) /entry:"ice_DLL_Main"
-RES_FILE	= EventLoggerMsg.res
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Ice.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Ice.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	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)
-
-$(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)\BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB)
-	del /q $(HDIR)\BuiltinSequences.h BuiltinSequences.cpp
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) --stream $(SDIR)\BuiltinSequences.ice
-	move BuiltinSequences.h $(HDIR)
-
-EventLoggerI.obj: EventLoggerMsg.h
-
-EventLoggerMsg.h EventLoggerMsg.res: EventLoggerMsg.mc
-	mc EventLoggerMsg.mc
-	$(RC) -r -fo EventLoggerMsg.res EventLoggerMsg.rc
-
-Ice.res: Ice.rc
-	rc.exe $(RCFLAGS) Ice.rc
-
-clean::
-	del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
-	del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
-	del /q Communicator.cpp $(HDIR)\Communicator.h
-	del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
-	del /q Connection.cpp $(HDIR)\Connection.h
-	del /q Current.cpp $(HDIR)\Current.h
-	del /q Endpoint.cpp $(HDIR)\Endpoint.h
-	del /q FacetMap.cpp $(HDIR)\FacetMap.h
-	del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h	
-	del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h	
-	del /q Identity.cpp $(HDIR)\Identity.h
-	del /q LocalException.cpp $(HDIR)\LocalException.h
-	del /q LocatorF.cpp $(HDIR)\LocatorF.h
-	del /q Locator.cpp $(HDIR)\Locator.h
-	del /q LoggerF.cpp $(HDIR)\LoggerF.h
-	del /q Logger.cpp $(HDIR)\Logger.h
-	del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
-	del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
-	del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
-	del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
-	del /q PluginF.cpp $(HDIR)\PluginF.h
-	del /q Plugin.cpp $(HDIR)\Plugin.h
-	del /q ProcessF.cpp $(HDIR)\ProcessF.h
-	del /q Process.cpp $(HDIR)\Process.h
-	del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
-	del /q Properties.cpp $(HDIR)\Properties.h
-	del /q RouterF.cpp $(HDIR)\RouterF.h
-	del /q Router.cpp $(HDIR)\Router.h
-	del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
-	del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
-	del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
-	del /q StatsF.cpp $(HDIR)\StatsF.h
-	del /q Stats.cpp $(HDIR)\Stats.h
-	del /q $(DLLNAME:.dll=.*)
-	del /q Ice.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\ice$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= Acceptor.obj \
+		  Application.obj \
+                  Base64.obj \
+		  Buffer.obj \
+		  BasicStream.obj \
+		  BuiltinSequences.obj \
+		  CommunicatorI.obj \
+		  Communicator.obj \
+		  ConnectRequestHandler.obj \
+		  ConnectionFactory.obj \
+		  ConnectionI.obj \
+		  ConnectionMonitor.obj \
+		  Connection.obj \
+		  Connector.obj \
+		  ConnectionRequestHandler.obj \
+		  Current.obj \
+		  DefaultsAndOverrides.obj \
+		  Direct.obj \
+                  DispatchInterceptor.obj \
+		  DLLMain.obj \
+		  DynamicLibrary.obj \
+		  EndpointFactoryManager.obj \
+		  EndpointFactory.obj \
+		  Endpoint.obj \
+		  EndpointI.obj \
+		  EventHandler.obj \
+		  EventLoggerI.obj \
+		  Exception.obj \
+		  FacetMap.obj \
+		  FactoryTableDef.obj \
+		  FactoryTable.obj \
+		  GC.obj \
+		  Identity.obj \
+		  ImplicitContextI.obj \
+		  ImplicitContext.obj \
+		  IncomingAsync.obj \
+		  Incoming.obj \
+		  Initialize.obj \
+		  Instance.obj \
+		  LocalException.obj \
+		  LocalObject.obj \
+		  LocatorInfo.obj \
+		  Locator.obj \
+		  LoggerI.obj \
+		  Logger.obj \
+		  LoggerUtil.obj \
+		  Network.obj \
+		  ObjectAdapterFactory.obj \
+		  ObjectAdapterI.obj \
+		  ObjectAdapter.obj \
+		  ObjectFactoryManager.obj \
+		  ObjectFactory.obj \
+		  Object.obj \
+		  OutgoingAsync.obj \
+		  Outgoing.obj \
+		  PluginManagerI.obj \
+		  Plugin.obj \
+		  Process.obj \
+		  PropertiesI.obj \
+		  Properties.obj \
+		  PropertyNames.obj \
+		  Protocol.obj \
+		  ProtocolPluginFacade.obj \
+		  ProxyFactory.obj \
+		  Proxy.obj \
+		  ReferenceFactory.obj \
+		  Reference.obj \
+		  RequestHandler.obj \
+		  RouterInfo.obj \
+		  Router.obj \
+		  SelectorThread.obj \
+		  ServantLocator.obj \
+		  ServantManager.obj \
+		  Service.obj \
+		  SliceChecksumDict.obj \
+		  SliceChecksums.obj \
+		  Stats.obj \
+		  StreamI.obj \
+		  Stream.obj \
+                  StringConverter.obj \
+		  TcpAcceptor.obj \
+		  TcpConnector.obj \
+		  TcpEndpointI.obj \
+		  TcpTransceiver.obj \
+	          ThreadPool.obj \
+		  TraceLevels.obj \
+		  TraceUtil.obj \
+		  Transceiver.obj \
+		  UdpConnector.obj \
+		  UdpEndpointI.obj \
+		  UdpTransceiver.obj \
+		  UnknownEndpointI.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\Ice
+SDIR		= $(slicedir)\Ice
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS	= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
+LINKWITH        = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib Iphlpapi.lib
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+RES_FILE	= ,, EventLoggerMsg.res
+!else
+!if "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+LD_DLLFLAGS	= $(LD_DLLFLAGS) /entry:"ice_DLL_Main"
+RES_FILE	= EventLoggerMsg.res
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Ice.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Ice.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
+	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)
+
+$(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: $(SDIR)\BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+	del /q $(HDIR)\BuiltinSequences.h BuiltinSequences.cpp
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) --stream $(SDIR)\BuiltinSequences.ice
+	move BuiltinSequences.h $(HDIR)
+
+EventLoggerI.obj: EventLoggerMsg.h
+
+EventLoggerMsg.h EventLoggerMsg.res: EventLoggerMsg.mc
+	mc EventLoggerMsg.mc
+	$(RC) -r -fo EventLoggerMsg.res EventLoggerMsg.rc
+
+Ice.res: Ice.rc
+	rc.exe $(RCFLAGS) Ice.rc
+
+clean::
+	del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
+	del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
+	del /q Communicator.cpp $(HDIR)\Communicator.h
+	del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
+	del /q Connection.cpp $(HDIR)\Connection.h
+	del /q Current.cpp $(HDIR)\Current.h
+	del /q Endpoint.cpp $(HDIR)\Endpoint.h
+	del /q FacetMap.cpp $(HDIR)\FacetMap.h
+	del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h	
+	del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h	
+	del /q Identity.cpp $(HDIR)\Identity.h
+	del /q LocalException.cpp $(HDIR)\LocalException.h
+	del /q LocatorF.cpp $(HDIR)\LocatorF.h
+	del /q Locator.cpp $(HDIR)\Locator.h
+	del /q LoggerF.cpp $(HDIR)\LoggerF.h
+	del /q Logger.cpp $(HDIR)\Logger.h
+	del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
+	del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
+	del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
+	del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
+	del /q PluginF.cpp $(HDIR)\PluginF.h
+	del /q Plugin.cpp $(HDIR)\Plugin.h
+	del /q ProcessF.cpp $(HDIR)\ProcessF.h
+	del /q Process.cpp $(HDIR)\Process.h
+	del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
+	del /q Properties.cpp $(HDIR)\Properties.h
+	del /q RouterF.cpp $(HDIR)\RouterF.h
+	del /q Router.cpp $(HDIR)\Router.h
+	del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
+	del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
+	del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
+	del /q StatsF.cpp $(HDIR)\StatsF.h
+	del /q Stats.cpp $(HDIR)\Stats.h
+	del /q $(DLLNAME:.dll=.*)
+	del /q Ice.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
index 7379d22454f..d9a59c8193a 100644
--- a/cpp/src/IceBox/Makefile.mak
+++ b/cpp/src/IceBox/Makefile.mak
@@ -1,137 +1,137 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\icebox$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll
-
-SERVER		= $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
-ADMIN		= $(top_srcdir)\bin\iceboxadmin.exe
-
-!ifdef BUILD_UTILS
-
-TARGETS         = $(SERVER) $(ADMIN)
-
-!else
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-!endif
-
-OBJS		= IceBox.obj \
-		  Exception.obj
-
-SOBJS		= ServiceManagerI.obj \
-		  Service.obj
-
-AOBJS		= Admin.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(AOBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\IceBox
-SDIR		= $(slicedir)\IceBox
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-!ifdef BUILD_UTILS
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!else
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_BOX_API_EXPORTS 
-
-!endif
-
-SLICE2CPPFLAGS	= --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceBox.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceBox.res $(PREOUT)$@ $(PRELIBS)$(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)
-
-$(SERVER): $(SOBJS) IceBoxExe.res
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) IceBoxExe.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icebox$(LIBSUFFIX).lib
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(ADMIN): $(AOBJS) IceBoxAdmin.res
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceBoxAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icebox$(LIBSUFFIX).lib
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-IceBox.res: IceBox.rc
-	rc.exe $(RCFLAGS) IceBox.rc
-
-IceBoxExe.res: IceBoxExe.rc
-	rc.exe $(RCFLAGS) IceBoxExe.rc
-
-IceBoxAdmin.res: IceBoxAdmin.rc
-	rc.exe $(RCFLAGS) IceBoxAdmin.rc
-
-!ifdef BUILD_UTILS
-
-clean::
-	del /q IceBox.cpp $(HDIR)\IceBox.h
-	del /q $(DLLNAME:.dll=.*)
-	del /q $(SERVER:.exe=.*)
-	del /q $(ADMIN:.exe=.*)
-	del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-	copy $(SERVER) $(install_bindir)
-	copy $(ADMIN) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-	copy $(SERVER:.exe=.tds) $(install_bindir)
-	copy $(ADMIN:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-	copy $(SERVER:.exe=.pdb) $(install_bindir)
-	copy $(ADMIN:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!else
-
-install:: all
-
-$(EVERYTHING)::
-	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\icebox$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll
+
+SERVER		= $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
+ADMIN		= $(top_srcdir)\bin\iceboxadmin.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS         = $(SERVER) $(ADMIN)
+
+!else
+
+TARGETS         = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS		= IceBox.obj \
+		  Exception.obj
+
+SOBJS		= ServiceManagerI.obj \
+		  Service.obj
+
+AOBJS		= Admin.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(AOBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\IceBox
+SDIR		= $(slicedir)\IceBox
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!else
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_BOX_API_EXPORTS 
+
+!endif
+
+SLICE2CPPFLAGS	= --checksum --ice --dll-export ICE_BOX_API --include-dir IceBox $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
+APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceBox.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceBox.res $(PREOUT)$@ $(PRELIBS)$(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)
+
+$(SERVER): $(SOBJS) IceBoxExe.res
+	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) IceBoxExe.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+		icebox$(LIBSUFFIX).lib
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(ADMIN): $(AOBJS) IceBoxAdmin.res
+	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceBoxAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+		icebox$(LIBSUFFIX).lib
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IceBox.res: IceBox.rc
+	rc.exe $(RCFLAGS) IceBox.rc
+
+IceBoxExe.res: IceBoxExe.rc
+	rc.exe $(RCFLAGS) IceBoxExe.rc
+
+IceBoxAdmin.res: IceBoxAdmin.rc
+	rc.exe $(RCFLAGS) IceBoxAdmin.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+	del /q IceBox.cpp $(HDIR)\IceBox.h
+	del /q $(DLLNAME:.dll=.*)
+	del /q $(SERVER:.exe=.*)
+	del /q $(ADMIN:.exe=.*)
+	del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+	copy $(SERVER) $(install_bindir)
+	copy $(ADMIN) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+	copy $(SERVER:.exe=.tds) $(install_bindir)
+	copy $(ADMIN:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+	copy $(SERVER:.exe=.pdb) $(install_bindir)
+	copy $(ADMIN:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index c1c8a4e4051..7362990109f 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -1,217 +1,217 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-ADMIN		= $(top_srcdir)\bin\icegridadmin.exe
-NODE_SERVER	= $(top_srcdir)\bin\icegridnode.exe
-REGISTRY_SERVER	= $(top_srcdir)\bin\icegridregistry.exe
-
-TARGETS         = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER)
-
-ADMIN_OBJS	= Grammar.obj \
-		  Scanner.obj \
-		  Parser.obj \
-		  DescriptorParser.obj \
-		  DescriptorBuilder.obj \
-		  DescriptorHelper.obj \
-		  FileParserI.obj \
-		  Util.obj \
-		  Internal.obj \
-		  Client.obj
-
-COMMON_OBJS	= Internal.obj \
-		  DescriptorParser.obj \
-		  DescriptorBuilder.obj \
-		  FileCache.obj \
-		  TraceLevels.obj \
-		  PlatformInfo.obj
-
-NODE_OBJS	= NodeI.obj \
-                  NodeServerAdminRouter.obj \
-		  ServerI.obj \
-		  ServerAdapterI.obj \
-		  Activator.obj \
-		  NodeSessionManager.obj
-
-REGISTRY_OBJS	= AdminCallbackRouter.obj \
-                  RegistryI.obj \
-                  RegistryServerAdminRouter.obj \
-		  InternalRegistryI.obj \
-		  StringApplicationInfoDict.obj \
-		  IdentityObjectInfoDict.obj \
-		  StringAdapterInfoDict.obj \
-		  Database.obj \
-		  Allocatable.obj \
-		  AdapterCache.obj \
-		  ObjectCache.obj \
-		  AllocatableObjectCache.obj \
-		  ServerCache.obj \
-		  NodeCache.obj \
-		  ReplicaCache.obj \
-		  LocatorI.obj \
-		  LocatorRegistryI.obj \
-		  AdminI.obj \
-		  Util.obj \
-		  DescriptorHelper.obj \
-		  NodeSessionI.obj \
-		  ReplicaSessionI.obj \
-		  ReapThread.obj \
-		  SessionI.obj \
-		  AdminSessionI.obj \
-		  SessionServantManager.obj \
-		  Topics.obj \
-		  QueryI.obj \
-		  FileUserAccountMapperI.obj \
-		  ReplicaSessionManager.obj \
-		  WellKnownObjectsManager.obj
-
-NODE_SVR_OBJS	= $(COMMON_OBJS) \
-		  $(NODE_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  IceGridNode.obj
-
-REGISTRY_SVR_OBJS = \
-		  $(COMMON_OBJS) \
-		  $(REGISTRY_OBJS) \
-		  IceGridRegistry.obj
-
-SRCS            = $(ADMIN_OBJS:.obj=.cpp) \
-		  $(COMMON_OBJS:.obj=.cpp) \
-		  $(NODE_OBJS:.obj=.cpp) \
-		  $(REGISTRY_OBJS:.obj=.cpp) \
-		  IceGridNode.cpp \
-		  IceGridRegistry.cpp
-
-HDIR		= $(includedir)\IceGrid
-SDIR		= $(slicedir)\IceGrid
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-LINKWITH 	= $(LIBS) glacier2$(LIBSUFFIX).lib
-ALINKWITH 	= $(LINKWITH) icegrid$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib icepatch2$(LIBSUFFIX).lib \
-		  icebox$(LIBSUFFIX).lib
-NLINKWITH	= $(ALINKWITH) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib \
-		  icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib $(OPENSSL_LIBS)
-!if "$(CPP_COMPILER)" != "BCC2006"
-NLINKWITH	= $(NLINKWITH) pdh.lib ws2_32.lib
-!endif
-
-SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
-CPPFLAGS	= -I. -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(CPP_COMPILER)" != "BCC2006"
-CPPFLAGS 	= $(CPPFLAGS) -Zm200
-!endif
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-RPDBFLAGS       = /pdb:$(REGISTRY_SERVER:.exe=.pdb)
-NPDBFLAGS       = /pdb:$(NODE_SERVER:.exe=.pdb)
-!endif
-
-$(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) IceGridAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res 
-	$(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) IceGridRegistry.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(NLINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
-	$(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) IceGridNode.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)$(NLINKWITH)
-	@if exist $@.manifest \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
-	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
-	StringApplicationInfoDict Internal.ice
-
-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
-	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
-	--dict-index IceGrid::IdentityObjectInfoDict,type \
-	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice
-
-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
-	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
-	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
-
-Scanner.cpp : Scanner.l
-	flex Scanner.l
-	del /q $@
-	echo #include "IceUtil/Config.h" > Scanner.cpp
-	type lex.yy.c >> Scanner.cpp
-	del /q lex.yy.c
-
-Grammar.cpp Grammar.h: Grammar.y
-	del /q Grammar.h Grammar.cpp
-	bison -dvt Grammar.y
-	move Grammar.tab.c Grammar.cpp
-	move Grammar.tab.h Grammar.h
-	del /q Grammar.output
-
-IceGridAdmin.res: IceGridAdmin.rc
-	rc.exe $(RCFLAGS) IceGridAdmin.rc
-
-IceGridNode.res: IceGridNode.rc
-	rc.exe $(RCFLAGS) IceGridNode.rc
-
-IceGridRegistry.res: IceGridRegistry.rc
-	rc.exe IceGridRegistry.rc
-
-clean::
-	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-
-clean::
-	del /q Internal.cpp Internal.h
-	del /q $(ADMIN:.exe=.*)
-	del /q $(NODE_SERVER:.exe=.*)
-	del /q $(REGISTRY_SERVER:.exe=.*)
-	del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
-
-clean::
-	del /q Grammar.cpp Grammar.h
-	del /q Scanner.cpp
-
-install:: all
-	copy $(ADMIN) $(install_bindir)
-	copy $(NODE_SERVER) $(install_bindir)
-	copy $(REGISTRY_SERVER) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(ADMIN:.exe=.tds) $(install_bindir)
-	copy $(NODE_SERVER:.exe=.tds) $(install_bindir)
-	copy $(REGISTRY_SERVER:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(ADMIN:.exe=.pdb) $(install_bindir)
-	copy $(NODE_SERVER:.exe=.pdb) $(install_bindir)
-	copy $(REGISTRY_SERVER:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+ADMIN		= $(top_srcdir)\bin\icegridadmin.exe
+NODE_SERVER	= $(top_srcdir)\bin\icegridnode.exe
+REGISTRY_SERVER	= $(top_srcdir)\bin\icegridregistry.exe
+
+TARGETS         = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER)
+
+ADMIN_OBJS	= Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  DescriptorParser.obj \
+		  DescriptorBuilder.obj \
+		  DescriptorHelper.obj \
+		  FileParserI.obj \
+		  Util.obj \
+		  Internal.obj \
+		  Client.obj
+
+COMMON_OBJS	= Internal.obj \
+		  DescriptorParser.obj \
+		  DescriptorBuilder.obj \
+		  FileCache.obj \
+		  TraceLevels.obj \
+		  PlatformInfo.obj
+
+NODE_OBJS	= NodeI.obj \
+                  NodeServerAdminRouter.obj \
+		  ServerI.obj \
+		  ServerAdapterI.obj \
+		  Activator.obj \
+		  NodeSessionManager.obj
+
+REGISTRY_OBJS	= AdminCallbackRouter.obj \
+                  RegistryI.obj \
+                  RegistryServerAdminRouter.obj \
+		  InternalRegistryI.obj \
+		  StringApplicationInfoDict.obj \
+		  IdentityObjectInfoDict.obj \
+		  StringAdapterInfoDict.obj \
+		  Database.obj \
+		  Allocatable.obj \
+		  AdapterCache.obj \
+		  ObjectCache.obj \
+		  AllocatableObjectCache.obj \
+		  ServerCache.obj \
+		  NodeCache.obj \
+		  ReplicaCache.obj \
+		  LocatorI.obj \
+		  LocatorRegistryI.obj \
+		  AdminI.obj \
+		  Util.obj \
+		  DescriptorHelper.obj \
+		  NodeSessionI.obj \
+		  ReplicaSessionI.obj \
+		  ReapThread.obj \
+		  SessionI.obj \
+		  AdminSessionI.obj \
+		  SessionServantManager.obj \
+		  Topics.obj \
+		  QueryI.obj \
+		  FileUserAccountMapperI.obj \
+		  ReplicaSessionManager.obj \
+		  WellKnownObjectsManager.obj
+
+NODE_SVR_OBJS	= $(COMMON_OBJS) \
+		  $(NODE_OBJS) \
+		  $(REGISTRY_OBJS) \
+		  IceGridNode.obj
+
+REGISTRY_SVR_OBJS = \
+		  $(COMMON_OBJS) \
+		  $(REGISTRY_OBJS) \
+		  IceGridRegistry.obj
+
+SRCS            = $(ADMIN_OBJS:.obj=.cpp) \
+		  $(COMMON_OBJS:.obj=.cpp) \
+		  $(NODE_OBJS:.obj=.cpp) \
+		  $(REGISTRY_OBJS:.obj=.cpp) \
+		  IceGridNode.cpp \
+		  IceGridRegistry.cpp
+
+HDIR		= $(includedir)\IceGrid
+SDIR		= $(slicedir)\IceGrid
+
+SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+LINKWITH 	= $(LIBS) glacier2$(LIBSUFFIX).lib
+ALINKWITH 	= $(LINKWITH) icegrid$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib icepatch2$(LIBSUFFIX).lib \
+		  icebox$(LIBSUFFIX).lib
+NLINKWITH	= $(ALINKWITH) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib \
+		  icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib $(OPENSSL_LIBS)
+!if "$(CPP_COMPILER)" != "BCC2006"
+NLINKWITH	= $(NLINKWITH) pdh.lib ws2_32.lib
+!endif
+
+SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
+CPPFLAGS	= -I. -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+!if "$(CPP_COMPILER)" != "BCC2006"
+CPPFLAGS 	= $(CPPFLAGS) -Zm200
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
+RPDBFLAGS       = /pdb:$(REGISTRY_SERVER:.exe=.pdb)
+NPDBFLAGS       = /pdb:$(NODE_SERVER:.exe=.pdb)
+!endif
+
+$(ADMIN): $(ADMIN_OBJS) IceGridAdmin.res
+	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) IceGridAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) IceGridRegistry.res 
+	$(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) IceGridRegistry.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)$(NLINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
+	$(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) IceGridNode.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)$(NLINKWITH)
+	@if exist $@.manifest \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
+	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
+	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
+	StringApplicationInfoDict Internal.ice
+
+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
+	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
+	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
+	--dict-index IceGrid::IdentityObjectInfoDict,type \
+	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice
+
+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
+	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
+	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
+	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
+
+Scanner.cpp : Scanner.l
+	flex Scanner.l
+	del /q $@
+	echo #include "IceUtil/Config.h" > Scanner.cpp
+	type lex.yy.c >> Scanner.cpp
+	del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+	del /q Grammar.h Grammar.cpp
+	bison -dvt Grammar.y
+	move Grammar.tab.c Grammar.cpp
+	move Grammar.tab.h Grammar.h
+	del /q Grammar.output
+
+IceGridAdmin.res: IceGridAdmin.rc
+	rc.exe $(RCFLAGS) IceGridAdmin.rc
+
+IceGridNode.res: IceGridNode.rc
+	rc.exe $(RCFLAGS) IceGridNode.rc
+
+IceGridRegistry.res: IceGridRegistry.rc
+	rc.exe IceGridRegistry.rc
+
+clean::
+	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
+	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
+	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
+
+clean::
+	del /q Internal.cpp Internal.h
+	del /q $(ADMIN:.exe=.*)
+	del /q $(NODE_SERVER:.exe=.*)
+	del /q $(REGISTRY_SERVER:.exe=.*)
+	del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
+
+clean::
+	del /q Grammar.cpp Grammar.h
+	del /q Scanner.cpp
+
+install:: all
+	copy $(ADMIN) $(install_bindir)
+	copy $(NODE_SERVER) $(install_bindir)
+	copy $(REGISTRY_SERVER) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(ADMIN:.exe=.tds) $(install_bindir)
+	copy $(NODE_SERVER:.exe=.tds) $(install_bindir)
+	copy $(REGISTRY_SERVER:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(ADMIN:.exe=.pdb) $(install_bindir)
+	copy $(NODE_SERVER:.exe=.pdb) $(install_bindir)
+	copy $(REGISTRY_SERVER:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak
index 8135b396c03..fb3febe4255 100644
--- a/cpp/src/IceGridLib/Makefile.mak
+++ b/cpp/src/IceGridLib/Makefile.mak
@@ -1,88 +1,88 @@
-# **********************************************************************
-#
-# 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\icegrid$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-LIB_OBJS	= Admin.obj \
-		  Locator.obj \
-		  Query.obj \
-		  Exception.obj \
-		  Descriptor.obj \
-                  FileParser.obj \
-		  Observer.obj \
-		  Session.obj \
-		  Registry.obj \
-		  UserAccountMapper.obj
-
-SRCS		= $(LIB_OBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\IceGrid
-SDIR		= $(slicedir)\IceGrid
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-LINKWITH 	= $(LIBS) glacier2$(LIBSUFFIX).lib
-
-SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
-CPPFLAGS        = -I.. -DICE_GRID_API_EXPORTS $(CPPFLAGS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(LIB_OBJS) IceGrid.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) IceGrid.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	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)
-
-IceGrid.res: IceGrid.rc
-	rc.exe $(RCFLAGS) IceGrid.rc
-clean::
-	del /q Admin.cpp $(HDIR)\Admin.h
-	del /q Descriptor.cpp $(HDIR)\Descriptor.h
-	del /q Exception.cpp $(HDIR)\Exception.h
-	del /q Locator.cpp $(HDIR)\Locator.h
-	del /q Observer.cpp $(HDIR)\Observer.h
-	del /q Query.cpp $(HDIR)\Query.h
-	del /q Session.cpp $(HDIR)\Session.h
-	del /q Registry.cpp $(HDIR)\Registry.h
-	del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
-	del /q $(DLLNAME:.dll=.*)
-	del /q IceGrid.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!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\icegrid$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS         = $(LIBNAME) $(DLLNAME)
+
+LIB_OBJS	= Admin.obj \
+		  Locator.obj \
+		  Query.obj \
+		  Exception.obj \
+		  Descriptor.obj \
+                  FileParser.obj \
+		  Observer.obj \
+		  Session.obj \
+		  Registry.obj \
+		  UserAccountMapper.obj
+
+SRCS		= $(LIB_OBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\IceGrid
+SDIR		= $(slicedir)\IceGrid
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+LINKWITH 	= $(LIBS) glacier2$(LIBSUFFIX).lib
+
+SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
+CPPFLAGS        = -I.. -DICE_GRID_API_EXPORTS $(CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(LIB_OBJS) IceGrid.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) IceGrid.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	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)
+
+IceGrid.res: IceGrid.rc
+	rc.exe $(RCFLAGS) IceGrid.rc
+clean::
+	del /q Admin.cpp $(HDIR)\Admin.h
+	del /q Descriptor.cpp $(HDIR)\Descriptor.h
+	del /q Exception.cpp $(HDIR)\Exception.h
+	del /q Locator.cpp $(HDIR)\Locator.h
+	del /q Observer.cpp $(HDIR)\Observer.h
+	del /q Query.cpp $(HDIR)\Query.h
+	del /q Session.cpp $(HDIR)\Session.h
+	del /q Registry.cpp $(HDIR)\Registry.h
+	del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
+	del /q $(DLLNAME:.dll=.*)
+	del /q IceGrid.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
index 24bff8dd03e..ed139aee154 100644
--- a/cpp/src/IcePatch2/Makefile.mak
+++ b/cpp/src/IcePatch2/Makefile.mak
@@ -1,160 +1,160 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\icepatch2$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX).dll
-
-SERVER		= $(top_srcdir)\bin\icepatch2server.exe
-CLIENT		= $(top_srcdir)\bin\icepatch2client.exe
-CALC		= $(top_srcdir)\bin\icepatch2calc.exe
-
-!ifdef BUILD_UTILS
-
-TARGETS         = $(SERVER) $(CLIENT) $(CALC)
-
-!else
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-!endif
-
-OBJS		= Util.obj \
-		  ClientUtil.obj \
-		  FileInfo.obj \
-		  FileServer.obj \
-		  OS.obj
-
-SOBJS		= Server.obj \
-		  FileServerI.obj
-
-COBJS		= Client.obj
-
-CALCOBJS	= Calc.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(COBJS:.obj=.cpp) \
-		  $(CALCOBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\IcePatch2
-SDIR		= $(slicedir)\IcePatch2
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-!ifdef BUILD_UTILS
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!else
-
-CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-
-!endif
-
-SLICE2CPPFLAGS	= --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
-CPDBFLAGS       = /pdb:$(CLIENT:.exe=.pdb)
-CAPDBFLAGS      = /pdb:$(CALC:.exe=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IcePatch2.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IcePatch2.res $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \
-		$(OPENSSL_LIBS)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-$(SERVER): $(SOBJS) IcePatch2Server.res
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) IcePatch2Server.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(CLIENT): $(COBJS) IcePatch2Client.res
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) IcePatch2Client.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(CALC): $(CALCOBJS) IcePatch2Calc.res
-	$(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) IcePatch2Calc.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
-		icepatch2$(LIBSUFFIX).lib
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-IcePatch2.res: IcePatch2.rc
-	rc.exe $(RCFLAGS) IcePatch2.rc
-
-IcePatch2Server.res: IcePatch2Server.rc
-	rc.exe $(RCFLAGS) IcePatch2Server.rc
-
-IcePatch2Client.res: IcePatch2Client.rc
-	rc.exe $(RCFLAGS) IcePatch2Client.rc
-
-IcePatch2Calc.res: IcePatch2Calc.rc
-	rc.exe $(RCFLAGS) IcePatch2Calc.rc
-
-!ifdef BUILD_UTILS
-
-clean::
-	del /q FileInfo.cpp $(HDIR)\FileInfo.h
-	del /q FileServer.cpp $(HDIR)\FileServer.h
-	del /q $(DLLNAME:.dll=.*)
-	del /q $(SERVER:.exe=.*)
-	del /q $(CLIENT:.exe=.*)
-	del /q $(CALC:.exe=.*)
-	del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-	copy $(SERVER) $(install_bindir)
-	copy $(CLIENT) $(install_bindir)
-	copy $(CALC) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-	copy $(SERVER:.exe=.tds) $(install_bindir)
-	copy $(CLIENT:.exe=.tds) $(install_bindir)
-	copy $(CALC:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-	copy $(SERVER:.exe=.pdb) $(install_bindir)
-	copy $(CLIENT:.exe=.pdb) $(install_bindir)
-	copy $(CALC:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!else
-
-install:: all
-
-$(EVERYTHING)::
-	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\icepatch2$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX).dll
+
+SERVER		= $(top_srcdir)\bin\icepatch2server.exe
+CLIENT		= $(top_srcdir)\bin\icepatch2client.exe
+CALC		= $(top_srcdir)\bin\icepatch2calc.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS         = $(SERVER) $(CLIENT) $(CALC)
+
+!else
+
+TARGETS         = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS		= Util.obj \
+		  ClientUtil.obj \
+		  FileInfo.obj \
+		  FileServer.obj \
+		  OS.obj
+
+SOBJS		= Server.obj \
+		  FileServerI.obj
+
+COBJS		= Client.obj
+
+CALCOBJS	= Calc.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(COBJS:.obj=.cpp) \
+		  $(CALCOBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\IcePatch2
+SDIR		= $(slicedir)\IcePatch2
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!else
+
+CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DICE_PATCH2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+!endif
+
+SLICE2CPPFLAGS	= --ice --include-dir IcePatch2 --dll-export ICE_PATCH2_API $(SLICE2CPPFLAGS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS       = /pdb:$(CLIENT:.exe=.pdb)
+CAPDBFLAGS      = /pdb:$(CALC:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IcePatch2.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IcePatch2.res $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) \
+		$(OPENSSL_LIBS)
+	move $(DLLNAME:.dll=.lib) $(LIBNAME)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 && del /q $@.manifest
+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
+
+$(SERVER): $(SOBJS) IcePatch2Server.res
+	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) IcePatch2Server.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+		icepatch2$(LIBSUFFIX).lib
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(CLIENT): $(COBJS) IcePatch2Client.res
+	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) IcePatch2Client.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+		icepatch2$(LIBSUFFIX).lib
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(CALC): $(CALCOBJS) IcePatch2Calc.res
+	$(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) IcePatch2Calc.res $(PREOUT)$@ $(PRELIBS)$(LIBS) \
+		icepatch2$(LIBSUFFIX).lib
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+IcePatch2.res: IcePatch2.rc
+	rc.exe $(RCFLAGS) IcePatch2.rc
+
+IcePatch2Server.res: IcePatch2Server.rc
+	rc.exe $(RCFLAGS) IcePatch2Server.rc
+
+IcePatch2Client.res: IcePatch2Client.rc
+	rc.exe $(RCFLAGS) IcePatch2Client.rc
+
+IcePatch2Calc.res: IcePatch2Calc.rc
+	rc.exe $(RCFLAGS) IcePatch2Calc.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+	del /q FileInfo.cpp $(HDIR)\FileInfo.h
+	del /q FileServer.cpp $(HDIR)\FileServer.h
+	del /q $(DLLNAME:.dll=.*)
+	del /q $(SERVER:.exe=.*)
+	del /q $(CLIENT:.exe=.*)
+	del /q $(CALC:.exe=.*)
+	del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+	copy $(SERVER) $(install_bindir)
+	copy $(CLIENT) $(install_bindir)
+	copy $(CALC) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+	copy $(SERVER:.exe=.tds) $(install_bindir)
+	copy $(CLIENT:.exe=.tds) $(install_bindir)
+	copy $(CALC:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+	copy $(SERVER:.exe=.pdb) $(install_bindir)
+	copy $(CLIENT:.exe=.pdb) $(install_bindir)
+	copy $(CALC:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+	@$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
index 4126c4141b9..ab915c88e3e 100644
--- a/cpp/src/IceSSL/Makefile.mak
+++ b/cpp/src/IceSSL/Makefile.mak
@@ -1,81 +1,81 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\icessl$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= AcceptorI.obj \
-		  Certificate.obj \
-                  ConnectorI.obj \
-                  EndpointI.obj \
-                  Instance.obj \
-                  PluginI.obj \
-                  TransceiverI.obj \
-                  Util.obj \
-		  RFC2253.obj \
-		  TrustManager.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\IceSSL
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
-
-LINKWITH        = $(OPENSSL_LIBS) $(LIBS)
-!if "$(CPP_COMPILER)" != "BCC2006"
-LINKWITH	= $(LINKWITH) ws2_32.lib
-!endif
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceSSL.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceSSL.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	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)
-
-IceSSL.res: IceSSL.rc
-	rc.exe $(RCFLAGS) IceSSL.res
-
-clean::
-	del /q $(DLLNAME:.dll=.*)
-	del /q IceSSL.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\icessl$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= AcceptorI.obj \
+		  Certificate.obj \
+                  ConnectorI.obj \
+                  EndpointI.obj \
+                  Instance.obj \
+                  PluginI.obj \
+                  TransceiverI.obj \
+                  Util.obj \
+		  RFC2253.obj \
+		  TrustManager.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\IceSSL
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+
+LINKWITH        = $(OPENSSL_LIBS) $(LIBS)
+!if "$(CPP_COMPILER)" != "BCC2006"
+LINKWITH	= $(LINKWITH) ws2_32.lib
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceSSL.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceSSL.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	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)
+
+IceSSL.res: IceSSL.rc
+	rc.exe $(RCFLAGS) IceSSL.res
+
+clean::
+	del /q $(DLLNAME:.dll=.*)
+	del /q IceSSL.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 2d077288767..61fa5ec1efc 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -1,262 +1,262 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\icestorm$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX).dll
-
-SVCLIBNAME	= $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
-SVCDLLNAME	= $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll
-
-ADMIN		= $(top_srcdir)\bin\icestormadmin.exe
-MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe
-
-!ifdef BUILD_UTILS
-
-TARGETS         = $(SVCLIBNAME) $(SVCDLLNAME) $(ADMIN) $(MIGRATE)
-
-!else
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-!endif
-
-OBJS		= IceStorm.obj
-
-SERVICE_OBJS	= NodeI.obj \
-		  Observers.obj \
-		  LLUMap.obj \
-		  Election.obj \
-		  Instance.obj \
-		  TraceLevels.obj \
-		  Subscriber.obj \
-		  TopicI.obj \
-		  TopicManagerI.obj \
-		  TransientTopicI.obj \
-		  TransientTopicManagerI.obj \
-                  SubscriberMap.obj \
-		  SubscriberRecord.obj \
-		  IceStormInternal.obj \
-		  Service.obj
-
-AOBJS		= Admin.obj \
-		  Grammar.obj \
-		  Scanner.obj \
-		  Parser.obj \
-		  Election.obj \
-		  SubscriberRecord.obj \
-		  IceStormInternal.obj
-
-MOBJS		= Migrate.obj \
-		  SubscriberRecord.obj \
-                  SubscriberMap.obj \
-                  LLUMap.obj \
-		  LinkRecord.obj \
-		  IceStormInternal.obj \
-		  Election.obj \
-                  V32FormatDB.obj \
-                  V31FormatDB.obj \
-                  V32Format.obj \
-                  V31Format.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp) \
-		  $(AOBJS:.obj=.cpp) \
-		  $(MOBJS:.obj=.cpp)
-
-HDIR		= $(includedir)\IceStorm
-SDIR		= $(slicedir)\IceStorm
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..
-LINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
-ALINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib
-MLINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir)
-
-!ifdef BUILD_UTILS
-
-CPPFLAGS	= $(CPPFLAGS) -DICE_STORM_API_EXPORTS
-
-!else
-
-CPPFLAGS	= $(CPPFLAGS) -DICE_STORM_LIB_API_EXPORTS
-
-!endif
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-SPDBFLAGS       = /pdb:$(SVCDLLNAME:.dll=.pdb)
-APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
-MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceStorm.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceStorm.res $(PREOUT)$@ $(PRELIBS)$(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)
-
-$(SVCLIBNAME): $(SVCDLLNAME)
-
-$(SVCDLLNAME): $(SERVICE_OBJS) IceStormService.res
-	$(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) IceStormService.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp)
-
-$(ADMIN): $(AOBJS) IceStormAdmin.res 
-	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceStormAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(MIGRATE): $(MOBJS) IceStormMigrate.res
-	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) IceStormMigrate.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice
-	del /q LLUMap.h LLUMap.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice
-
-..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
-	del /q SubscriberMap.h SubscriberMap.cpp
-	$(SLICE2FREEZECMD) \
-	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
-	SubscriberMap ..\IceStorm\SubscriberRecord.ice
-
-# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE)
-	del /q V32FormatDB.h V32FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
-	V32FormatDB ..\IceStorm\V32Format.ice
-
-V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE)
-	del /q V31FormatDB.h V31FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
-	V31FormatDB ..\IceStorm\V31Format.ice
-
-V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice
-
-V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice
-
-LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice
-
-SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice
-
-IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice
-	$(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice
-	move IceStorm.h $(HDIR)
-
-Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice
-
-Scanner.cpp : Scanner.l
-	flex Scanner.l
-	del /q $@
-	echo #include "IceUtil/Config.h" > Scanner.cpp
-	type lex.yy.c >> Scanner.cpp
-	del /q lex.yy.c
-
-Grammar.cpp Grammar.h: Grammar.y
-	del /q Grammar.h Grammar.cpp
-	bison -dvt Grammar.y
-	move Grammar.tab.c Grammar.cpp
-	move Grammar.tab.h Grammar.h
-	del /q Grammar.output
-
-IceStorm.res: IceStorm.rc
-	rc.exe $(RCFLAGS) IceStorm.rc
-
-IceStormService.res: IceStormService.rc
-	rc.exe $(RCFLAGS) IceStormService.rc
-
-IceStormAdmin.res: IceStormAdmin.rc
-	rc.exe $(RCFLAGS) IceStormAdmin.rc
-
-IceStormMigrate.res: IceStormMigrate.rc
-	rc.exe $(RCFLAGS) IceStormMigrate.rc
-
-!ifdef BUILD_UTILS
-
-clean::
-	del /q LLUMap.h LLUMap.cpp
-	del /q SubscriberMap.h SubscriberMap.cpp
-	del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
-
-clean::
-	del /q IceStorm.cpp $(HDIR)\IceStorm.h
-	del /q IceStormInternal.cpp IceStormInternal.h
-	del /q V32Migrate.cpp V32Migrate.h
-	del /q V31Migrate.cpp V31Migrate.h
-	del /q LinkRecord.cpp LinkRecord.h
-	del /q Election.cpp Election.h
-	del /q SubscriberRecord.cpp SubscriberRecord.h
-	del /q $(DLLNAME:.dll=.*)
-	del /q $(SVCDLLNAME:.dll=.*)
-	del /q $(ADMIN:.exe=.*)
-	del /q $(MIGRATE:.exe=.*)
-	del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res
-
-clean::
-	del /q Grammar.cpp Grammar.h
-	del /q Scanner.cpp
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-	copy $(SVCLIBNAME) $(install_libdir)
-	copy $(SVCDLLNAME) $(install_bindir)
-	copy $(ADMIN) $(install_bindir)
-	copy $(MIGRATE) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-	copy $(SVCDLLNAME:.dll=.tds) $(install_bindir)
-	copy $(ADMIN:.exe=.tds) $(install_bindir)
-	copy $(MIGRATE:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-	copy $(SVCDLLNAME:.dll=.pdb) $(install_bindir)
-	copy $(ADMIN:.exe=.pdb) $(install_bindir)
-	copy $(MIGRATE:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!else
-
-install:: all
-
-$(EVERYTHING)::
-	$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\icestorm$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX).dll
+
+SVCLIBNAME	= $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
+SVCDLLNAME	= $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll
+
+ADMIN		= $(top_srcdir)\bin\icestormadmin.exe
+MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe
+
+!ifdef BUILD_UTILS
+
+TARGETS         = $(SVCLIBNAME) $(SVCDLLNAME) $(ADMIN) $(MIGRATE)
+
+!else
+
+TARGETS         = $(LIBNAME) $(DLLNAME)
+
+!endif
+
+OBJS		= IceStorm.obj
+
+SERVICE_OBJS	= NodeI.obj \
+		  Observers.obj \
+		  LLUMap.obj \
+		  Election.obj \
+		  Instance.obj \
+		  TraceLevels.obj \
+		  Subscriber.obj \
+		  TopicI.obj \
+		  TopicManagerI.obj \
+		  TransientTopicI.obj \
+		  TransientTopicManagerI.obj \
+                  SubscriberMap.obj \
+		  SubscriberRecord.obj \
+		  IceStormInternal.obj \
+		  Service.obj
+
+AOBJS		= Admin.obj \
+		  Grammar.obj \
+		  Scanner.obj \
+		  Parser.obj \
+		  Election.obj \
+		  SubscriberRecord.obj \
+		  IceStormInternal.obj
+
+MOBJS		= Migrate.obj \
+		  SubscriberRecord.obj \
+                  SubscriberMap.obj \
+                  LLUMap.obj \
+		  LinkRecord.obj \
+		  IceStormInternal.obj \
+		  Election.obj \
+                  V32FormatDB.obj \
+                  V31FormatDB.obj \
+                  V32Format.obj \
+                  V31Format.obj
+
+SRCS		= $(OBJS:.obj=.cpp) \
+		  $(SOBJS:.obj=.cpp) \
+		  $(AOBJS:.obj=.cpp) \
+		  $(MOBJS:.obj=.cpp)
+
+HDIR		= $(includedir)\IceStorm
+SDIR		= $(slicedir)\IceStorm
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+SLICE2CPPFLAGS	= --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..
+LINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
+ALINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib
+MLINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib
+
+SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir)
+
+!ifdef BUILD_UTILS
+
+CPPFLAGS	= $(CPPFLAGS) -DICE_STORM_API_EXPORTS
+
+!else
+
+CPPFLAGS	= $(CPPFLAGS) -DICE_STORM_LIB_API_EXPORTS
+
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+SPDBFLAGS       = /pdb:$(SVCDLLNAME:.dll=.pdb)
+APDBFLAGS       = /pdb:$(ADMIN:.exe=.pdb)
+MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceStorm.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceStorm.res $(PREOUT)$@ $(PRELIBS)$(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)
+
+$(SVCLIBNAME): $(SVCDLLNAME)
+
+$(SVCDLLNAME): $(SERVICE_OBJS) IceStormService.res
+	$(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) IceStormService.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
+	@if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp)
+
+$(ADMIN): $(AOBJS) IceStormAdmin.res 
+	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) IceStormAdmin.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+$(MIGRATE): $(MOBJS) IceStormMigrate.res
+	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) IceStormMigrate.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice
+	del /q LLUMap.h LLUMap.cpp
+	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice
+
+..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
+	del /q SubscriberMap.h SubscriberMap.cpp
+	$(SLICE2FREEZECMD) \
+	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
+	SubscriberMap ..\IceStorm\SubscriberRecord.ice
+
+# Needed for migration.
+V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE)
+	del /q V32FormatDB.h V32FormatDB.cpp
+	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
+	V32FormatDB ..\IceStorm\V32Format.ice
+
+V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE)
+	del /q V31FormatDB.h V31FormatDB.cpp
+	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
+	V31FormatDB ..\IceStorm\V31Format.ice
+
+V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice
+
+V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice
+
+LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice
+
+SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice
+
+IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice
+	$(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice
+	move IceStorm.h $(HDIR)
+
+Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice
+
+Scanner.cpp : Scanner.l
+	flex Scanner.l
+	del /q $@
+	echo #include "IceUtil/Config.h" > Scanner.cpp
+	type lex.yy.c >> Scanner.cpp
+	del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+	del /q Grammar.h Grammar.cpp
+	bison -dvt Grammar.y
+	move Grammar.tab.c Grammar.cpp
+	move Grammar.tab.h Grammar.h
+	del /q Grammar.output
+
+IceStorm.res: IceStorm.rc
+	rc.exe $(RCFLAGS) IceStorm.rc
+
+IceStormService.res: IceStormService.rc
+	rc.exe $(RCFLAGS) IceStormService.rc
+
+IceStormAdmin.res: IceStormAdmin.rc
+	rc.exe $(RCFLAGS) IceStormAdmin.rc
+
+IceStormMigrate.res: IceStormMigrate.rc
+	rc.exe $(RCFLAGS) IceStormMigrate.rc
+
+!ifdef BUILD_UTILS
+
+clean::
+	del /q LLUMap.h LLUMap.cpp
+	del /q SubscriberMap.h SubscriberMap.cpp
+	del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
+
+clean::
+	del /q IceStorm.cpp $(HDIR)\IceStorm.h
+	del /q IceStormInternal.cpp IceStormInternal.h
+	del /q V32Migrate.cpp V32Migrate.h
+	del /q V31Migrate.cpp V31Migrate.h
+	del /q LinkRecord.cpp LinkRecord.h
+	del /q Election.cpp Election.h
+	del /q SubscriberRecord.cpp SubscriberRecord.h
+	del /q $(DLLNAME:.dll=.*)
+	del /q $(SVCDLLNAME:.dll=.*)
+	del /q $(ADMIN:.exe=.*)
+	del /q $(MIGRATE:.exe=.*)
+	del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res
+
+clean::
+	del /q Grammar.cpp Grammar.h
+	del /q Scanner.cpp
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+	copy $(SVCLIBNAME) $(install_libdir)
+	copy $(SVCDLLNAME) $(install_bindir)
+	copy $(ADMIN) $(install_bindir)
+	copy $(MIGRATE) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+	copy $(SVCDLLNAME:.dll=.tds) $(install_bindir)
+	copy $(ADMIN:.exe=.tds) $(install_bindir)
+	copy $(MIGRATE:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+	copy $(SVCDLLNAME:.dll=.pdb) $(install_bindir)
+	copy $(ADMIN:.exe=.pdb) $(install_bindir)
+	copy $(MIGRATE:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!else
+
+install:: all
+
+$(EVERYTHING)::
+	$(MAKE) -nologo /f Makefile.mak BUILD_UTILS=1 $@
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
index 0cc876e18ad..4df4397d710 100644
--- a/cpp/src/IceUtil/Makefile.mak
+++ b/cpp/src/IceUtil/Makefile.mak
@@ -1,96 +1,96 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\iceutil$(LIBSUFFIX).lib
-DLLNAME         = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= ArgVector.obj \
-                  Cond.obj \
-                  ConvertUTF.obj \
-		  CountDownLatch.obj \
-		  CtrlCHandler.obj \
-		  Exception.obj \
-		  Shared.obj \
-		  InputUtil.obj \
-		  Options.obj \
-		  OutputUtil.obj \
-		  Random.obj \
-		  RWRecMutex.obj \
-		  RecMutex.obj \
-		  StaticMutex.obj \
-		  StringUtil.obj \
-		  Thread.obj \
-		  ThreadException.obj \
-		  Time.obj \
-		  Timer.obj \
-		  UUID.obj \
-		  Unicode.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS        = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceUtil.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceUtil.res $(PREOUT)$@ $(PRELIBS)$(ICE_OS_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
-
-IceUtil.res: IceUtil.rc
-	rc.exe $(RCFLAGS) IceUtil.rc
-
-clean::
-	del /q $(DLLNAME:.dll=.*)
-	del /q IceUtil.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\iceutil$(LIBSUFFIX).lib
+DLLNAME         = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= ArgVector.obj \
+                  Cond.obj \
+                  ConvertUTF.obj \
+		  CountDownLatch.obj \
+		  CtrlCHandler.obj \
+		  Exception.obj \
+		  Shared.obj \
+		  InputUtil.obj \
+		  Options.obj \
+		  OutputUtil.obj \
+		  Random.obj \
+		  RWRecMutex.obj \
+		  RecMutex.obj \
+		  StaticMutex.obj \
+		  StringUtil.obj \
+		  Thread.obj \
+		  ThreadException.obj \
+		  Time.obj \
+		  Timer.obj \
+		  UUID.obj \
+		  Unicode.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS        = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(OBJS)
+	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceUtil.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceUtil.res $(PREOUT)$@ $(PRELIBS)$(ICE_OS_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
+
+IceUtil.res: IceUtil.rc
+	rc.exe $(RCFLAGS) IceUtil.rc
+
+clean::
+	del /q $(DLLNAME:.dll=.*)
+	del /q IceUtil.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 9252022a713..ea81ddd4a9d 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -1,67 +1,67 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\icexml$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= Parser.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= $(CPPFLAGS) -DICE_XML_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-
-LINKWITH        = $(EXPAT_LIBS) $(BASELIBS)
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceXML.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceXML.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	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)
-
-IceXML.res: IceXML.rc
-	rc.exe $(RCFLAGS) IceXML.rc
-
-clean::
-	del /q $(DLLNAME:.dll=.*)
-	del /q IceXML.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\icexml$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= Parser.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= $(CPPFLAGS) -DICE_XML_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+LINKWITH        = $(EXPAT_LIBS) $(BASELIBS)
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) IceXML.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) IceXML.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	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)
+
+IceXML.res: IceXML.rc
+	rc.exe $(RCFLAGS) IceXML.rc
+
+clean::
+	del /q $(DLLNAME:.dll=.*)
+	del /q IceXML.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index 41995cd14f9..1c88d6b12fb 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -1,46 +1,46 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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		= IceUtil \
-		  Slice \
-		  slice2cpp \
-		  slice2cppe \
-		  slice2cs \
-		  slice2freeze \
-		  slice2freezej \
-		  slice2docbook \
-		  slice2java \
-		  slice2javae \
-		  slice2py \
-		  slice2rb \
-		  slice2sl \
-		  slice2html \
-		  Ice \
-		  IceXML \
-		  IceSSL \
-		  IceBox \
-		  IcePatch2 \
-		  Glacier2 \
-		  Freeze \
-		  FreezeScript \
-		  IceGridLib \
-		  IceStorm \
-		  IceGrid \
-                  iceserviceinstall \
-		  ca
-
-$(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-2008 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		= IceUtil \
+		  Slice \
+		  slice2cpp \
+		  slice2cppe \
+		  slice2cs \
+		  slice2freeze \
+		  slice2freezej \
+		  slice2docbook \
+		  slice2java \
+		  slice2javae \
+		  slice2py \
+		  slice2rb \
+		  slice2sl \
+		  slice2html \
+		  Ice \
+		  IceXML \
+		  IceSSL \
+		  IceBox \
+		  IcePatch2 \
+		  Glacier2 \
+		  Freeze \
+		  FreezeScript \
+		  IceGridLib \
+		  IceStorm \
+		  IceGrid \
+                  iceserviceinstall \
+		  ca
+
+$(EVERYTHING)::
+	@for %i in ( $(SUBDIRS) ) do \
+	    @if exist %i \
+	        @echo "making $@ in %i" && \
+	        cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index b8fa565c781..169f97b3a52 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -1,106 +1,106 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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\slice$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= Scanner.obj \
-		  Grammar.obj \
-		  Parser.obj \
-		  CPlusPlusUtil.obj \
-		  CsUtil.obj \
-		  JavaUtil.obj \
-		  Preprocessor.obj \
-		  Checksum.obj \
-		  PythonUtil.obj \
-		  DotNetNames.obj \
-		  RubyUtil.obj \
-		  Util.obj \
-		  MD5.obj \
-		  MD5I.obj \
-		  SignalHandler.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS  -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) Slice.res
-	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Slice.res $(PREOUT)$@ $(PRELIBS)$(BASELIBS) mcpp$(LIBSUFFIX).lib
-	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
-
-Scanner.cpp : Scanner.l
-	flex Scanner.l
-	del /q $@
-	echo #include "IceUtil/Config.h" > Scanner.cpp
-	type lex.yy.c >> Scanner.cpp
-	del /q lex.yy.c
-
-Grammar.cpp Grammar.h: Grammar.y
-	del /q Grammar.h Grammar.cpp
-	bison -dvt --name-prefix "slice_" Grammar.y
-	move Grammar.tab.c Grammar.cpp
-	move Grammar.tab.h Grammar.h
-	del /q Grammar.output
-
-Slice.res: Slice.rc
-	rc.exe $(RCFLAGS) Slice.rc
-
-clean::
-	del /q Grammar.cpp Grammar.h
-	del /q Scanner.cpp
-	del /q $(DLLNAME:.dll=.*)
-	del /q Slice.res
-
-install:: all
-	copy $(LIBNAME) $(install_libdir)
-	copy $(DLLNAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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\slice$(LIBSUFFIX).lib
+DLLNAME		= $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX).dll
+
+TARGETS		= $(LIBNAME) $(DLLNAME)
+
+OBJS		= Scanner.obj \
+		  Grammar.obj \
+		  Parser.obj \
+		  CPlusPlusUtil.obj \
+		  CsUtil.obj \
+		  JavaUtil.obj \
+		  Preprocessor.obj \
+		  Checksum.obj \
+		  PythonUtil.obj \
+		  DotNetNames.obj \
+		  RubyUtil.obj \
+		  Util.obj \
+		  MD5.obj \
+		  MD5I.obj \
+		  SignalHandler.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS  -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+
+$(DLLNAME):
+
+$(LIBNAME): $(OBJS)
+	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@
+
+!else
+
+$(LIBNAME): $(DLLNAME)
+
+$(DLLNAME): $(OBJS) Slice.res
+	$(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) Slice.res $(PREOUT)$@ $(PRELIBS)$(BASELIBS) mcpp$(LIBSUFFIX).lib
+	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
+
+Scanner.cpp : Scanner.l
+	flex Scanner.l
+	del /q $@
+	echo #include "IceUtil/Config.h" > Scanner.cpp
+	type lex.yy.c >> Scanner.cpp
+	del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+	del /q Grammar.h Grammar.cpp
+	bison -dvt --name-prefix "slice_" Grammar.y
+	move Grammar.tab.c Grammar.cpp
+	move Grammar.tab.h Grammar.h
+	del /q Grammar.output
+
+Slice.res: Slice.rc
+	rc.exe $(RCFLAGS) Slice.rc
+
+clean::
+	del /q Grammar.cpp Grammar.h
+	del /q Scanner.cpp
+	del /q $(DLLNAME:.dll=.*)
+	del /q Slice.res
+
+install:: all
+	copy $(LIBNAME) $(install_libdir)
+	copy $(DLLNAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(DLLNAME:.dll=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(DLLNAME:.dll=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/ca/Makefile.mak b/cpp/src/ca/Makefile.mak
index cd6c618a561..a0e46327c58 100644
--- a/cpp/src/ca/Makefile.mak
+++ b/cpp/src/ca/Makefile.mak
@@ -1,25 +1,25 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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
-
-CA_FILES =  iceca \
-            iceca.bat 
-
-CLASS_FILES=ImportKey.class
-
-install::
-	@for %i in ( $(CA_FILES) ) do \
-	    @echo "Installing %i" && \
-	    copy %i $(prefix)\bin
-	@for %i in ( $(CLASS_FILES) ) do \
-	    @echo "Installing %i" && \
-	    copy %i $(prefix)\lib
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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
+
+CA_FILES =  iceca \
+            iceca.bat 
+
+CLASS_FILES=ImportKey.class
+
+install::
+	@for %i in ( $(CA_FILES) ) do \
+	    @echo "Installing %i" && \
+	    copy %i $(prefix)\bin
+	@for %i in ( $(CLASS_FILES) ) do \
+	    @echo "Installing %i" && \
+	    copy %i $(prefix)\lib
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak
index 750e0cb562d..e8e9b3250ff 100755
--- a/cpp/src/iceserviceinstall/Makefile.mak
+++ b/cpp/src/iceserviceinstall/Makefile.mak
@@ -1,70 +1,70 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-TOOL		= $(top_srcdir)\bin\iceserviceinstall.exe
-
-TARGETS         = $(TOOL)
-
-OBJS            = ServiceInstaller.obj \
-                  Install.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH        = $(LIBS)
-!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
-LINKWITH	= /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
-!else
-EXTRA_MANIFEST  = security.manifest
-!endif
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS       = /pdb:$(TOOL:.exe=.pdb)
-!endif
-
-$(TOOL): $(OBJS) IceServiceInstall.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) IceServiceInstall.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest
-
-IceServiceInstall.res: IceServiceInstall.rc
-	rc.exe $(RCFLAGS) IceServiceInstall.rc
-
-
-clean::
-	del /q $(TOOL:.exe=.*)
-	del /q IceServiceInstall.res
-
-install:: all
-	copy $(TOOL) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(TOOL:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(TOOL:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-
-!include .depend
-
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+TOOL		= $(top_srcdir)\bin\iceserviceinstall.exe
+
+TARGETS         = $(TOOL)
+
+OBJS            = ServiceInstaller.obj \
+                  Install.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+LINKWITH        = $(LIBS)
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
+LINKWITH	= /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)
+!else
+EXTRA_MANIFEST  = security.manifest
+!endif
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS       = /pdb:$(TOOL:.exe=.pdb)
+!endif
+
+$(TOOL): $(OBJS) IceServiceInstall.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) IceServiceInstall.res $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest $(EXTRA_MANIFEST) -outputresource:$@;#1 && del /q $@.manifest
+
+IceServiceInstall.res: IceServiceInstall.rc
+	rc.exe $(RCFLAGS) IceServiceInstall.rc
+
+
+clean::
+	del /q $(TOOL:.exe=.*)
+	del /q IceServiceInstall.res
+
+install:: all
+	copy $(TOOL) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(TOOL:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(TOOL:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+
+!include .depend
+
diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak
index 5005387c740..16b28dacd30 100644
--- a/cpp/src/slice2cpp/Makefile.mak
+++ b/cpp/src/slice2cpp/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2cpp.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Cpp.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cpp.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Cpp.res: Slice2Cpp.rc
-	rc.exe $(RCFLAGS) Slice2Cpp.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Cpp.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2cpp.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Cpp.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cpp.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Cpp.res: Slice2Cpp.rc
+	rc.exe $(RCFLAGS) Slice2Cpp.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Cpp.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak
index 05eb58a4124..d9d5a35f7ea 100644
--- a/cpp/src/slice2cppe/Makefile.mak
+++ b/cpp/src/slice2cppe/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2cppe.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2CppE.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2CppE.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2CppE.res: Slice2CppE.rc
-	rc.exe $(RCFLAGS) Slice2CppE.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2CppE.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2cppe.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2CppE.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2CppE.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2CppE.res: Slice2CppE.rc
+	rc.exe $(RCFLAGS) Slice2CppE.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2CppE.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak
index b73bd03aa2e..358b81b5a90 100644
--- a/cpp/src/slice2cs/Makefile.mak
+++ b/cpp/src/slice2cs/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2cs.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Cs.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cs.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Cs.res: Slice2Cs.rc
-	rc.exe $(RCFLAGS) Slice2Cs.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Cs.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2cs.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Cs.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Cs.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Cs.res: Slice2Cs.rc
+	rc.exe $(RCFLAGS) Slice2Cs.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Cs.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak
index c616f3dce11..108ed0f1521 100644
--- a/cpp/src/slice2docbook/Makefile.mak
+++ b/cpp/src/slice2docbook/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2docbook.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Docbook.res 
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Docbook.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Docbook.res: Slice2Docbook.rc
-	rc.exe $(RCFLAGS) Slice2Docbook.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Docbook.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2docbook.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Docbook.res 
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Docbook.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Docbook.res: Slice2Docbook.rc
+	rc.exe $(RCFLAGS) Slice2Docbook.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Docbook.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak
index 869a3916475..3646472a8b3 100644
--- a/cpp/src/slice2freeze/Makefile.mak
+++ b/cpp/src/slice2freeze/Makefile.mak
@@ -1,56 +1,56 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2freeze.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-$(NAME): $(OBJS) Slice2Freeze.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Freeze.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Freeze.res: Slice2Freeze.rc
-	rc.exe $(RCFLAGS) Slice2Freeze.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Freeze.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2freeze.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+$(NAME): $(OBJS) Slice2Freeze.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Freeze.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Freeze.res: Slice2Freeze.rc
+	rc.exe $(RCFLAGS) Slice2Freeze.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Freeze.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak
index 82bd5cc0b00..d0864681d3f 100644
--- a/cpp/src/slice2freezej/Makefile.mak
+++ b/cpp/src/slice2freezej/Makefile.mak
@@ -1,60 +1,60 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2freezej.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2FreezeJ.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2FreezeJ.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2FreezeJ.res: Slice2FreezeJ.rc
-	rc.exe $(RCFLAGS) Slice2FreezeJ.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2FreezeJ.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2freezej.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2FreezeJ.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2FreezeJ.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2FreezeJ.res: Slice2FreezeJ.rc
+	rc.exe $(RCFLAGS) Slice2FreezeJ.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2FreezeJ.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak
index ef9f5e8a393..7b35976070e 100644
--- a/cpp/src/slice2html/Makefile.mak
+++ b/cpp/src/slice2html/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2html.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Html.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Html.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Html.res: Slice2Html.rc
-	rc.exe $(RCFLAGS) Slice2Html.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Html.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2html.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Html.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Html.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Html.res: Slice2Html.rc
+	rc.exe $(RCFLAGS) Slice2Html.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Html.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak
index 02523b8f8e6..5123296d2c5 100644
--- a/cpp/src/slice2java/Makefile.mak
+++ b/cpp/src/slice2java/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2java.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Java.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Java.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Java.res: Slice2Java.rc
-	rc.exe $(RCFLAGS) Slice2Java.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Java.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2java.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Java.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Java.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Java.res: Slice2Java.rc
+	rc.exe $(RCFLAGS) Slice2Java.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Java.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak
index 9b18d57c716..24f4d8c184d 100644
--- a/cpp/src/slice2javae/Makefile.mak
+++ b/cpp/src/slice2javae/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2javae.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2JavaE.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2JavaE.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2JavaE.res: Slice2JavaE.rc
-	rc.exe $(RCFLAGS) Slice2JavaE.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2JavaE.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2javae.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2JavaE.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2JavaE.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2JavaE.res: Slice2JavaE.rc
+	rc.exe $(RCFLAGS) Slice2JavaE.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2JavaE.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak
index 764ad2f759a..b630110b1d7 100644
--- a/cpp/src/slice2py/Makefile.mak
+++ b/cpp/src/slice2py/Makefile.mak
@@ -1,60 +1,60 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2py.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Py.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Py.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Py.res: Slice2Py.rc
-	rc.exe $(RCFLAGS) Slice2Py.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Py.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2py.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Py.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Py.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Py.res: Slice2Py.rc
+	rc.exe $(RCFLAGS) Slice2Py.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Py.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak
index da2b77b302e..02a6daf9f51 100755
--- a/cpp/src/slice2rb/Makefile.mak
+++ b/cpp/src/slice2rb/Makefile.mak
@@ -1,60 +1,60 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2rb.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Rb.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Rb.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Rb.res: Slice2Rb.rc
-	rc.exe $(RCFLAGS) Slice2Rb.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Rb.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2rb.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Rb.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Rb.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Rb.res: Slice2Rb.rc
+	rc.exe $(RCFLAGS) Slice2Rb.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Rb.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend
diff --git a/cpp/src/slice2sl/Makefile.mak b/cpp/src/slice2sl/Makefile.mak
index 37f04230ac4..3b6b04b72e0 100644
--- a/cpp/src/slice2sl/Makefile.mak
+++ b/cpp/src/slice2sl/Makefile.mak
@@ -1,61 +1,61 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2008 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	= ..\..
-
-NAME		= $(top_srcdir)\bin\slice2sl.exe
-
-TARGETS		= $(NAME)
-
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
-PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-$(NAME): $(OBJS) Slice2Sl.res
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Sl.res $(SETARGV) $(PREOUT)$@ \
-		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-Slice2Sl.res: Slice2Sl.rc
-	rc.exe $(RCFLAGS) Slice2Sl.rc
-
-clean::
-	del /q $(NAME:.exe=.*)
-	del /q Slice2Sl.res
-
-install:: all
-	copy $(NAME) $(install_bindir)
-
-!if "$(OPTIMIZE)" != "yes"
-
-!if "$(CPP_COMPILER)" == "BCC2006"
-
-install:: all
-	copy $(NAME:.exe=.tds) $(install_bindir)
-
-!else
-
-install:: all
-	copy $(NAME:.exe=.pdb) $(install_bindir)
-
-!endif
-
-!endif
-
-!include .depend
+# **********************************************************************
+#
+# Copyright (c) 2003-2008 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	= ..\..
+
+NAME		= $(top_srcdir)\bin\slice2sl.exe
+
+TARGETS		= $(NAME)
+
+OBJS		= Gen.obj \
+		  Main.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+PDBFLAGS        = /pdb:$(NAME:.exe=.pdb)
+!endif
+
+$(NAME): $(OBJS) Slice2Sl.res
+	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) Slice2Sl.res $(SETARGV) $(PREOUT)$@ \
+		$(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS)
+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+Slice2Sl.res: Slice2Sl.rc
+	rc.exe $(RCFLAGS) Slice2Sl.rc
+
+clean::
+	del /q $(NAME:.exe=.*)
+	del /q Slice2Sl.res
+
+install:: all
+	copy $(NAME) $(install_bindir)
+
+!if "$(OPTIMIZE)" != "yes"
+
+!if "$(CPP_COMPILER)" == "BCC2006"
+
+install:: all
+	copy $(NAME:.exe=.tds) $(install_bindir)
+
+!else
+
+install:: all
+	copy $(NAME:.exe=.pdb) $(install_bindir)
+
+!endif
+
+!endif
+
+!include .depend