[hydra-commits] beagles: branch ice/preserve-graphs r628 - /ice/branches/preserve-graphs/cpp/...

[SVN commits to the Hydra project]

Author: beagles
Date: Thu May 20 07:45:21 2010
New Revision: 628

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=628
Log:
rearrange order of new files in makefiles so it matches ZeroC's alphabetical convention

Modified:
    ice/branches/preserve-graphs/cpp/src/Ice/Makefile
    ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak

Modified: ice/branches/preserve-graphs/cpp/src/Ice/Makefile
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/Ice/Makefile?view=diff&rev=628&r1=627&r2=628
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/Ice/Makefile (original)
+++ ice/branches/preserve-graphs/cpp/src/Ice/Makefile Thu May 20 07:45:21 2010
@@ -19,9 +19,7 @@
 		  Application.o \
                   Base64.o \
 		  Buffer.o \
-		  Preserve.o \
 		  BasicStream.o \
-		  SliceHolder.o \
 		  BuiltinSequences.o \
 		  CommunicatorI.o \
 		  Communicator.o \
@@ -74,6 +72,7 @@
 		  Outgoing.o \
 		  PluginManagerI.o \
 		  Plugin.o \
+		  Preserve.o \
 		  Process.o \
 		  PropertiesI.o \
 		  Properties.o \
@@ -94,6 +93,7 @@
 		  Service.o \
 		  SliceChecksumDict.o \
 		  SliceChecksums.o \
+		  SliceHolder.o \
 		  Stats.o \
 		  StreamI.o \
 		  Stream.o \
@@ -138,6 +138,7 @@
 		  $(SDIR)/ObjectFactory.ice \
 		  $(SDIR)/PluginF.ice \
 		  $(SDIR)/Plugin.ice \
+		  $(SDIR)/Preserve.ice \
 		  $(SDIR)/ProcessF.ice \
 		  $(SDIR)/Process.ice \
 		  $(SDIR)/PropertiesF.ice \
@@ -149,7 +150,6 @@
 		  $(SDIR)/SliceChecksumDict.ice \
 		  $(SDIR)/StatsF.ice \
 		  $(SDIR)/Stats.ice \
-		  $(SDIR)/Preserve.ice 
 
 HDIR		= $(headerdir)/Ice
 SDIR		= $(slicedir)/Ice

Modified: ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak?view=diff&rev=628&r1=627&r2=628
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak (original)
+++ ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak Thu May 20 07:45:21 2010
@@ -19,8 +19,6 @@
                   Base64.obj \
 		  Buffer.obj \
 		  BasicStream.obj \
-		  Preserve.obj \
-		  SliceHolder.obj \
 		  BuiltinSequences.obj \
 		  CommunicatorI.obj \
 		  Communicator.obj \
@@ -74,6 +72,7 @@
 		  Outgoing.obj \
 		  PluginManagerI.obj \
 		  Plugin.obj \
+		  Preserve.obj \
 		  Process.obj \
 		  PropertiesI.obj \
 		  Properties.obj \
@@ -94,6 +93,7 @@
 		  Service.obj \
 		  SliceChecksumDict.obj \
 		  SliceChecksums.obj \
+		  SliceHolder.obj \
 		  Stats.obj \
 		  StreamI.obj \
 		  Stream.obj \
@@ -174,7 +174,6 @@
 	-del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
 	-del /q Connection.cpp $(HDIR)\Connection.h
 	-del /q Current.cpp $(HDIR)\Current.h
-	-del /q Preserve.cpp $(HDIR)\Preserve.h
 	-del /q Endpoint.cpp $(HDIR)\Endpoint.h
 	-del /q EndpointF.cpp $(HDIR)\EndpointF.h
 	-del /q EndpointTypes.cpp $(HDIR)\EndpointTypes.h
@@ -193,6 +192,7 @@
 	-del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
 	-del /q PluginF.cpp $(HDIR)\PluginF.h
 	-del /q Plugin.cpp $(HDIR)\Plugin.h
+	-del /q Preserve.cpp $(HDIR)\Preserve.h
 	-del /q ProcessF.cpp $(HDIR)\ProcessF.h
 	-del /q Process.cpp $(HDIR)\Process.h
 	-del /q PropertiesF.cpp $(HDIR)\PropertiesF.h