diff -r 6cc6d1d59188 -r 9bebdb95e0de sbsv2/raptor/lib/flm/msvctools.flm --- a/sbsv2/raptor/lib/flm/msvctools.flm Tue Apr 06 11:42:16 2010 +0100 +++ b/sbsv2/raptor/lib/flm/msvctools.flm Wed Apr 07 12:34:10 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" @@ -28,7 +28,7 @@ $(call makepath,$(RELEASEPATH)) $(call makepath,$(BUILDPATH)) -RELEASEABLES:=$(RELEASEABLES) $(RELEASETARGET) +RELEASABLES:=$(RELEASABLES) $(RELEASETARGET) GENDEBUGINFO:=$(if $(findstring deb,$(VARIANTTYPE)),1,) @@ -58,10 +58,6 @@ # macros DEFINES:=$(call makemacrodef,$(OPT.DEFINE),$(CDEFS) $(BASE_MACRO) $(CFLAGS.ADD)) -# other -PDBFILE:=$(if $(GENDEBUGINFO),$(RELEASEPATH)/$(TARGET).pdb,) -CLEANTARGETS:=$(CLEANTARGETS) $(PDBFILE) - #compile define msvctoolscompile $(BUILDPATH)/$(basename $(notdir $(1))).obj: $(1) $(PROJECT_META) $(if $(HAVE_ORDERONLY),|,) EXPORT @@ -70,7 +66,6 @@ $(if $(findstring staticlib,$(BASE_TYPE)),,$(CFLAGS.LIB)) \ $(CFLAGS) $$(subst /,-,$(OPTION_MSVC)) \ $(if $(findstring /W,$(OPTION_MSVC)),,$(CFLAGS.DEFAULT.WARNLEVEL)) \ - $(if $(PDBFILE),$$(call msvcformatarg,$(OPT.PDBFILE),$(PDBFILE)),) \ $(DEFINES) $(INCLUDES) \ $$(call msvcformatarg,$(OPT.BROWSEFILE),$(BUILDPATH)/$(basename $(notdir $(1))).sbr) \ $$(call msvcformatarg,$(OPT.OBJECTFILE),$$@) $(1) \ @@ -156,7 +151,7 @@ ifneq ($(INSTALLPATH),) INSTALLTARGET:=$(INSTALLPATH)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(TARGETTYPE)) - RELEASEABLES:=$(RELEASEABLES) $(INSTALLTARGET) + RELEASABLES:=$(RELEASABLES) $(INSTALLTARGET) define msvctoolsinstall $(INSTALLTARGET): $(RELEASETARGET) @@ -179,7 +174,7 @@ BSCFILE:=$(RELEASEPATH)/$(TARGET).bsc BSCRESPONSEFILE:=$(BUILDPATH)/$(TARGET).brf CLEANTARGETS:=$(CLEANTARGETS) $(BSCRESPONSEFILE) - RELEASEABLES:=$(RELEASEABLES) $(BSCFILE) + RELEASABLES:=$(RELEASABLES) $(BSCFILE) define msvctoolsgenbrowse $(BSCFILE): $(OBJFILES) @@ -197,8 +192,8 @@ # Global targets .PHONY:: $(ALLTARGET) -$(ALLTARGET):: $(RELEASEABLES) -TARGET:: $(RELEASEABLES) +$(ALLTARGET):: $(RELEASABLES) +TARGET:: $(RELEASABLES) ifeq ($(BASE_TYPE),staticlib) LIBRARY:: $(RELEASETARGET) $(INSTALLTARGET)