VirtualBox

儲存庫 kBuild 的更動 1697


忽略:
時間撮記:
2008-8-31 下午09:10:56 (16 年 以前)
作者:
bird
訊息:

footer.kmk: Check for all the keyword permutations of NOINST and INST. Fixes #36.

檔案:
修改 1 筆資料

圖例:

未更動
新增
刪除

  • trunk/kBuild/footer.kmk

    r1696 r1697  
    13531353
    13541354# INSTARGET_*
    1355 ifeq ($(strip $($(target)_NOINST)),)
    1356 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \
    1357         $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/))
     1355ifeq ($(strip $($(target)_NOINST) $($(target)_NOINST.$(bld_trg)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch).$(bld_type))  $($(target)_NOINST.$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg_cpu)) $($(target)_NOINST.$(bld_trg_type))),)
     1356 ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type))),)
     1357  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type)))
     1358 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch))),)
     1359  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch)))
     1360 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_type))),)
     1361  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_type)))
     1362 else ifneq ($(strip $($(target)_INST.$(bld_trg_arch))),)
     1363  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg_arch)))
     1364 else ifneq ($(strip $($(target)_INST.$(bld_trg))),)
     1365  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg)))
     1366 else ifneq ($(strip $($(target)_INST.$(bld_type))),)
     1367  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_type)))
     1368 else ifneq ($(strip $($(target)_INST)),)
     1369  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST))
     1370 else
     1371  local inst := $(definst)/
     1372 endif
     1373 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
    13581374
    13591375else # NOINST
    1360 INSTARGET_$(target) :=
     1376 INSTARGET_$(target) :=
    13611377endif # NOINST
    13621378
    … …  
    21002116# @remark   Only library uses this now.
    21012117define def_target_install_pluss
    2102 ifeq ($(strip $($(target)_NOINST)),)
    2103 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \
    2104         $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/))
     2118ifeq ($(strip $($(target)_NOINST) $($(target)_NOINST.$(bld_trg)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch).$(bld_type))  $($(target)_NOINST.$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg_cpu)) $($(target)_NOINST.$(bld_trg_type))),)
     2119 ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type))),)
     2120  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type)))
     2121 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch))),)
     2122  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch)))
     2123 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_type))),)
     2124  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_type)))
     2125 else ifneq ($(strip $($(target)_INST.$(bld_trg_arch))),)
     2126  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg_arch)))
     2127 else ifneq ($(strip $($(target)_INST.$(bld_trg))),)
     2128  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg)))
     2129 else ifneq ($(strip $($(target)_INST.$(bld_type))),)
     2130  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_type)))
     2131 else ifneq ($(strip $($(target)_INST)),)
     2132  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST))
     2133 else
     2134  local inst := $(definst)/
     2135 endif
     2136 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
    21052137
    21062138$(eval $(def_link_install_rule))
    21072139
    2108 _INSTALLS_FILES += $(INSTARGET_$(target))
    2109 
    2110 ifdef KBUILD_DO_AUTO_INSTALL
    2111 $(typevar) += $(INSTARGET_$(target))
    2112 else
    2113 $(typevar) += $(out)
    2114 endif
     2140 _INSTALLS_FILES += $(INSTARGET_$(target))
     2141
     2142 ifdef KBUILD_DO_AUTO_INSTALL
     2143  $(typevar) += $(INSTARGET_$(target))
     2144 else
     2145  $(typevar) += $(out)
     2146 endif
    21152147else # _NOINST
    2116 $(typevar) += $(out)
     2148 $(typevar) += $(out)
    21172149endif
    21182150
    … …  
    26112643
    26122644# installation targets
    2613 ifeq ($(strip $($(target)_NOINST)),)
    2614 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \
    2615         $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/))
    2616 ifdef KBUILD_DO_AUTO_INSTALL
    2617 $(typevar)  += $(INSTARGET_$(target))
    2618 else
    2619 $(typevar)  += $(out)
    2620 endif
    2621 # generate the install rule
     2645ifeq ($(strip $($(target)_NOINST) $($(target)_NOINST.$(bld_trg)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg).$(bld_trg_arch).$(bld_type))  $($(target)_NOINST.$(bld_trg_arch)) $($(target)_NOINST.$(bld_trg_cpu)) $($(target)_NOINST.$(bld_trg_type))),)
     2646 ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type))),)
     2647  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch).$(bld_type)))
     2648 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_trg_arch))),)
     2649  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_trg_arch)))
     2650 else ifneq ($(strip $($(target)_INST.$(bld_trg).$(bld_type))),)
     2651  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg).$(bld_type)))
     2652 else ifneq ($(strip $($(target)_INST.$(bld_trg_arch))),)
     2653  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg_arch)))
     2654 else ifneq ($(strip $($(target)_INST.$(bld_trg))),)
     2655  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_trg)))
     2656 else ifneq ($(strip $($(target)_INST.$(bld_type))),)
     2657  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST.$(bld_type)))
     2658 else ifneq ($(strip $($(target)_INST)),)
     2659  local inst := $(addprefix $(PATH_INS)/,$($(target)_INST))
     2660 else
     2661  local inst := $(definst)/
     2662 endif
     2663 INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
     2664 ifdef KBUILD_DO_AUTO_INSTALL
     2665  $(typevar)  += $(INSTARGET_$(target))
     2666 else
     2667  $(typevar)  += $(out)
     2668 endif
     2669 # generate the install rule
    26222670$(eval $(def_link_install_rule))
    26232671
    26242672else # NOINST
    2625 INSTARGET_$(target) :=
    2626 $(typevar)  += $(out)
     2673 INSTARGET_$(target) :=
     2674 $(typevar)  += $(out)
    26272675endif # NOINST
    26282676
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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