Changeset 1034 for trunk/kBuild


Ignore:
Timestamp:
Jun 4, 2007, 4:05:30 AM (18 years ago)
Author:
bird
Message:

MAYBE output. removed some obsolete stuff.

Location:
trunk/kBuild/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GCC3.kmk

    r1032 r1034  
    207207# @param    $(othersrc) Unhandled sources.
    208208# @param    $(outbase)  Output basename (full). Use this for list files and such.
    209 TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
     209TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script
     210TOOL_GCC3_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).imp.a
    210211TOOL_GCC3_LINK_LIBRARY_DEPEND = $(othersrc)
    211212TOOL_GCC3_LINK_LIBRARY_DEPORD =
    212 ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    213213define TOOL_GCC3_LINK_LIBRARY_CMDS
    214214        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    … …  
    223223        $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
    224224endef
    225 else
    226 define TOOL_GCC3_LINK_LIBRARY_CMDS
    227         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    228         $(foreach o, $(objs)\
    229                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
    230         $(foreach srclib, $(filter-out %.def %.imp,$(othersrc))\
    231                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
    232         $(if $(filter %.def %.imp,$(othersrc))\
    233                 ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
    234                  $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(outbase).imp.a")
    235         $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    236         $(QUIET)$(APPEND) $(out).ar-script "END"
    237         $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
    238 endef
    239 endif
    240225
    241226

  • trunk/kBuild/tools/GCC32.kmk

    r1032 r1034  
    209209TOOL_GCC32_LINK_LIBRARY_DEPEND = $(othersrc)
    210210TOOL_GCC32_LINK_LIBRARY_DEPORD =
    211 ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    212211define TOOL_GCC32_LINK_LIBRARY_CMDS
    213212        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    … …  
    219218        $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
    220219endef
    221 else
    222 define TOOL_GCC32_LINK_LIBRARY_CMDS
    223         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    224         $(foreach o, $(objs)\
    225                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
    226         $(foreach srclib,$(othersrc)\
    227                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
    228         $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    229         $(QUIET)$(APPEND) $(out).ar-script "END"
    230         $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
    231 endef
    232 endif
    233220
    234221

  • trunk/kBuild/tools/GXX3.kmk

    r1015 r1034  
    207207# @param    $(othersrc) Unhandled sources.
    208208# @param    $(outbase)  Output basename (full). Use this for list files and such.
    209 TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
     209TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script
     210TOOL_GXX3_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).imp.a
    210211TOOL_GXX3_LINK_LIBRARY_DEPEND = $(othersrc)
    211212TOOL_GXX3_LINK_LIBRARY_DEPORD =
    212 ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    213213define TOOL_GXX3_LINK_LIBRARY_CMDS
    214214        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    … …  
    223223        $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
    224224endef
    225 else
    226 define TOOL_GXX3_LINK_LIBRARY_CMDS
    227         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    228         $(foreach o, $(objs)\
    229                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
    230         $(foreach srclib, $(filter-out %.def %.imp,$(othersrc))\
    231                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
    232         $(if $(filter %.def %.imp,$(othersrc))\
    233                 ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
    234                  $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(outbase).imp.a")
    235         $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    236         $(QUIET)$(APPEND) $(out).ar-script "END"
    237         $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
    238 endef
    239 endif
    240225
    241226
    … …  
    253238# @param    $(custom_post)  Custom step invoked after linking.
    254239# @param    $(outbase)  Output basename (full). Use this for list files and such.
    255 TOOL_GXX3_LINK_PROGRAM_OUTPUT = $(outbase).map
     240TOOL_GXX3_LINK_PROGRAM_OUTPUT =
     241TOOL_GXX3_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map
    256242TOOL_GXX3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    257243                $(filter %.def, $(othersrc))
    … …  
    279265# @param    $(custom_post)  Custom step invoked after linking.
    280266# @param    $(outbase)  Output basename (full). Use this for list files and such.
    281 TOOL_GXX3_LINK_DLL_OUTPUT = $(outbase).map
     267TOOL_GXX3_LINK_DLL_OUTPUT =
     268TOOL_GXX3_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
    282269TOOL_GXX3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    283270                $(filter %.def, $(othersrc))
    … …  
    307294# @param    $(custom_post)  Custom step invoked after linking.
    308295# @param    $(outbase)  Output basename (full). Use this for list files and such.
    309 TOOL_GXX3_LINK_SYSMOD_OUTPUT = $(outbase).map
     296TOOL_GXX3_LINK_SYSMOD_OUTPUT =
     297TOOL_GXX3_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
    310298TOOL_GXX3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    311299                $(filter %.def, $(othersrc))

  • trunk/kBuild/tools/GXX32.kmk

    r1015 r1034  
    245245# @param    $(custom_post)  Custom step invoked after linking.
    246246# @param    $(outbase)  Output basename (full). Use this for list files and such.
    247 TOOL_GXX32_LINK_PROGRAM_OUTPUT = $(outbase).map
     247TOOL_GXX32_LINK_PROGRAM_OUTPUT =
     248TOOL_GXX32_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map
    248249TOOL_GXX32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    249250TOOL_GXX32_LINK_PROGRAM_DEPORD =
    … …  
    269270# @param    $(custom_post)  Custom step invoked after linking.
    270271# @param    $(outbase)  Output basename (full). Use this for list files and such.
    271 TOOL_GXX32_LINK_DLL_OUTPUT = $(outbase).map
     272TOOL_GXX32_LINK_DLL_OUTPUT =
     273TOOL_GXX32_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
    272274TOOL_GXX32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    273275TOOL_GXX32_LINK_DLL_DEPORD =
    … …  
    295297# @param    $(custom_post)  Custom step invoked after linking.
    296298# @param    $(outbase)  Output basename (full). Use this for list files and such.
    297 TOOL_GXX32_LINK_SYSMOD_OUTPUT = $(outbase).map
     299TOOL_GXX32_LINK_SYSMOD_OUTPUT =
     300TOOL_GXX32_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
    298301TOOL_GXX32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    299302TOOL_GXX32_LINK_SYSMOD_DEPORD =

  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r1015 r1034  
    233233# @param    $(custom_post)  Custom step invoked after linking.
    234234# @param    $(outbase)  Output basename (full). Use this for list files and such.
    235 TOOL_GXX3PLAIN_LINK_PROGRAM_OUTPUT = $(outbase).map
     235TOOL_GXX3PLAIN_LINK_PROGRAM_OUTPUT =
     236TOOL_GXX3PLAIN_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map
    236237TOOL_GXX3PLAIN_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    237238                $(filter %.def, $(othersrc))
    … …  
    258259# @param    $(custom_post)  Custom step invoked after linking.
    259260# @param    $(outbase)  Output basename (full). Use this for list files and such.
    260 TOOL_GXX3PLAIN_LINK_DLL_OUTPUT = $(outbase).map
     261TOOL_GXX3PLAIN_LINK_DLL_OUTPUT =
     262TOOL_GXX3PLAIN_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
    261263TOOL_GXX3PLAIN_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    262264                $(filter %.def, $(othersrc))

  • trunk/kBuild/tools/MINGW32.kmk

    r873 r1034  
    196196TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(othersrc)
    197197TOOL_MINGW32_LINK_LIBRARY_DEPORD =
    198 ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    199198define TOOL_MINGW32_LINK_LIBRARY_CMDS
    200199        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    … …  
    206205        $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script
    207206endef
    208 else
    209 define TOOL_MINGW32_LINK_LIBRARY_CMDS
    210         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    211         $(foreach o, $(objs)\
    212                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
    213         $(foreach srclib, $(othersrc)\
    214                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
    215         $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    216         $(QUIET)$(APPEND) $(out).ar-script "END"
    217         $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script
    218 endef
    219 endif
     207
    220208
    221209
    … …  
    258246# @param    $(custom_post)  Custom step invoked after linking.
    259247# @param    $(outbase)  Output basename (full). Use this for list files and such.
    260 TOOL_MINGW32_LINK_DLL_OUTPUT = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
     248TOOL_MINGW32_LINK_DLL_OUTPUT =
     249TOOL_MINGW32_LINK_DLL_OUTPUT_MAYBE = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
    261250## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, .map, etc).
    262251TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
Note: See TracChangeset for help on using the changeset viewer.