--- a/sbsv2/raptor/bin/depcrunch.py	Tue May 11 20:27:01 2010 +0100
+++ b/sbsv2/raptor/bin/depcrunch.py	Tue May 11 21:10:52 2010 +0100
@@ -20,7 +20,6 @@
 
 import sys
 from  optparse import OptionParser
-import os
 import re
 
 class NoTargetException(Exception):

--- a/sbsv2/raptor/lib/flm/resource.flm	Tue May 11 20:27:01 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Tue May 11 21:10:52 2010 +0100
@@ -131,7 +131,7 @@
 
         $1.d: $(SOURCE)
 	  $(call startrule,resourcedependencies,FORCESUCCESS) \
-	  RPP=$1; $(GNUCPP) -DLANGUAGE_$(3) -DLANGUAGE_$(subst sc,SC,$3) $(call makemacrodef,-D,$(MMPDEFS))\
+	  $(GNUCPP) -DLANGUAGE_$(3) -DLANGUAGE_$(subst sc,SC,$3) $(call makemacrodef,-D,$(MMPDEFS))\
 	  $(CPPOPT) $(SOURCE) -M -MG -MT"$1" | \
 	  $$(DEPENDENCY_CORRECTOR) >$$@ \
 	  $(call endrule,resourcedependencies)

--- a/sbsv2/raptor/test/smoke_suite/timing.py	Tue May 11 20:27:01 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/timing.py	Tue May 11 21:10:52 2010 +0100
@@ -25,7 +25,7 @@
 	t.id = "0103b"
 	t.name = "timing_on"
 	t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf" + \
-			"--filters=FilterLogfile,FilterTiming -f ${SBSLOGFILE} && " + \
+			" --filters=FilterLogfile,FilterTiming -f ${SBSLOGFILE} && " + \
 			"grep progress:duration ${SBSLOGFILE}.timings"
 	t.mustmatch = [
 			"^<progress:duration object_type='layer' task='parse' key='.*' duration='\d+.\d+' />$",