diff -r 3a31ca4b29c4 -r b8fa7dfeeaa1 sbsv2/raptor/lib/flm/gnumakefile.flm --- a/sbsv2/raptor/lib/flm/gnumakefile.flm Wed Aug 04 12:07:55 2010 +0100 +++ b/sbsv2/raptor/lib/flm/gnumakefile.flm Wed Oct 06 15:13:17 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2008-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" @@ -172,15 +172,17 @@ endef DO_NOTHING:: $(UNIQ)_DO_NOTHING -$(UNIQ)_DO_NOTHING: ; +$(UNIQ)_DO_NOTHING: $(foreach EXTTRG,$(EXTMAKETARGETS),$(eval $(call callgnumake,$(EXTTRG)))) ## Do ROMFILE target in romstuff.mke -ifeq ($(ROMFILE_$(call sanitise,$(EXTMAKEFILENAME))),) -ROMFILE_$(call sanitise,$(EXTMAKEFILENAME)):=1 +ROMFILEUNIQ:=$(call sanitise,$(DIRECTORY)$(EXTMAKEFILENAME)$(TO_ROOT)$(EPOCBLD)$(TO_BLDINF)$(PLATFORM)) -ROMDIR:=$(subst $(OLD_EPOCROOT),$(OLD_EPOCROOT)epoc32/rom/,$(TO_BLDINF)) +ifeq ($(ROMFILE_$(ROMFILEUNIQ)),) +ROMFILE_$(ROMFILEUNIQ):=1 +TOBLDINF:=$(dir $(subst :,,$(subst $(OLD_EPOCROOT),,$(COMPONENT_META)))) +ROMDIR:=$(OLD_EPOCROOT)epoc32/rom/$(TOBLDINF) define RomfileRomstuff ROMFILE::