Fixed Makefile indentation to use tab witdh=8 and indent width = 4

43 files changed, 196 insertions, 209 deletions

diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak
index 0471ae612f2..3eef76eaa62 100644
--- a/cpp/Makefile.mak
+++ b/cpp/Makefile.mak
@@ -14,25 +14,23 @@ top_srcdir	= .
 !if "$(WINRT)" != "yes"
 
 SUBDIRS		= config src include test 
-!if "$(CPP_COMPILER)" != "VC100"
-SUBDIRS		= $(SUBDIRS)
-!endif
 
 INSTALL_SUBDIRS	= "$(install_bindir)" "$(install_libdir)" "$(install_includedir)" "$(install_configdir)"
 
 install:: install-common
 	@for %i in ( $(INSTALL_SUBDIRS) ) do \
-		@if not exist %i \
-		@echo "Creating %i..." && \
-		mkdir %i
+	    @if not exist %i \
+	        @echo "Creating %i..." && \
+	        mkdir %i
 
 	@for %i in ( config src include ) do \
-		@echo "making $@ in %i" && \
-		cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+	    @echo "making $@ in %i" && \
+	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
 test::
 	@python $(top_srcdir)/allTests.py
 
 !else
+
 SUBDIRS		= src include test
 
 INSTALL_SUBDIRS	= $(prefix)\SDKs
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 28b93c8e50b..cdd3315faf8 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -21,7 +21,7 @@ prefix			?= /opt/Ice-$(VERSION)
 
 #
 # The "root directory" for runpath embedded in executables. Can be set
-# to change the runpath added to Ice executables. The default is 
+# to change the runpath added to Ice executables. The default is
 # platform dependent.
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
@@ -37,14 +37,14 @@ create_runpath_symlink  ?= no
 # Define embedded_runpath as no if you don't want any RPATH added to
 # the executables.
 #
-embedded_runpath ?= yes
+embedded_runpath 	?= yes
 
 #
 # Define new_dtags as yes if you want the linker to enable the new style
 # dtags, this will cause the linker to add a runpath entry instead of
 # a rpath entry. This only aplly to gcc builds on linux
 #
-new_dtags ?= no
+new_dtags 		?= no
 
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
@@ -61,7 +61,7 @@ new_dtags ?= no
 # "-arch i386 -arch x86_64".  The default is OS version dependent. Be
 # aware that this value may conflict with the setting of LP64 above.
 #
-#CXXARCHFLAGS		     = -arch i386 -arch x86_64
+#CXXARCHFLAGS		= -arch i386 -arch x86_64
 
 #
 # Define USE_READLINE as yes if you want to build parts of Ice using
@@ -144,13 +144,13 @@ USE_READLINE		?= no
 #
 # Default Mutex protocol: one of PrioNone or PrioInherit.
 #
-#DEFAULT_MUTEX_PROTOCOL  ?= PrioNone
+#DEFAULT_MUTEX_PROTOCOL ?= PrioNone
 
 #
 # Define CPP11 as yes if you want to enable C++11 features in GCC or
 # Clang.
 #
-#CPP11     ?= yes
+#CPP11     		?= yes
 
 # ----------------------------------------------------------------------
 # Don't change anything below this line!
@@ -185,9 +185,9 @@ headerdir		= $(top_srcdir)/include
 # because it is used in the .depend files
 #
 ifdef ice_src_dist
-	includedir		= $(top_srcdir)/include
+includedir		= $(top_srcdir)/include
 else
-	includedir		= $(ice_dir)/include
+includedir		= $(ice_dir)/include
 endif
 
 #
@@ -208,12 +208,12 @@ install_mandir		:= $(prefix)/share/man/man1
 endif
 
 ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit)
-	ICEUTIL_FLAGS           = -DICE_PRIO_INHERIT
+    ICEUTIL_FLAGS     	= -DICE_PRIO_INHERIT
 endif
 
 OPENSSL_FLAGS           += $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include)
 ifeq ($(OPENSSL_LIBS),)
-	OPENSSL_LIBS            = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto
+    OPENSSL_LIBS	= $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto
 endif
 OPENSSL_RPATH_LINK      = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir)))
 
@@ -222,61 +222,61 @@ ifeq ($(SSL_OS_LIBS),)
 endif
 
 ifneq ($(BZIP2_HOME),)
-	BZIP2_FLAGS             = I$(BZIP2_HOME)/include)
+    BZIP2_FLAGS         = I$(BZIP2_HOME)/include)
 endif
 ifeq ($(BZIP2_LIBS),)
-	BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
+    BZIP2_LIBS          = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
 endif
 BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
 
 ifeq ($(ICONV_LIBS),)
-	ICONV_LIBS              = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
+    ICONV_LIBS          = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
 endif
 
 ifneq ($(DB_HOME),)
-	DB_FLAGS             = -I$(DB_HOME)/include
-	ifeq ($(DB_LIBS),)
-	  DB_LIBS              = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
-	endif
-	DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir))
+    DB_FLAGS            = -I$(DB_HOME)/include
+    ifeq ($(DB_LIBS),)
+        DB_LIBS        	= -L$(DB_HOME)/$(libsubdir) -ldb_cxx
+    endif
+    DB_RPATH_LINK       = $(call rpathlink,$(DB_HOME)/$(libsubdir))
 else
-   ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
-	  DB_FLAGS          = -I/usr/include/db53
-	  DB_LIBS           = -L/usr/$(libsubdir)/db53 -ldb_cxx
-   else
-	  ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
-		  DB_FLAGS          = -I/usr/local/include/db53
-		  DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
-	  else
-		DB_LIBS      = -ldb_cxx
-	  endif
+    ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+	DB_FLAGS	= -I/usr/include/db53
+	DB_LIBS         = -L/usr/$(libsubdir)/db53 -ldb_cxx
+    else
+	ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+	    DB_FLAGS          = -I/usr/local/include/db53
+	    DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
+	else
+	    DB_LIBS      = -ldb_cxx
+	endif
    endif
 endif
 
 EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
 ifeq ($(EXPAT_LIBS),)
-	EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
+    EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
 endif
 EXPAT_RPATH_LINK        = $(if $(EXPAT_HOME),$(call rpathlink,$(EXPAT_HOME)/$(libsubdir)))
 
 ifeq ($(MCPP_LIBS),)
-	ifeq ($(MCPP_HOME),)
-		#
-		# If libmcpp.a is in the third-party subdirectory, we are building the core C++ distribution
-		# and we used that mcpp package.
-		#
-		ifneq ($(wildcard ../../../third-party/mcpp/lib/libmcpp.a),)
-			MCPP_HOME = ../../../third-party/mcpp
-		endif
+    ifeq ($(MCPP_HOME),)
+        #
+        # If libmcpp.a is in the third-party subdirectory, we are building the core C++ distribution
+        # and we used that mcpp package.
+        #
+	ifneq ($(wildcard ../../../third-party/mcpp/lib/libmcpp.a),)
+	    MCPP_HOME = ../../../third-party/mcpp
 	endif
-	MCPP_LIBS              = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp
+    endif
+    MCPP_LIBS              = $(if $(MCPP_HOME),-L$(MCPP_HOME)/$(libsubdir)) -lmcpp
 endif
 
 ifeq ($(PLATFORM_HAS_READLINE),yes)
-	ifeq ($(USE_READLINE),yes)
+    ifeq ($(USE_READLINE),yes)
 	READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
 	READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline
-	endif
+    endif
 endif
 
 ICECPPFLAGS		= -I$(slicedir)
@@ -284,70 +284,70 @@ ICECPPFLAGS		= -I$(slicedir)
 SLICE2CPPFLAGS		= $(ICECPPFLAGS)
 
 ifeq ($(ice_dir), $(usr_dir))
-	LDFLAGS		= $(LDPLATFORMFLAGS) $(CXXFLAGS)
-	ifeq ($(CPP11),yes)
-            LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix)
-	endif
+    LDFLAGS		= $(LDPLATFORMFLAGS) $(CXXFLAGS)
+    ifeq ($(CPP11),yes)
+        LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix)
+    endif
 else
-	CPPFLAGS	+= -I$(includedir)
-	ifdef ice_src_dist
+    CPPFLAGS	+= -I$(includedir)
+    ifdef ice_src_dist
 	LDFLAGS	= $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)$(cpp11libdirsuffix)
-	else
+    else
 	LDFLAGS	= $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix)
-	endif
+    endif
 endif
 
 ifeq ($(FLEX_NOLINE),yes)
-	FLEXFLAGS	       := -L
+    FLEXFLAGS := -L
 else
-	FLEXFLAGS	       :=
+    FLEXFLAGS :=
 endif
 
 ifeq ($(BISON_NOLINE),yes)
-	BISONFLAGS		:= -dvtl
+    BISONFLAGS := -dvtl
 else
-	BISONFLAGS		:= -dvt
+    BISONFLAGS := -dvt
 endif
 
 ifeq ($(mkshlib),)
-	$(error You need to define mkshlib in Make.rules.$(UNAME))
+    $(error You need to define mkshlib in Make.rules.$(UNAME))
 endif
 
 ifeq ($(mktestname),)
-	mktestname	= $(1)$(EXE_EXT)
+    mktestname	= $(1)$(EXE_EXT)
 endif
 
 ifeq ($(mktest),)
-	mktest 	  = $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $(@) $(2) $(3)
+    mktest 	  = $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $(@) $(2) $(3)
 endif
 
 ifdef ice_src_dist
 ifeq ($(STATICLIBS),yes)
-	SLICEPARSERLIB	=
+    SLICEPARSERLIB	=
 else
-	SLICEPARSERLIB	= $(libdir)/$(call mklibfilename,Slice,$(VERSION))
+    SLICEPARSERLIB	= $(libdir)/$(call mklibfilename,Slice,$(VERSION))
 endif
-	SLICE2CPP	= $(bindir)/slice2cpp
-	SLICE2FREEZE	= $(bindir)/slice2freeze
+    SLICE2CPP	= $(bindir)/slice2cpp
+    SLICE2FREEZE	= $(bindir)/slice2freeze
 else
-	SLICEPARSERLIB  = $(ice_dir)/$(libsubdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION)))
-	ifeq ($(wildcard $(SLICEPARSERLIB)),)
-		SLICEPARSERLIB  = $(ice_dir)/$(lib64subdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION)))
-	endif
-	SLICE2CPP	= $(ice_dir)/$(binsubdir)/slice2cpp
-	SLICE2FREEZE	= $(ice_dir)/$(binsubdir)/slice2freeze
+    SLICEPARSERLIB  = $(ice_dir)/$(libsubdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION)))
+    ifeq ($(wildcard $(SLICEPARSERLIB)),)
+	SLICEPARSERLIB  = $(ice_dir)/$(lib64subdir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION)))
+    endif
+    SLICE2CPP	= $(ice_dir)/$(binsubdir)/slice2cpp
+    SLICE2FREEZE	= $(ice_dir)/$(binsubdir)/slice2freeze
 endif
 
 ifeq ($(SLICE_LIBS),)
-	ifeq ($(STATICLIBS),yes)
-		SLICE_LIBS = -lSlice -lmcpp $(BASELIBS)
-	else
-		SLICE_LIBS = -lSlice $(BASELIBS)
-	endif
+    ifeq ($(STATICLIBS),yes)
+	SLICE_LIBS = -lSlice -lmcpp $(BASELIBS)
+    else
+	SLICE_LIBS = -lSlice $(BASELIBS)
+    endif
 endif
 
 ifeq ($(ICESSL_LIBS),)
-	ICESSL_LIBS         = -lIceSSL
+    ICESSL_LIBS         = -lIceSSL
 endif
 
 EVERYTHING		= all clean install compile-slice
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index d672de5c8c3..e3892b8bed3 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -20,14 +20,14 @@ CXXFLAGS		+= -Wall -Werror -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION)
 
 # If MAXWARN is set then enable extra warnings
 ifeq ($(MAXWARN),yes)
-    CXXFLAGS                += -Wextra -Wshadow -Wredundant-decls
+    CXXFLAGS		+= -Wextra -Wshadow -Wredundant-decls
 endif
 
 #
 # By default we build x86_64 binaries.
 #
 ifeq ($(CXXARCHFLAGS),)
-CXXARCHFLAGS    := -arch x86_64
+CXXARCHFLAGS    	:= -arch x86_64
 endif
 
 ifeq ($(OPTIMIZE),yes)
@@ -47,7 +47,7 @@ endif
 #
 # C++ run-time libraries, necessary for linking some shared libraries.
 #
-CXXLIBS		=
+CXXLIBS	=
 
 clean::
 	rm -f *.keychain *.fl*
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 5668097a15f..659e7d1f27e 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -45,12 +45,12 @@ ifeq ($(CXX),g++)
         #
         # We are an ultra, at least, and so have the atomic instructions
         #
-        $(warning ===================================================================) 
+        $(warning ===================================================================)
         $(warning Linux on SPARC is currently unsupported. The Ice team does not)
         $(warning maintain SPARC specific portions of the source code or build)
         $(warning system. Contact sales@zeroc.com if you wish to sponsor official)
         $(warning support.)
-        $(warning ===================================================================) 
+        $(warning ===================================================================)
         USE_SPARC_ASM	= yes
         CXXARCHFLAGS	+= -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM
     endif
@@ -61,12 +61,12 @@ ifeq ($(CXX),g++)
         # On sun4m, there is a bug in some CPU/kernel/gcc configurations which
         # prevent us from using '-mcpu=v8'
         #
-        $(warning ===================================================================) 
+        $(warning ===================================================================)
         $(warning Linux on SPARC is currently unsupported. The Ice team does not)
         $(warning maintain SPARC specific portions of the source code or build)
         $(warning system. Contact sales@zeroc.com if you wish to sponsor official)
         $(warning support.)
-        $(warning ===================================================================) 
+        $(warning ===================================================================)
         USE_SPARC_ASM	= no
         CXXARCHFLAGS	+= -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
     endif
@@ -85,7 +85,7 @@ ifeq ($(CXX),g++)
     ifeq ($(MAXWARN),yes)
         CXXFLAGS		+= -Wextra -Wshadow
 	GCC_GTEQ_460 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40600)
-    	ifeq ($(GCC_GTEQ_460),1)
+	ifeq ($(GCC_GTEQ_460),1)
 		CXXFLAGS	+= -Wredundant-decls
 	endif
     endif
@@ -97,9 +97,9 @@ ifeq ($(CXX),g++)
     ifeq ($(OPTIMIZE),yes)
         CXXFLAGS		+= -O2 -DNDEBUG
     else
-        CXXFLAGS		+= -g 
+        CXXFLAGS		+= -g
     endif
-   
+
     #
     # Add RPATH to LDEXEFLAGS if embedded_runpath is set to yes
     #
@@ -123,7 +123,7 @@ ifeq ($(CXX),g++)
         ifeq ($(prefix), $(usr_dir))
             RPATH_DIR =
         endif
-        
+
         #
         # Clear the rpath dir when building agains system install.
         #
@@ -156,20 +156,20 @@ ifeq ($(CXX),g++)
 
     mklib		= ar cr $(1) $(2)
 
-    rpathlink    = -Wl,-rpath-link,$(1) 
+    rpathlink    	= -Wl,-rpath-link,$(1)
 
     LDPLATFORMFLAGS	+= -rdynamic
 
 endif
 
 ifeq ($(CXX),icpc)
-   $(warning ===================================================================) 
+   $(warning ===================================================================)
    $(warning Intel C++ is currently not supported. The Ice team does not)
    $(warning maintain Intel C++ specific portions of the source code or build)
    $(warning system.  Contact sales@zeroc.com if you wish to sponsor official)
    $(warning support.)
-   $(warning ===================================================================) 
-   CXXFLAGS		= -D_REENTRANT    
+   $(warning ===================================================================)
+   CXXFLAGS		= -D_REENTRANT
 
    ifneq ($(GENPIC),no)
       CXXFLAGS		+= -fPIC
@@ -190,7 +190,7 @@ ifeq ($(CXX),icpc)
 
    mklib		= ar cr $(1) $(2)
 
-   rpathlink    = -Wl,-rpath-link,$(1) 
+   rpathlink    	= -Wl,-rpath-link,$(1)
 
 endif
 
@@ -201,7 +201,7 @@ ifneq ($(NPTL_LIB),)
 endif
 
 ICESSL_LIBS     = $(OPENSSL_RPATH_LINK) -lIceSSL
-LIBS			= $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
+LIBS		= $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
 
 CRYPT_OS_LIBS   = -lcrypt
 ICEUTIL_OS_LIBS = -lrt $(OPENSSL_RPATH_LINK) -lcrypto
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index 8a67774be2c..8c54d512fa8 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -12,7 +12,7 @@
 #
 
 #
-# If CXX is not defined anywhere, the default (from gmake) is g++. 
+# If CXX is not defined anywhere, the default (from gmake) is g++.
 #
 CXX = CC
 
@@ -27,13 +27,12 @@ ifeq ($(CXX),CC)
     #
     # Recent version of Sun CC
     #
-    
     ifeq ($(LP64),yes)
          CXXARCHFLAGS   += -m64
     else
 	 CXXARCHFLAGS   += -m32
     endif
-          
+
     #
     # wvarhidenmem,wvarhidemem: various name hiding
     # notemsource: Could not find source for <template name>
@@ -53,15 +52,13 @@ ifeq ($(CXX),CC)
     else
         CXXFLAGS     += -g
     endif
-    
+
     mkshlib          = $(CXX) -G $(LDFLAGS) -o $(1) -h $(2) $(3) $(4)
 
     mklib            = $(CXX) -xar -o $(1) $(2)
 
-    
     CXXLIBS          = -lCrun -lCstd
 
-
     ifneq ($(embedded_runpath_prefix),)
          LDPLATFORMFLAGS    = -norunpath -R $(runpath_libdir) -z text $(PLATFORMLIBDIRS)
     else
@@ -93,7 +90,7 @@ ifeq ($(CXX),g++)
     else
         CXXFLAGS	    += -g
     endif
-    
+
     mkshlib		    = $(CXX) -shared $(LDFLAGS) -o $(1) -h $(2) $(3) $(4)
 
     mklib		    = ar cr $(1) $(2)
@@ -116,4 +113,3 @@ LIBS			    = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
 
 ICEUTIL_OS_LIBS		    = -lpthread -lrt -lcrypto
 ICE_OS_LIBS		    = -ldl -lsocket
-
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index c1d1f6c0619..e4d556f6e54 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -114,7 +114,6 @@ includedir		= $(top_srcdir)\include
 includedir		= $(ice_dir)\include
 !endif
 
-install_bindir		= $(prefix)\bin$(x64suffix)
 install_libdir	  	= $(prefix)\lib$(x64suffix)
 install_includedir	= $(prefix)\include
 install_configdir	= $(prefix)\config
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc
index 19d45244fe9..28e1788bdff 100755
--- a/cpp/config/Make.rules.msvc
+++ b/cpp/config/Make.rules.msvc
@@ -82,9 +82,9 @@ LDFLAGS		= $(LDFLAGS) /nologo
 LDFLAGS		= $(LDFLAGS) /NXCOMPAT /MANIFEST:NO /APPCONTAINER /NOLOGO
 !if "$(CPP_COMPILER)" == "VC120"
 !if "$(ARCH)" == "x86"
-LDFLAGS   = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store"
+LDFLAGS		= $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store"
 !else
-LDFLAGS   = $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store\$(ARCH)"
+LDFLAGS 	= $(LDFLAGS) /LIBPATH:"$(VCINSTALLDIR)\lib\store\$(ARCH)"
 !endif
 !else
 LDFLAGS		= $(LDFLAGS) /FIXED:no
@@ -174,4 +174,3 @@ sdks: $(SDK_LIBRARY_PATH) $(SDK_REDIST_PATH) $(SDK_REFERENCES_PATH) $(SDK_BASE_P
 
 
 !endif
-
diff --git a/cpp/include/Glacier2/Makefile.mak b/cpp/include/Glacier2/Makefile.mak
index 0040de0c326..5f57945c667 100644
--- a/cpp/include/Glacier2/Makefile.mak
+++ b/cpp/include/Glacier2/Makefile.mak
@@ -28,7 +28,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/include/Ice/Makefile.mak b/cpp/include/Ice/Makefile.mak
index 9cc56abbff5..f6443bc3fa0 100644
--- a/cpp/include/Ice/Makefile.mak
+++ b/cpp/include/Ice/Makefile.mak
@@ -28,7 +28,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/include/IceGrid/Makefile.mak b/cpp/include/IceGrid/Makefile.mak
index 761292962fa..8fb9e137e76 100644
--- a/cpp/include/IceGrid/Makefile.mak
+++ b/cpp/include/IceGrid/Makefile.mak
@@ -28,7 +28,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak
index c75ebd96b09..07028a332c1 100644
--- a/cpp/include/IceSSL/Makefile.mak
+++ b/cpp/include/IceSSL/Makefile.mak
@@ -28,7 +28,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/include/IceStorm/Makefile.mak b/cpp/include/IceStorm/Makefile.mak
index dd143e6c158..91888169e6b 100644
--- a/cpp/include/IceStorm/Makefile.mak
+++ b/cpp/include/IceStorm/Makefile.mak
@@ -28,7 +28,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/include/IceUtil/Makefile.mak b/cpp/include/IceUtil/Makefile.mak
index e79566e752a..f1a63f3143a 100644
--- a/cpp/include/IceUtil/Makefile.mak
+++ b/cpp/include/IceUtil/Makefile.mak
@@ -27,7 +27,7 @@ install::
 all::
         @echo SDK_HEADERS       =  \> .headers
         @for /f %i in ('dir /b *.h') do \
-                @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
+            @echo ^ $$(SDK_INCLUDE_PATH)\$$(INCLUDE_DIR)\%i \>> .headers
 
 
 !include .headers
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 8b017532e20..a1f0d151f28 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -15,7 +15,7 @@ LIBNAME		= $(call mklibname,Freeze)
 
 TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
 
-SLICE_OBJS     = BackgroundSaveEvictor.o \
+SLICE_OBJS      = BackgroundSaveEvictor.o \
 		  CatalogData.o \
 		  Connection.o \
 		  ConnectionF.o \
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index b69cb80721d..cd25fd9f481 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -25,7 +25,7 @@ COMMON_OBJS	= AssignVisitor.o \
 		  Util.o \
 		  Grammar.o
 
-TRANSFORM_OBJS = TransformAnalyzer.o \
+TRANSFORM_OBJS 	= TransformAnalyzer.o \
 		  TransformVisitor.o \
 		  Transformer.o \
 		  transformdb.o
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index e6f133ca4f9..8d2fca43101 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -54,7 +54,7 @@ SLICE_OBJS	= BuiltinSequences.o \
 		  SliceChecksumDict.o \
 		  Version.o
 
-OBJS	= Acceptor.o \
+OBJS		= Acceptor.o \
 		  ACM.o \
 		  Application.o \
 	 	  AsyncResult.o \
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 33ed98f7a81..14da8e051d9 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -16,7 +16,7 @@ REGISTRY_SERVER	= $(bindir)/icegridregistry
 TARGETS         = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
 
 SLICE_OBJS      = Internal.o \
-				  IceLocatorDiscovery.o
+		  IceLocatorDiscovery.o
 
 ADMIN_OBJS	= Client.o \
 		  DescriptorBuilder.o \
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index 32ddf0acc2a..c9a2bdc68a7 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -17,8 +17,8 @@ NODE_SERVER_R	= $(top_srcdir)\bin\icegridnode.exe
 NODE_SERVER	= $(top_srcdir)\bin\icegridnode$(LIBSUFFIX).exe
 
 
-REGISTRY_SERVER_D	= $(top_srcdir)\bin\icegridregistryd.exe
-REGISTRY_SERVER_R	= $(top_srcdir)\bin\icegridregistry.exe
+REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe
+REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe
 
 REGISTRY_SERVER	= $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe
 
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index 61b3f92d3aa..e6439145991 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -33,17 +33,17 @@ OBJS		= AcceptorI.o \
 
 ifneq ($(findstring MINGW,$(shell uname)),)
 OBJS		:= $(OBJS) \
-		SChannelEngine.o \
-		SChannelTransceiverI.o
+		   SChannelEngine.o \
+		   SChannelTransceiverI.o
 else
 ifeq ($(shell uname),Darwin)
 OBJS		:= $(OBJS) \
-		SecureTransportEngine.o \
-		SecureTransportTransceiverI.o
+		   SecureTransportEngine.o \
+		   SecureTransportTransceiverI.o
 else
 OBJS		:= $(OBJS) \
-		OpenSSLEngine.o \
-		OpenSSLTransceiverI.o
+		   OpenSSLEngine.o \
+		   OpenSSLTransceiverI.o
 endif
 endif
 
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index d382aa6b4f5..2e83e626554 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -9,9 +9,9 @@
 
 top_srcdir	= ../..
 
-LIBFILENAME  = $(call mklibfilename,IceStormService,$(VERSION))
-SONAME       = $(call mksoname,IceStormService,$(SOVERSION))
-LIBNAME	     = $(call mklibname,IceStormService)
+LIBFILENAME  	= $(call mklibfilename,IceStormService,$(VERSION))
+SONAME       	= $(call mksoname,IceStormService,$(SOVERSION))
+LIBNAME	     	= $(call mklibname,IceStormService)
 
 ADMIN		= $(bindir)/icestormadmin
 MIGRATE		= $(bindir)/icestormmigrate
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index a15cc4df501..70230eff513 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -8,9 +8,9 @@
 # **********************************************************************
 
 top_srcdir	= ../..
- 
+
 LIBFILENAME     = $(call mklibfilename,IceXML,$(VERSION))
-SONAME          = $(call mksoname,IceXML,$(SOVERSION))  
+SONAME          = $(call mksoname,IceXML,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceXML)
 
 TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 328a3f9a9bb..9ec88f5786b 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -8,7 +8,7 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
- 
+
 LIBNAME		= $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib
 DLLNAME		= $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
 
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 56178276555..e99d90d50b5 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -13,49 +13,49 @@ include $(top_srcdir)/config/Make.rules
 
 ifneq ($(findstring MINGW,$(UNAME)),)
     SUBDIRS	= IceUtil \
-			  Slice \
-			  slice2cpp \
-			  slice2rb \
-			  Ice \
-			  IceSSL \
-			  IceDiscovery \
-			  IceLocatorDiscovery
+		  Slice \
+		  slice2cpp \
+		  slice2rb \
+		  Ice \
+		  IceSSL \
+		  IceDiscovery \
+		  IceLocatorDiscovery
 else
     SUBDIRS	= IceUtil \
-			  Slice \
-			  slice2cpp \
-			  slice2cs \
-			  slice2freeze \
-			  slice2freezej \
-			  slice2java \
-			  slice2php \
-			  slice2py \
-			  slice2rb \
-			  slice2html \
-			  slice2js
+		  Slice \
+		  slice2cpp \
+		  slice2cs \
+		  slice2freeze \
+		  slice2freezej \
+		  slice2java \
+		  slice2php \
+		  slice2py \
+		  slice2rb \
+		  slice2html \
+		  slice2js
 
 ifeq ($(UNAME),Darwin)
-	SUBDIRS	:= $(SUBDIRS) slice2objc
+    SUBDIRS	:= $(SUBDIRS) slice2objc
 endif
 
-	SUBDIRS	:= $(SUBDIRS) \
-			  Ice \
-			  IceXML \
-			  IceSSL \
-			  IceDiscovery \
-			  IceLocatorDiscovery \
-			  Freeze \
-			  FreezeScript \
-			  IceBox \
-			  Glacier2Lib \
-			  Glacier2CryptPermissionsVerifier \
-			  Glacier2 \
-			  IcePatch2Lib \
-			  IcePatch2 \
-			  IceStormLib \
-			  IceGridLib \
-			  IceStorm \
-			  IceGrid
+    SUBDIRS	:= $(SUBDIRS) \
+		   Ice \
+		   IceXML \
+		   IceSSL \
+		   IceDiscovery \
+		   IceLocatorDiscovery \
+		   Freeze \
+		   FreezeScript \
+		   IceBox \
+		   Glacier2Lib \
+		   Glacier2CryptPermissionsVerifier \
+		   Glacier2 \
+		   IcePatch2Lib \
+		   IcePatch2 \
+		   IceStormLib \
+		   IceGridLib \
+		   IceStorm \
+		   IceGrid
 endif
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
diff --git a/cpp/test/Glacier2/attack/Makefile b/cpp/test/Glacier2/attack/Makefile
index f2a53dfb235..4963f97a9db 100644
--- a/cpp/test/Glacier2/attack/Makefile
+++ b/cpp/test/Glacier2/attack/Makefile
@@ -12,9 +12,9 @@ top_srcdir	= ../../..
 CLIENT		= client
 SERVER		= server
 
-TARGETS		= $(CLIENT) $(SERVER) 
+TARGETS		= $(CLIENT) $(SERVER)
 
-SLICE_OBJS		= Backend.o
+SLICE_OBJS	= Backend.o
 
 COBJS		= $(SLICE_OBJS) \
 		  BackendI.o \
diff --git a/cpp/test/Glacier2/override/Makefile b/cpp/test/Glacier2/override/Makefile
index 9d700f85036..57c4f07b4b7 100644
--- a/cpp/test/Glacier2/override/Makefile
+++ b/cpp/test/Glacier2/override/Makefile
@@ -14,7 +14,7 @@ SERVER		= server
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-SLICE_OBJS		= Callback.o
+SLICE_OBJS	= Callback.o
 
 COBJS		= $(SLICE_OBJS) \
 		  CallbackI.o \
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile
index 37b00f4c76f..3735e180ff7 100644
--- a/cpp/test/Ice/Makefile
+++ b/cpp/test/Ice/Makefile
@@ -52,7 +52,7 @@ SUBDIRS		= proxy \
                   echo \
                   logger \
                   networkProxy \
-				  services
+		  services
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
diff --git a/cpp/test/Ice/background/Makefile.mak b/cpp/test/Ice/background/Makefile.mak
index 47da558ee77..01b9940f29a 100644
--- a/cpp/test/Ice/background/Makefile.mak
+++ b/cpp/test/Ice/background/Makefile.mak
@@ -16,7 +16,6 @@ DLLNAME		= testtransport$(SOVERSION)$(LIBSUFFIX).dll
 
 TARGETS		= $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME)
 
-
 SLICE_OBJS 	= .\Test.obj
 
 COBJS		= $(SLICE_OBJS) \
diff --git a/cpp/test/Ice/custom/Makefile.mak b/cpp/test/Ice/custom/Makefile.mak
index 350c5cfd611..eb5ee807e4a 100644
--- a/cpp/test/Ice/custom/Makefile.mak
+++ b/cpp/test/Ice/custom/Makefile.mak
@@ -16,7 +16,6 @@ COLLOCATED	= collocated.exe
 
 TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
 
-
 SLICE_OBJS	= .\Test.obj \
 		  .\TestAMD.obj \
 		  .\Wstring.obj \
@@ -27,7 +26,7 @@ COBJS           = .\Test.obj \
 		  .\Client.obj \
 		  .\AllTests.obj \
 		  .\MyByteSeq.obj \
-		  .\StringConverterI.obj 
+		  .\StringConverterI.obj
 
 SOBJS           = .\Test.obj \
 		  .\Wstring.obj \
diff --git a/cpp/test/Ice/dispatcher/Makefile b/cpp/test/Ice/dispatcher/Makefile
index a5476266e78..d60583058c8 100644
--- a/cpp/test/Ice/dispatcher/Makefile
+++ b/cpp/test/Ice/dispatcher/Makefile
@@ -15,7 +15,7 @@ COLLOCATED	= $(call mktestname,collocated)
 
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
-SLICE_OBJS		= Test.o
+SLICE_OBJS	= Test.o
 
 COBJS		= $(SLICE_OBJS) \
 		  Dispatcher.o \
diff --git a/cpp/test/Ice/logger/Makefile b/cpp/test/Ice/logger/Makefile
index 46f0ac41542..8c337fa6a76 100644
--- a/cpp/test/Ice/logger/Makefile
+++ b/cpp/test/Ice/logger/Makefile
@@ -35,15 +35,15 @@ LINKWITH	:= $(LIBS) $(ICONV_LIBS)
 $(CLIENT1): $(C1OBJS)
 	rm -f $@
 	$(call mktest,$@,$(C1OBJS),$(LINKWITH))
-	
+
 $(CLIENT2): $(C2OBJS)
 	rm -f $@
 	$(call mktest,$@,$(C2OBJS),$(LINKWITH))
-	
+
 $(CLIENT3): $(C3OBJS)
 	rm -f $@
 	$(call mktest,$@,$(C3OBJS),$(LINKWITH))
-	
+
 $(CLIENT4): $(C4OBJS)
 	rm -f $@
 	$(call mktest,$@,$(C4OBJS),$(LINKWITH))
diff --git a/cpp/test/Ice/logger/Makefile.mak b/cpp/test/Ice/logger/Makefile.mak
index f8b2389dd6e..91f7cd961ef 100644
--- a/cpp/test/Ice/logger/Makefile.mak
+++ b/cpp/test/Ice/logger/Makefile.mak
@@ -41,12 +41,12 @@ $(CLIENT1): $(C1OBJS)
 	$(LINK) $(LD_EXEFLAGS) $(C1PDBFLAGS) $(SETARGV) $(C1OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	    
+
 $(CLIENT2): $(C2OBJS)
 	$(LINK) $(LD_EXEFLAGS) $(C2PDBFLAGS) $(SETARGV) $(C2OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-	    
+
 $(CLIENT3): $(C3OBJS)
 	$(LINK) $(LD_EXEFLAGS) $(C3PDBFLAGS) $(SETARGV) $(C3OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
diff --git a/cpp/test/Ice/services/Makefile b/cpp/test/Ice/services/Makefile
index 0c868574cb0..2ba8bae1c90 100644
--- a/cpp/test/Ice/services/Makefile
+++ b/cpp/test/Ice/services/Makefile
@@ -16,8 +16,8 @@ TARGETS		= $(CLIENT)
 SLICE_OBJS	= Test.o
 
 COBJS		= Client.o \
-			  AllTests.o \
-			  $(SLICE_OBJS)
+		  AllTests.o \
+		  $(SLICE_OBJS)
 
 OBJS		= $(COBJS)
 
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mak b/cpp/test/Ice/slicing/exceptions/Makefile.mak
index cb23e300c0f..78ee9040d09 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile.mak
+++ b/cpp/test/Ice/slicing/exceptions/Makefile.mak
@@ -27,7 +27,7 @@ COBJS		= .\Test.obj \
 		  .\AllTests.obj
 
 SOBJS		= .\Test.obj \
- 		  .\ServerPrivate.obj \
+		  .\ServerPrivate.obj \
 		  .\TestI.obj \
 		  .\Server.obj
 
diff --git a/cpp/test/Ice/udp/Makefile b/cpp/test/Ice/udp/Makefile
index a9fd3f02983..0040afbe7ea 100644
--- a/cpp/test/Ice/udp/Makefile
+++ b/cpp/test/Ice/udp/Makefile
@@ -14,7 +14,7 @@ SERVER		= $(call mktestname,server)
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-SLICE_OBJS		= Test.o
+SLICE_OBJS	= Test.o
 
 COBJS		= $(SLICE_OBJS) \
 		  Client.o \
diff --git a/cpp/test/IceBox/Makefile b/cpp/test/IceBox/Makefile
index 933495f42fd..044d8eb633b 100644
--- a/cpp/test/IceBox/Makefile
+++ b/cpp/test/IceBox/Makefile
@@ -11,7 +11,6 @@ top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
 
-
 SUBDIRS		= admin configuration
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
diff --git a/cpp/test/IceDiscovery/Makefile b/cpp/test/IceDiscovery/Makefile
index b97a2d813ae..696e1683906 100644
--- a/cpp/test/IceDiscovery/Makefile
+++ b/cpp/test/IceDiscovery/Makefile
@@ -11,10 +11,8 @@ top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
 
-
 SUBDIRS		= simple
 
-
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
 all:: $(SUBDIRS)
diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile
index 93816140bfb..0040afbe7ea 100644
--- a/cpp/test/IceDiscovery/simple/Makefile
+++ b/cpp/test/IceDiscovery/simple/Makefile
@@ -14,7 +14,7 @@ SERVER		= $(call mktestname,server)
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-SLICE_OBJS	= Test.o \
+SLICE_OBJS	= Test.o
 
 COBJS		= $(SLICE_OBJS) \
 		  Client.o \
diff --git a/cpp/test/IceGrid/Makefile b/cpp/test/IceGrid/Makefile
index 70122bc3f64..5e0c8c71d4b 100644
--- a/cpp/test/IceGrid/Makefile
+++ b/cpp/test/IceGrid/Makefile
@@ -11,7 +11,6 @@ top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
 
-
 SUBDIRS		= simple \
 		  deployer \
 		  session \
diff --git a/cpp/test/IceGrid/Makefile.mak b/cpp/test/IceGrid/Makefile.mak
index 0fc174193aa..9c61f91ae43 100644
--- a/cpp/test/IceGrid/Makefile.mak
+++ b/cpp/test/IceGrid/Makefile.mak
@@ -13,17 +13,17 @@ top_srcdir	= ..\..
 
 
 SUBDIRS		= activation \
-		admin \
-		allocation \
-		deployer \
-		distribution \
-		fileLock \
-		noRestartUpdate \
-		replicaGroup \
-		replication \
-		session \
-		simple \
-		update
+		  admin \
+		  allocation \
+		  deployer \
+		  distribution \
+		  fileLock \
+		  noRestartUpdate \
+		  replicaGroup \
+		  replication \
+		  session \
+		  simple \
+		  update
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/cpp/test/IceGrid/activation/Makefile b/cpp/test/IceGrid/activation/Makefile
index 464acf6d169..91f532796b7 100644
--- a/cpp/test/IceGrid/activation/Makefile
+++ b/cpp/test/IceGrid/activation/Makefile
@@ -14,7 +14,7 @@ SERVER		= server
 
 TARGETS		= $(CLIENT) $(SERVER)
 
-SLICE_OBJS	= Test.o \
+SLICE_OBJS	= Test.o
 
 COBJS		= $(SLICE_OBJS) \
 		  Client.o \
diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak
index c265a3b2c3c..c8ff99b1fbb 100644
--- a/cpp/test/IceGrid/simple/Makefile.mak
+++ b/cpp/test/IceGrid/simple/Makefile.mak
@@ -16,7 +16,7 @@ TARGETS		= $(CLIENT) $(SERVER)
 
 SLICE_OBJS	= .\Test.obj
 
-COBJS		=  $(SLICE_OBJS) \
+COBJS		= $(SLICE_OBJS) \
 		  .\Client.obj \
 		  .\AllTests.obj
 
@@ -30,7 +30,7 @@ OBJS		= $(COBJS) \
 !include $(top_srcdir)/config/Make.rules.mak
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-LINKWITH	= $(LIBS)  
+LINKWITH	= $(LIBS)
 
 !if "$(GENERATE_PDB)" == "yes"
 CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
@@ -50,8 +50,8 @@ $(SERVER): $(SOBJS)
 clean::
 	del /q build.txt
 	del /q Test.cpp Test.h
-	if exist db\node rmdir /s /q db\node 
-	if exist db\registry rmdir /s /q db\registry 
+	if exist db\node rmdir /s /q db\node
+	if exist db\registry rmdir /s /q db\registry
 	if exist db\replica-1 rmdir /s /q db\replica-1
 
 !if "$(OPTIMIZE)" == "yes"
@@ -64,4 +64,4 @@ all::
 all::
 	@echo debug > build.txt
 
-!endif
\ No newline at end of file
+!endif
diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak
index fefa1c50517..25cf6c4c957 100644
--- a/cpp/test/IceStorm/federation/Makefile.mak
+++ b/cpp/test/IceStorm/federation/Makefile.mak
@@ -14,7 +14,7 @@ SUBSCRIBER	= subscriber.exe
 
 TARGETS		= $(PUBLISHER) $(SUBSCRIBER)
 
-SLICE_OBJS		= .\Event.obj
+SLICE_OBJS	= .\Event.obj
 
 POBJS		= $(SLICE_OBJS) \
 		  .\Publisher.obj
diff --git a/cpp/test/IceUtil/condvar/Makefile b/cpp/test/IceUtil/condvar/Makefile
index b88bc76cf92..ba607481881 100644
--- a/cpp/test/IceUtil/condvar/Makefile
+++ b/cpp/test/IceUtil/condvar/Makefile
@@ -16,6 +16,7 @@ TARGETS		= $(WQ) $(MATCH)
 
 OBJS		= WorkQueue.o \
 		  Match.o
+
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)