sbsv2/raptor/lib/flm/win32.flm
branchwip
changeset 9 b211d87c390a
parent 3 e1eecf4d390d
child 40 afaf81347e0a
equal deleted inserted replaced
8:34d87ffcc373 9:b211d87c390a
   241 endif
   241 endif
   242 
   242 
   243 ifeq ($(SUPPORTS_IMPORT_LIBRARY),1)
   243 ifeq ($(SUPPORTS_IMPORT_LIBRARY),1)
   244   ifneq ($(NOEXPORTLIBRARY),1)
   244   ifneq ($(NOEXPORTLIBRARY),1)
   245     ifneq ($(TARGET_$(call sanitise,$(IMPORTLIBTARGET))),1)
   245     ifneq ($(TARGET_$(call sanitise,$(IMPORTLIBTARGET))),1)
   246       CLEANTARGETS:=$(CLEANTARGETS) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(IMPORTLIBTARGET))
       
   247       RELEASABLES:=$(RELEASABLES) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(IMPORTLIBTARGET))
   246       RELEASABLES:=$(RELEASABLES) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(IMPORTLIBTARGET))
   248 
   247 
   249       # import libraries are generated to the UDEB release directory
   248       # import libraries are generated to the UDEB release directory
   250       ifneq ($(VARIANTTYPE),udeb)
   249       ifneq ($(VARIANTTYPE),udeb)
   251         CREATABLEPATHS:=$(CREATABLEPATHS) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(LIBDIR))
   250         CREATABLEPATHS:=$(CREATABLEPATHS) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(LIBDIR))
   288 
   287 
   289   ifeq ($(COPY_FOR_STATIC_LINKAGE),1)
   288   ifeq ($(COPY_FOR_STATIC_LINKAGE),1)
   290     BINTARGETSTATICLINK:=$(BINDIRSTATICLINK)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(TARGETTYPE))
   289     BINTARGETSTATICLINK:=$(BINDIRSTATICLINK)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(TARGETTYPE))
   291   endif
   290   endif
   292 
   291 
   293   CLEANTARGETS:=$(CLEANTARGETS) $(BINTARGET) $(BINTARGETSTATICLINK)
       
   294   RELEASABLES:=$(RELEASABLES) $(BINTARGET) $(BINTARGETSTATICLINK)
   292   RELEASABLES:=$(RELEASABLES) $(BINTARGET) $(BINTARGETSTATICLINK)
   295 
   293 
   296   # work on a local source files list
   294   # work on a local source files list
   297   SRCFILES:=$(SOURCE)
   295   SRCFILES:=$(SOURCE)
   298   # and there may be more source for stage 2 in OE builds
   296   # and there may be more source for stage 2 in OE builds
   461   ifneq ($(BASE_TYPE),staticlib)
   459   ifneq ($(BASE_TYPE),staticlib)
   462     ifneq ($(BASE_TYPE),importlib)
   460     ifneq ($(BASE_TYPE),importlib)
   463       # link map file (urel only)
   461       # link map file (urel only)
   464       ifeq ($(VARIANTTYPE),urel)
   462       ifeq ($(VARIANTTYPE),urel)
   465         MAP:=$(OPT.MAP)$(BINTARGET).map
   463         MAP:=$(OPT.MAP)$(BINTARGET).map
   466         CLEANTARGETS:=$(CLEANTARGETS) $(BINTARGET).map
       
   467         RELEASABLES:=$(RELEASABLES) $(BINTARGET).map
   464         RELEASABLES:=$(RELEASABLES) $(BINTARGET).map
   468       endif
   465       endif
   469     endif
   466     endif
   470   endif
   467   endif
   471 
   468 
   675   BATCHDIR:=$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/
   672   BATCHDIR:=$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/
   676   $(eval $(call MakeTestBatchFiles,$(TARGET),$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)))
   673   $(eval $(call MakeTestBatchFiles,$(TARGET),$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)))
   677   BATCHFILE_CREATED_$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH):=1
   674   BATCHFILE_CREATED_$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH):=1
   678   TARGET_CREATED_$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)_$(TARGET):=1
   675   TARGET_CREATED_$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)_$(TARGET):=1
   679   RELEASABLES:=$(RELEASABLES) $(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)
   676   RELEASABLES:=$(RELEASABLES) $(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)
   680   CLEANTARGETS:=$(CLEANTARGETS) $(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)
       
   681 endif
   677 endif
   682 
   678 
   683 # clean up
   679 # clean up
   684 $(eval $(call GenerateStandardCleanTarget,$(CLEANTARGETS),$(CREATABLEPATHS),))
   680 $(call raptor_clean,$(CLEANTARGETS))
   685 # make the output directories while reading makefile - some build engines prefer this
   681 # make the output directories while reading makefile - some build engines prefer this
   686 $(call makepath,$(CREATABLEPATHS))
   682 $(call makepath,$(CREATABLEPATHS))
   687 # for the abld -what target
   683 # for the --what option and the log file
   688 $(eval $(call whatmacro,$(RELEASABLES),WHATWINSCW))
   684 $(call raptor_release,$(RELEASABLES))