--- a/sf-platform/build.xml	Wed Apr 22 12:18:10 2009 +0100
+++ b/sf-platform/build.xml	Mon Apr 27 16:26:56 2009 +0100
@@ -157,7 +157,7 @@
                 <hlm:arg name="config" value="tools2_rel" />
                 <hlm:arg name="singlejob" value="false" />
                 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="CLEAN" />
+		<hlm:arg name="command" value="CLEAN --check" />
         </hlm:argSet>
 
         <hlm:argSet id="sbs.tools.var">
@@ -170,7 +170,7 @@
                 <hlm:arg name="config" value="tools_rel" />
                 <hlm:arg name="singlejob" value="true" />
                 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="CLEAN" />
+		<hlm:arg name="command" value="CLEAN --check" />
         </hlm:argSet>
 
         <hlm:argSet id="sbs.main.sbs.var">
@@ -181,13 +181,13 @@
 		<hlm:argSet id="sbs.main.clean.sbs.var">
                 <hlm:arg name="config" value="${sf.spec.sbs.config}" />
                 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="CLEAN" />
+		<hlm:arg name="command" value="CLEAN --check" />
         </hlm:argSet>
 		
 		<hlm:argSet id="sbs.main.what.sbs.var">
                 <hlm:arg name="config" value="${sf.spec.sbs.config}" />
                 <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="WHAT" />
+		<hlm:arg name="command" value="WHAT" />
         </hlm:argSet>
 
         <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
@@ -323,13 +323,13 @@
 			<hlm:argSet id="sbs.main.clean.sbs.var">
           			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
           			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-					<hlm:arg name="command" value="CLEAN" />
+				<hlm:arg name="command" value="CLEAN --check" />
     		</hlm:argSet>
 			
 			<hlm:argSet id="sbs.main.what.sbs.var">
           			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
           			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-					<hlm:arg name="command" value="WHAT" />
+				<hlm:arg name="command" value="WHAT" />
     		</hlm:argSet>
 
     		<hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
@@ -388,7 +388,7 @@
     		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
           			<param name="build.system" value="${sf.spec.build.system}" />
           			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
-                    <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
+                                <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
           			<reference refid="sbs.main.sbs.var" torefid="sbs.var" />
           			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
@@ -399,11 +399,12 @@
 			</antcall>
 
     		<!-- s60 postbuild bldmelast using ebs -->
-    		<antcall target="compile-main" inheritAll="false">
+    		<!-- Remove bldmelast for the moment
+                                antcall target="compile-main" inheritAll="false">
           			<param name="build.system" value="ebs" />
           			<param name="sysdef.configurations.list" value="S60_bldmelast" />
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
-    		</antcall>
+    		</antcall -->
 
 			<antcall target="sf-list-dir" inheritAll="false">
 				<param name="sf.list.name" value="post-s60-bldmelast"/>