Fix build ordering (xmltooling, then saml, then shibsp) and also make the clean stage...

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