equal
deleted
inserted
replaced
153 ifneq ($(NO_DEPEND_GENERATE),) |
153 ifneq ($(NO_DEPEND_GENERATE),) |
154 # This version minimises the size of dependency files, to contain only .mbg and .rsg deps. |
154 # This version minimises the size of dependency files, to contain only .mbg and .rsg deps. |
155 # It allows resources to be built in the right order but doesn't impose the weight of |
155 # It allows resources to be built in the right order but doesn't impose the weight of |
156 # of full dependency information which can overwhelm make in large builds. |
156 # of full dependency information which can overwhelm make in large builds. |
157 # The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or |
157 # The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or |
158 # .mbg dependencies in them. |
158 # .mbg dependencies in them. The first line can sometimes not contain the target but |
|
159 # have a lonely "\" so we use a pattern to recognise the target line in order not to get confused. |
159 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 "" ; } |
160 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 "" ; } |
160 else |
161 else |
161 # Generate full dependency information |
162 # Generate full dependency information |
162 DEPENDENCY_CORRECTOR:=$(GNUSED) -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig' |
163 DEPENDENCY_CORRECTOR:=$(GNUSED) -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig' |
163 endif |
164 endif |
227 |
228 |
228 |
229 |
229 ifeq ($(TARGET_$(call sanitise,$1)),) |
230 ifeq ($(TARGET_$(call sanitise,$1)),) |
230 TARGET_$(call sanitise,$1):=1 |
231 TARGET_$(call sanitise,$1):=1 |
231 |
232 |
232 $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),) |
233 $(if $(FLMDEBUG),$(info <debug>generateresource: $(1) from $(2) LANG:$(3)</debug>),) |
233 $(if $(FLMDEBUG),$(info generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))))) |
234 $(if $(FLMDEBUG),$(info <debug>generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))</debug>)) |
234 |
235 |
235 CLEANTARGETS:=$$(CLEANTARGETS) $(1) |
236 CLEANTARGETS:=$$(CLEANTARGETS) $(1) |
236 |
237 |
237 RESOURCE:: $(1) |
238 RESOURCE:: $(1) |
238 |
239 |