Sort C++ Demo and src makefiles

2 files changed, 58 insertions, 58 deletions

diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 050ce56a2e8..06a649e9493 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -10,52 +10,52 @@
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,Freeze,$(VERSION))
-SONAME          = $(call mksoname,Freeze,$(SOVERSION))  
+SONAME          = $(call mksoname,Freeze,$(SOVERSION))
 LIBNAME		= $(call mklibname,Freeze)
 
 TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
 
-OBJS		= BackgroundSaveEvictor.o \
-                  BackgroundSaveEvictorI.o \
-                  CatalogData.o \
-                  Catalog.o \
-	          CatalogIndexList.o \
+OBJS		=  BackgroundSaveEvictor.o \
+		  BackgroundSaveEvictorI.o \
+		  Catalog.o \
+		  CatalogData.o \
+		  CatalogIndexList.o \
+		  Connection.o \
 		  ConnectionI.o \
-                  Connection.o \
 		  DB.o \
-		  EvictorI.o \
-                  EvictorIteratorI.o \
-                  EvictorStorage.o \
 		  Evictor.o \
-                  Exception.o \
-                  IndexI.o \
-                  Index.o \
-                  MapDb.o \
-	  	  MapI.o \
-                  ObjectStore.o \
+		  EvictorI.o \
+		  EvictorIteratorI.o \
+		  EvictorStorage.o \
+		  Exception.o \
+		  Index.o \
+		  IndexI.o \
+		  MapDb.o \
+		  MapI.o \
+		  ObjectStore.o \
 		  PingObject.o \
-                  SharedDbEnv.o \
-                  TransactionalEvictor.o \
-                  TransactionalEvictorI.o \
-                  TransactionalEvictorContext.o \
-                  TransactionHolder.o \
-                  TransactionI.o \
-                  Transaction.o \
-                  Util.o
+		  SharedDbEnv.o \
+		  Transaction.o \
+		  TransactionalEvictor.o \
+		  TransactionalEvictorContext.o \
+		  TransactionalEvictorI.o \
+		  TransactionHolder.o \
+		  TransactionI.o \
+		  Util.o
 
 SRCS		= $(OBJS:.o=.cpp)
 
-SLICE_SRCS	= $(SDIR)/BackgroundSaveEvictor.ice \
-                  $(SDIR)/DB.ice \
-                  $(SDIR)/CatalogData.ice \
-                  $(SDIR)/Connection.ice \
-                  $(SDIR)/ConnectionF.ice \
-                  $(SDIR)/Exception.ice \
+SLICE_SRCS	=  $(SDIR)/BackgroundSaveEvictor.ice \
+		  $(SDIR)/CatalogData.ice \
+		  $(SDIR)/Connection.ice \
+		  $(SDIR)/ConnectionF.ice \
+		  $(SDIR)/DB.ice \
+		  $(SDIR)/Evictor.ice \
 		  $(SDIR)/EvictorF.ice \
 		  $(SDIR)/EvictorStorage.ice \
-		  $(SDIR)/Evictor.ice \
-                  $(SDIR)/TransactionalEvictor.ice \
-                  $(SDIR)/Transaction.ice \
+		  $(SDIR)/Exception.ice \
+		  $(SDIR)/Transaction.ice \
+		  $(SDIR)/TransactionalEvictor.ice \
 		  ../Freeze/PingObject.ice
 
 HDIR		= $(headerdir)/Freeze
@@ -63,7 +63,7 @@ SDIR		= $(slicedir)/Freeze
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) 
+CPPFLAGS	:= -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS)
 SLICE2CPPFLAGS	:= --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
 LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_LIBS)
 
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 86024d96818..0ac39387b2b 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -15,32 +15,32 @@ DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
 OBJS		= BackgroundSaveEvictor.obj \
-                  BackgroundSaveEvictorI.obj \
-                  CatalogData.obj \
-                  Catalog.obj \
-                  CatalogIndexList.obj \
-                  ConnectionI.obj \
-                  Connection.obj \
+		  BackgroundSaveEvictorI.obj \
+		  Catalog.obj \
+		  CatalogData.obj \
+		  CatalogIndexList.obj \
+		  Connection.obj \
+		  ConnectionI.obj \
 		  DB.obj \
-		  EvictorI.obj \
-                  EvictorIteratorI.obj \
 		  Evictor.obj \
+		  EvictorI.obj \
+		  EvictorIteratorI.obj \
 		  EvictorStorage.obj \
-                  Exception.obj \
-                  IndexI.obj \
-                  Index.obj \
-                  MapDb.obj \
-	  	  MapI.obj \
-                  ObjectStore.obj \
+		  Exception.obj \
+		  Index.obj \
+		  IndexI.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
+		  SharedDbEnv.obj \
+		  Transaction.obj \
+		  TransactionalEvictor.obj \
+		  TransactionalEvictorContext.obj \
+		  TransactionalEvictorI.obj \
+		  TransactionHolder.obj \
+		  TransactionI.obj \
+		  Util.obj
 
 SRCS		= $(OBJS:.obj=.cpp)
 
@@ -65,7 +65,7 @@ $(DLLNAME): $(OBJS) Freeze.res
 	$(LINK) $(BASE):0x25000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(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
+		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
 	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
 
 $(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
@@ -87,7 +87,7 @@ clean::
 	-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 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