diff -r fa72431a3f1a -r bae97f326378 sbsv2/raptor/lib/flm/resource.flm
--- a/sbsv2/raptor/lib/flm/resource.flm Thu Apr 15 18:47:48 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm Fri Apr 16 19:03:20 2010 +0100
@@ -155,7 +155,8 @@
# 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.
+ # .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;s% [^_][^_][^E][^ ]+%%g;s%__EPOCROOT%$(EPOCROOT)%g; p}' && echo "" ; }
else
# Generate full dependency information
@@ -229,8 +230,8 @@
ifeq ($(TARGET_$(call sanitise,$1)),)
TARGET_$(call sanitise,$1):=1
- $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),)
- $(if $(FLMDEBUG),$(info generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))))
+ $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),)
+ $(if $(FLMDEBUG),$(info generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))))
CLEANTARGETS:=$$(CLEANTARGETS) $(1)