--- a/sbsv2/raptor/bin/recipestats.py	Fri Apr 16 11:57:28 2010 +0100
+++ b/sbsv2/raptor/bin/recipestats.py	Fri Apr 16 19:03:20 2010 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"

--- a/sbsv2/raptor/lib/flm/resource.flm	Fri Apr 16 11:57:28 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Fri Apr 16 19:03:20 2010 +0100
@@ -155,9 +155,9 @@
       # It allows resources to be built in the right order but doesn't impose the weight of
       # of full dependency information which can overwhelm make in large builds.
       # The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or 
-      # .mbg dependencies in them.   The first line can sometimes not contain the target but 
+      # .mbg dependencies in them.   The first line can sometimes not contain the target but  
       # have a lonely "\" so we use a pattern to recognise the target line in order not to get confused. 
-      DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '/.*: +.$$$$/ p;\%\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
+      DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '/.*: +.$$$$/ p;\%\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% __EPOCROOT\/epoc32\/include\/\1%ig;s% [^_][^_][^E][^ ]+%%g;s%__EPOCROOT%$(EPOCROOT)%g; p}' && echo "" ; }
     else
       # Generate full dependency information
       DEPENDENCY_CORRECTOR:=$(GNUSED)  -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig' 
@@ -172,11 +172,13 @@
 	  $$(DEPENDENCY_CORRECTOR) >$$@ \
 	  $(call endrule,resourcedependencies)
 
+    ifeq "$(MAKEFILE_GROUP)" "RESOURCE"
     $(1): $(1).d
 	  $(call startrule,resourcepreprocess,FORCESUCCESS) \
 	  $(GNUCPP) -C -DLANGUAGE_$(3) -DLANGUAGE_$(subst sc,SC,$(3)) $(call makemacrodef,-D,$(MMPDEFS))\
 	  $(CPPOPT) $(SOURCE) -o $$@ \
 	  $(call endrule,resourcepreprocess)
+    endif
 
     CLEANTARGETS:= $$(CLEANTARGETS) $(1)
 
@@ -186,7 +188,7 @@
     CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
     ifneq "$(DEPENDFILE)" ""
       ifeq "$(filter %CLEAN,$(call uppercase,$(MAKECMDGOALS)))" ""
-        ifeq "$(filter RESOURCE_DEPS,$(call uppercase,$(MAKECMDGOALS)))" ""
+        ifeq "$(MAKEFILE_GROUP)" "RESOURCE"
           -include $(DEPENDFILE)
         endif
       endif
@@ -208,8 +210,6 @@
         RESOURCE:: $2
         ## perform additional copies of binaries
         #
-        # Only certain builds require further copies of the generated resource binaries
-        #
         $(2): $(1)
 		$(call startrule,resourcecopy,FORCESUCCESS) \
 		$(GNUCP) $$< $$@ \
@@ -300,7 +300,10 @@
         # generate a resource file for each language
         # For sc we generate $(RESBASE).rsc and define LANGUAGE_SC and LANGUAGE_sc.
         $(foreach L,$(LANGUAGES:SC=sc),$(eval $(call preprocessresource,$(INTERBASE)_$(L).rpp,$(INTERBASE).r$(L),$(L))))
-        $(foreach L,$(LANGUAGES:SC=sc),$(eval $(call generateresource,$(INTERBASE).r$(L),$(INTERBASE)_$(L).rpp,$(L))))
+
+        ifeq "$(MAKEFILE_GROUP)" "RESOURCE"
+            $(foreach L,$(LANGUAGES:SC=sc),$(eval $(call generateresource,$(INTERBASE).r$(L),$(INTERBASE)_$(L).rpp,$(L))))
+        endif
 else
         # No resources are going to be made so unless we specifically ask for it, there will be no
         # preprocessed file from which to create the header: