Make clean agressive in what it destroys, and test for the existance of the subsidiar...

[shibboleth/cpp-xmltooling.git] / msbuild / build.make

diff --git a/msbuild/build.make b/msbuild/build.make
index b717877..9acb917 100644 (file)
--- a/msbuild/build.make
+++ b/msbuild/build.make
@@ -3,28 +3,22 @@
 \r
 SPROOT=$(MAKEDIR)\..\..\cpp-sp\r
 XMLROOT=$(MAKEDIR)\..\..\cpp-xmltooling\r
-SAMLROOT=$(MAKEDIR)\..\..\cpp-OpenSaml\r
+SAMLROOT=$(MAKEDIR)\..\..\cpp-opensaml\r
 \r
 \r
 #\r
 # The targets.  We want to build the two installers\r
 #\r
-all: clean msi32 msi64\r
+all: msi32 msi64\r
 \r
 clean: \r
-       cd ..\..\r
-       del/s *.dll\r
-       del/s *.exe\r
-       del/s *.msm\r
-       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
+       cd $(SPROOT)\r
+       del/s *.dll *.exe *.msm *.lib *.obj\r
+       del/s *.wixobj *.lib *.wixlib  *.pdb *.wixpdb *.wixlib  *.msi \r
+       cd $(XMLROOT)\r
+       del/s *.dll *.exe *.msm *.lib *.obj\r
+       cd $(SAMLROOT)\r
+       del/s *.dll *.exe *.msm *.lib *.obj\r
 \r
 #\r
 msi32: mergemodules32 exe32 \r
@@ -35,9 +29,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