From f84a1d6ca70993829791f1f274e671c8dd72315a Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Tue, 30 Oct 2012 15:43:07 +0000
Subject: [PATCH] Fix build ordering (xmltooling, then saml, then shibsp) and
 also make the clean stage more widespread.

---
 msbuild/build.make | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/msbuild/build.make b/msbuild/build.make
index b717877..441497b 100644
--- a/msbuild/build.make
+++ b/msbuild/build.make
@@ -19,9 +19,6 @@ clean:
 	del/s *.lib
 	del/s *.wixlib
 	del/s *.msi
-
-veryclean: clean
-	cd ..\..
 	del/s *.obj *.wixobj
 	del/s *.lib *.wixlib
 	del/s *.pdb *.wixpdb
@@ -35,9 +32,9 @@ msi64: mergemodules32 exe32 mergemodules64 exe64
 	cd $(SPROOT)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
-mergemodules32: shibsp32 saml32 xmltooling32
+mergemodules32: xmltooling32 saml32 shibsp32
 
-mergemodules64: shibsp64 saml64 xmltooling64
+mergemodules64: xmltooling64 saml64 shibsp64
 
 shibsp32:
 	cd $(SPROOT)
-- 
2.1.4