# HG changeset patch # User timothy.murphy@nokia.com # Date 1272679626 -3600 # Node ID 3ed696bd9e5f08ed21ead532189ecdc1255db1a6 # Parent 3b10c85868b1c5bcef4d6431cc73ed21128d6f66 fix: resource problem - horrible code that tries to produce different versions of the same resource - preevent file mixup in this case. diff -r 3b10c85868b1 -r 3ed696bd9e5f sbsv2/raptor/lib/flm/resource.flm --- a/sbsv2/raptor/lib/flm/resource.flm Wed Apr 28 01:01:42 2010 +0100 +++ b/sbsv2/raptor/lib/flm/resource.flm Sat May 01 03:07:06 2010 +0100 @@ -64,7 +64,7 @@ endif # we create intermediate .rpp and .d files -INTERBASE:=$(OUTPUTPATH)/$(TARGET_lower) +INTERBASE:=$(OUTPUTPATH)/$(TARGET_lower)_$(notdir $(SOURCE)) ################################## localisation ###########################$(GNUMKDIR)############# # Only make copies for full resource builds @@ -197,7 +197,7 @@ endif ifeq "$(MAKEFILE_GROUP)" "RESOURCE" - $1: + $1: $4.d $(call startrule,resourcepreprocess,FORCESUCCESS) \ $(GNUCPP) -C -DLANGUAGE_$3 -DLANGUAGE_$(subst sc,SC,$(3)) $(call makemacrodef,-D,$(MMPDEFS))\ $(CPPOPT) $(SOURCE) -o $$@ \