VirtualBox

Changeset 300 in kBuild for trunk


Ignore:
Timestamp:
Jun 23, 2005 6:36:41 PM (19 years ago)
Author:
bird
Message:

Do dependencies first.

Location:
trunk/kBuild/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/kBuild/tools/GCC.kmk

    r235 r300  
    8181define TOOL_GCC_COMPILE_C
    8282#$ (warning dbg: TOOL_GCC_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    83 $(obj): $(PATH_CURRENT)/$(source) $(deps) | $(dirdep)
     83$(obj): $(deps) $(source) | $(dirdep)
    8484        $(call MSG_L2,Compiling $$@ using GCC)
    8585        $(TOOL_GCC_CC) -c\
     
    107107define TOOL_GCC_COMPILE_CXX
    108108#$ (warning dbg: TOOL_GCC_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    109 $(obj): $(source) $(deps) | $(dirdep)
     109$(obj): $(deps) $(source) | $(dirdep)
    110110        $(call MSG_L2,Compiling $$@ using GCC)
    111111        $(TOOL_GCC_CXX) -c\
     
    129129define TOOL_GCC_LINK_LIBRARY
    130130#$ (warning dbg: TOOL_GCC_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
    131 $(lib): $(objs) $(deps) | $(dirdep)
     131$(lib): $(deps) $(objs) | $(dirdep)
    132132        $(call MSG_L1,Creating Library $$@)
    133133        $(RM) -f $$@
     
    153153define TOOL_GCC_LINK_PROGRAM
    154154#$ (warning dbg: TOOL_GCC_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    155 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     155$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    156156        $(call MSG_L1,Creating Program $$@)
    157157ifneq ($(custom_pre),)
     
    183183define TOOL_GCC_LINK_DLL
    184184#$ (warning dbg: TOOL_GCC_LINK_DLL: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    185 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     185$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    186186        $(call MSG_L1,Creating Program $$@)
    187187ifneq ($(custom_pre),)
  • trunk/kBuild/tools/GCC3.kmk

    r293 r300  
    9696define TOOL_GCC3_COMPILE_C
    9797#$ (warning dbg: TOOL_GCC3_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
    98 $(obj): $(source) $(deps) | $(dirdep)
     98$(obj): $(deps) $(source) | $(dirdep)
    9999        $(call MSG_L2,Compiling $$@ using GCC3)
    100100        $(TOOL_GCC3_CC) -c\
     
    122122define TOOL_GCC3_COMPILE_CXX
    123123#$ (warning dbg: TOOL_GCC3_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
    124 $(obj): $(source) $(deps) | $(dirdep)
     124$(obj): $(deps) $(source) | $(dirdep)
    125125        $(call MSG_L2,Compiling $$@ using GCC3)
    126126        $(TOOL_GCC3_CXX) -c\
     
    158158define TOOL_GCC3_LINK_LIBRARY
    159159#$ (warning dbg: TOOL_GCC3_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    160 $(lib): $(objs) $(deps) $(filter %.a %.lib,$(othersrc)) | $(dirdep)
     160$(lib): $(deps) $(objs) $(filter %.a %.lib,$(othersrc)) | $(dirdep)
    161161        $(call MSG_L1,Creating Library $$@)
    162162        $(RM) -f $$@
     
    192192define TOOL_GCC3_LINK_PROGRAM
    193193#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    194 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     194$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    195195        $(call MSG_L1,Creating Program $$@)
    196196ifneq ($(custom_pre),)
     
    226226define TOOL_GCC3_LINK_DLL
    227227#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    228 $(dll): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     228$(dll): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    229229        $(call MSG_L1,Creating Program $$@)
    230230ifneq ($(custom_pre),)
     
    261261define TOOL_GCC3_LINK_SYSMOD
    262262#$ (warning dbg: TOOL_GCC3_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    263 $(sys): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     263$(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    264264        $(call MSG_L1,Creating Program $$@)
    265265ifneq ($(custom_pre),)
  • trunk/kBuild/tools/GCC3OMF.kmk

    r295 r300  
    8989define TOOL_GCC3OMF_COMPILE_C
    9090#$ (warning dbg: TOOL_GCC3OMF_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    91 $(obj): $(source) $(deps) | $(dirdep)
     91$(obj): $(deps) $(source) | $(dirdep)
    9292        $(call MSG_L2,Compiling $$@ using GCC3)
    9393        $(TOOL_GCC3OMF_CC) -c\
     
    115115define TOOL_GCC3OMF_COMPILE_CXX
    116116#$ (warning dbg: TOOL_GCC3OMF_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    117 $(obj): $(source) $(deps) | $(dirdep)
     117$(obj): $(deps) $(source) | $(dirdep)
    118118        $(call MSG_L2,Compiling $$@ using GCC3)
    119119        $(TOOL_GCC3OMF_CXX) -c\
     
    138138define TOOL_GCC3OMF_LINK_LIBRARY
    139139#$ (warning dbg: TOOL_GCC3OMF_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    140 $(lib): $(objs) $(deps) $(filter %.a %.lib %.def %.imp,$(othersrc)) | $(dirdep)
     140$(lib): $(deps) $(objs) $(filter %.a %.lib %.def %.imp,$(othersrc)) | $(dirdep)
    141141        $(call MSG_L1,Creating Library $$@)
    142142        $(RM) -f $$@
     
    163163define TOOL_GCC3OMF_LINK_PROGRAM
    164164#$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    165 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def, $(othersrc)) | $(dirdep)
     165$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)
    166166        $(call MSG_L1,Creating Program $$@)
    167167ifneq ($(custom_pre),)
     
    197197define TOOL_GCC3OMF_LINK_DLL
    198198#$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    199 $(dll): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def, $(othersrc)) | $(dirdep)
     199$(dll): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)
    200200        $(call MSG_L1,Creating Program $$@)
    201201ifneq ($(custom_pre),)
     
    230230define TOOL_GCC3OMF_LINK_SYSMOD
    231231#$ (warning dbg: TOOL_GCC3OMF_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    232 $(sys): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def, $(othersrc)) | $(dirdep)
     232$(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(filter %.def, $(othersrc)) | $(dirdep)
    233233        $(call MSG_L1,Creating Program $$@)
    234234ifneq ($(custom_pre),)
  • trunk/kBuild/tools/MINGW32.kmk

    r235 r300  
    111111define TOOL_MINGW32_COMPILE_C
    112112#$ (warning dbg: TOOL_MINGW32_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    113 $(obj): $(source) $(deps) | $(dirdep)
     113$(obj): $(deps) $(source) | $(dirdep)
    114114        $(call MSG_L2,Compiling $$@ using MINGW32)
    115115        $(TOOL_MINGW32_CC) -c\
     
    137137define TOOL_MINGW32_COMPILE_CXX
    138138#$ (warning dbg: TOOL_MINGW32_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    139 $(obj): $(source) $(deps) | $(dirdep)
     139$(obj): $(deps) $(source) | $(dirdep)
    140140        $(call MSG_L2,Compiling $$@ using MINGW32)
    141141        $(TOOL_MINGW32_CXX) -c\
     
    159159define TOOL_MINGW32_LINK_LIBRARY
    160160#$ (warning dbg: TOOL_MINGW32_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
    161 $(lib): $(objs) $(deps) | $(dirdep)
     161$(lib): $(deps) $(objs) | $(dirdep)
    162162        $(call MSG_L1,Creating Library $$@)
    163163        $(RM) -f $$@
     
    183183define TOOL_MINGW32_LINK_PROGRAM
    184184#$ (warning dbg: TOOL_MINGW32_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
    185 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     185$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    186186        $(call MSG_L1,Creating Program $$@)
    187187ifneq ($(custom_pre),)
     
    214214define TOOL_MINGW32_LINK_DLL
    215215#$ (warning dbg: TOOL_MINGW32_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    216 $(dll): $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) | $(dirdep)
     216$(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
    217217        $(call MSG_L1,Creating Program $$@)
    218218ifneq ($(custom_pre),)
  • trunk/kBuild/tools/NASM.kmk

    r235 r300  
    5757define TOOL_NASM_COMPILE_AS
    5858#$ (warning dbg: TOOL_NASM_COMPILE_AS: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
    59 $(obj): $(source) $(deps) | $(dirdep)
     59$(obj): $(deps) $(source) | $(dirdep)
    6060        $(call MSG_L2,Compiling $$@ using NASM)
    6161        $(TOOL_NASM_AS) \
  • trunk/kBuild/tools/VCC70.kmk

    r262 r300  
    7676define TOOL_VCC70_COMPILE_C
    7777#$ (warning dbg: TOOL_VCC70_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
    78 $(obj): $(source) $(deps) | $(dirdep)
     78$(obj): $(deps) $(source) | $(dirdep)
    7979        $(call MSG_L2,Compiling $$@ using VCC70)
    8080        $(TOOL_VCC70_CC) -c\
     
    107107define TOOL_VCC70_COMPILE_CXX
    108108#$ (warning dbg: TOOL_VCC70_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
    109 $(obj): $(source) $(deps) | $(dirdep)
     109$(obj): $(deps) $(source) | $(dirdep)
    110110        $(call MSG_L2,Compiling $$@ using VCC70)
    111111        $(TOOL_VCC70_CXX) -c\
     
    135135define TOOL_VCC70_LINK_LIBRARY
    136136#$ (warning dbg: TOOL_VCC70_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
    137 $(lib): $(objs) $(deps) $(othersrc) | $(dirdep)
     137$(lib): $(deps) $(objs) $(othersrc) | $(dirdep)
    138138        $(call MSG_L1,Creating Library $$@)
    139139        $(RM) -f $$@
     
    161161define TOOL_VCC70_LINK_PROGRAM
    162162#$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    163 $(exe): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(othersrc) | $(dirdep)
     163$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
    164164        $(call MSG_L1,Creating Program $$@)
    165165ifneq ($(custom_pre),)
     
    199199define TOOL_VCC70_LINK_SYSMOD
    200200#$ (warning dbg: TOOL_VCC70_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    201 $(sys): $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(othersrc) | $(dirdep)
     201$(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
    202202        $(call MSG_L1,Creating Program $$@)
    203203ifneq ($(custom_pre),)
     
    237237define TOOL_VCC70_LINK_DLL
    238238#$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
    239 $(dll): $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(othersrc) | $(dirdep)
     239$(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
    240240        $(call MSG_L1,Creating Program $$@)
    241241ifneq ($(custom_pre),)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette