From 3720ea1f8500338e4350998637bbfd670f82bfe9 Mon Sep 17 00:00:00 2001 From: bird Date: Sun, 31 Aug 2008 20:42:53 +0000 Subject: [PATCH] footer: added global property DEPFILES with the usual permutations. Changed the NOINST check to test if the expanded value is non-zero to allow $(if ) test and similar. git-svn-id: https://www.virtualbox.org/svn/kbuild-mirror/trunk@1696 1093d150-e988-4e3a-8fd4-90e8b09e91e5 --- kBuild/footer.kmk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kBuild/footer.kmk b/kBuild/footer.kmk index 78859f2e..ccb4261d 100644 --- a/kBuild/footer.kmk +++ b/kBuild/footer.kmk @@ -91,8 +91,8 @@ _ALL_SRCNAME_TARGETS = \ $(_ALL_FETCHES) \ $(_ALL_PATCHES) -# dependency files. -_DEPFILES := +# Dependency files. (currently not on target level, only this global stuff) +_DEPFILES := $(DEPFILES) $(DEPFILES.$(KBUILD_TARGET)) $(DEPFILES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) $(DEPFILES.$(KBUILD_TARGET_ARCH)) $(DEPFILES.$(KBUILD_TARGET_CPU)) $(DEPFILES.$(KBUILD_TYPE)) # included dependency files. _DEPFILES_INCLUDED := @@ -1352,7 +1352,7 @@ local out := $(outbase)$(suff) TARGET_$(target) := $(out) # INSTARGET_* -ifndef $(target)_NOINST +ifeq ($(strip $($(target)_NOINST)),) INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \ $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/)) @@ -2099,7 +2099,7 @@ endef # @param $(typevar) The name of the variable with all the root targets of its type. # @remark Only library uses this now. define def_target_install_pluss -ifndef $(target)_NOINST +ifeq ($(strip $($(target)_NOINST)),) INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \ $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/)) @@ -2610,7 +2610,7 @@ endif local objs = $($(target)_OBJS_) # installation targets -ifndef $(target)_NOINST +ifeq ($(strip $($(target)_NOINST)),) INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)), \ $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(definst)/)) ifdef KBUILD_DO_AUTO_INSTALL -- 2.11.4.GIT