Sort C++ Demo and src makefiles

3 files changed, 46 insertions, 46 deletions

diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile
index 888c193070d..9da301c4be1 100644
--- a/cpp/src/IceGridLib/Makefile
+++ b/cpp/src/IceGridLib/Makefile
@@ -10,41 +10,41 @@
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,IceGrid,$(VERSION))
-SONAME          = $(call mksoname,IceGrid,$(SOVERSION))  
+SONAME          = $(call mksoname,IceGrid,$(SOVERSION))
 LIBNAME		= $(call mklibname,IceGrid)
 
 LIBTARGETS	= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
 TARGETS         = $(LIBTARGETS) $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
 
-LIB_OBJS	= Admin.o \
-		  Locator.o \
-		  Discovery.o \
-		  Query.o \
-	 	  Exception.o \
+LIB_OBJS	=  Admin.o \
 		  Descriptor.o \
+		  Discovery.o \
 		  DiscoveryPluginI.o \
-                  FileParser.o \
+		  Exception.o \
+		  FileParser.o \
+		  Locator.o \
 		  Observer.o \
-		  Session.o \
-		  Registry.o \
-		  UserAccountMapper.o \
 		  PluginFacade.o \
 		  PluginFacadeI.o \
+		  Query.o \
+		  Registry.o \
+		  Session.o \
+		  UserAccountMapper.o
 
 SRCS		= $(LIB_OBJS:.o=.cpp)
 
 SLICE_SRCS	= $(SDIR)/Admin.ice \
+		  $(SDIR)/Descriptor.ice \
 		  $(SDIR)/Discovery.ice \
-                  $(SDIR)/Exception.ice \
-                  $(SDIR)/FileParser.ice \
-                  $(SDIR)/Locator.ice \
-                  $(SDIR)/Query.ice \
+		  $(SDIR)/Exception.ice \
+		  $(SDIR)/FileParser.ice \
+		  $(SDIR)/Locator.ice \
+		  $(SDIR)/Observer.ice \
+		  $(SDIR)/PluginFacade.ice \
+		  $(SDIR)/Query.ice \
 		  $(SDIR)/Registry.ice \
 		  $(SDIR)/Session.ice \
-		  $(SDIR)/Observer.ice \
-		  $(SDIR)/Descriptor.ice \
-		  $(SDIR)/UserAccountMapper.ice \
-		  $(SDIR)/PluginFacade.ice
+		  $(SDIR)/UserAccountMapper.ice
 
 HDIR		= $(headerdir)/IceGrid
 LOCAL_HDIR	= ../IceGrid
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak
index fe0f73e1635..c461da42c82 100644
--- a/cpp/src/IceGridLib/Makefile.mak
+++ b/cpp/src/IceGridLib/Makefile.mak
@@ -15,19 +15,19 @@ DLLNAME		= $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
 TARGETS         = $(LIBNAME) $(DLLNAME)
 
 LIB_OBJS	= Admin.obj \
-		  Locator.obj \
-		  Discovery.obj \
-		  Query.obj \
-		  Exception.obj \
 		  Descriptor.obj \
+		  Discovery.obj \
 		  DiscoveryPluginI.obj \
-                  FileParser.obj \
+		  Exception.obj \
+		  FileParser.obj \
+		  Locator.obj \
 		  Observer.obj \
-		  Session.obj \
-		  Registry.obj \
-		  UserAccountMapper.obj \
 		  PluginFacade.obj \
-		  PluginFacadeI.obj
+		  PluginFacadeI.obj \
+		  Query.obj \
+		  Registry.obj \
+		  Session.obj \
+		  UserAccountMapper.obj
 
 SRCS		= $(LIB_OBJS:.obj=.cpp)
 
@@ -53,20 +53,20 @@ $(DLLNAME): $(LIB_OBJS) IceGrid.res
 	$(LINK) $(BASE):0x2B000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_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)
 
 clean::
-	-del /q FileParser.cpp $(HDIR)\FileParser.h
 	-del /q Admin.cpp $(HDIR)\Admin.h
 	-del /q Descriptor.cpp $(HDIR)\Descriptor.h
 	-del /q Discovery.cpp $(HDIR)\Discovery.h
 	-del /q Exception.cpp $(HDIR)\Exception.h
+	-del /q FileParser.cpp $(HDIR)\FileParser.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 Session.cpp $(HDIR)\Session.h
 	-del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
 	-del /q IceGrid.res
 
diff --git a/cpp/src/IceGridLib/winrt/Makefile.mak b/cpp/src/IceGridLib/winrt/Makefile.mak
index c116b374d26..3bc3097e630 100644
--- a/cpp/src/IceGridLib/winrt/Makefile.mak
+++ b/cpp/src/IceGridLib/winrt/Makefile.mak
@@ -12,28 +12,28 @@ LIBNAME		= $(SDK_LIBRARY_PATH)\icegrid.lib
 TARGETS		= $(LIBNAME)
 SOURCE_DIR	= ..
 
-TARGETS         = $(LIBNAME)
+TARGETS		= $(LIBNAME)
 
 OBJS		= $(ARCH)\$(CONFIG)\Admin.obj \
-		  $(ARCH)\$(CONFIG)\Locator.obj \
-	          $(ARCH)\$(CONFIG)\Query.obj \
+		  $(ARCH)\$(CONFIG)\Descriptor.obj \
 		  $(ARCH)\$(CONFIG)\Exception.obj \
-	   	  $(ARCH)\$(CONFIG)\Descriptor.obj \
 		  $(ARCH)\$(CONFIG)\FileParser.obj \
-	          $(ARCH)\$(CONFIG)\Observer.obj \
-	   	  $(ARCH)\$(CONFIG)\Session.obj \
-	   	  $(ARCH)\$(CONFIG)\Registry.obj \
-	   	  $(ARCH)\$(CONFIG)\UserAccountMapper.obj
+		  $(ARCH)\$(CONFIG)\Locator.obj \
+		  $(ARCH)\$(CONFIG)\Observer.obj \
+		  $(ARCH)\$(CONFIG)\Query.obj \
+		  $(ARCH)\$(CONFIG)\Registry.obj \
+		  $(ARCH)\$(CONFIG)\Session.obj \
+		  $(ARCH)\$(CONFIG)\UserAccountMapper.obj
 
 SLICE_SRCS	= $(SDIR)/Admin.ice \
-                  $(SDIR)/Exception.ice \
-                  $(SDIR)/FileParser.ice \
-                  $(SDIR)/Locator.ice \
-                  $(SDIR)/Query.ice \
+		  $(SDIR)/Descriptor.ice \
+		  $(SDIR)/Exception.ice \
+		  $(SDIR)/FileParser.ice \
+		  $(SDIR)/Locator.ice \
+		  $(SDIR)/Observer.ice \
+		  $(SDIR)/Query.ice \
 		  $(SDIR)/Registry.ice \
 		  $(SDIR)/Session.ice \
-		  $(SDIR)/Observer.ice \
-		  $(SDIR)/Descriptor.ice \
 		  $(SDIR)/UserAccountMapper.ice
 
 SRCS		= $(OBJS:.obj=.cpp)
@@ -66,15 +66,15 @@ depend:: $(ARCH)\$(CONFIG) $(SLICE_SRCS) $(SRCS) $(SRCS_DEPEND)
 		$(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py
 
 clean::
-	-del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h
 	-del /q $(SOURCE_DIR)\Admin.cpp $(HDIR)\Admin.h
 	-del /q $(SOURCE_DIR)\Descriptor.cpp $(HDIR)\Descriptor.h
 	-del /q $(SOURCE_DIR)\Exception.cpp $(HDIR)\Exception.h
+	-del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h
 	-del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h
 	-del /q $(SOURCE_DIR)\Observer.cpp $(HDIR)\Observer.h
 	-del /q $(SOURCE_DIR)\Query.cpp $(HDIR)\Query.h
-	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
 	-del /q $(SOURCE_DIR)\Registry.cpp $(HDIR)\Registry.h
+	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
 	-del /q $(SOURCE_DIR)\UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
 	-del /q $(ARCH)\$(CONFIG)\*.obj
 	-del /q $(PDBNAME)