[cpp-xmltooling COMMIT] /branches/REL_1/msbuild/build.make

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 30 11:43:07 2012
New Revision: 1010

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1010&view=rev
Log:
Fix build ordering (xmltooling, then saml, then shibsp) and also make the clean stage more widespread.

Modified:
    branches/REL_1/msbuild/build.make

Modified: branches/REL_1/msbuild/build.make
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/msbuild/build.make?rev=1010&r1=1009&r2=1010&view=diff
==============================================================================
--- branches/REL_1/msbuild/build.make (original)
+++ branches/REL_1/msbuild/build.make Tue Oct 30 11:43:07 2012
@@ -19,9 +19,6 @@
 	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 @@
 	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)