Changeset 1614 in kBuild

Timestamp:

May 12, 2008 4:05:52 PM (17 years ago)

Author:

bird

Message:

Added a CLEAN attribute to the install sources. Extended the cleaning of fetches a bit so it matches the others.

File:

• trunk/kBuild/footer.kmk (modified) (5 diffs)

trunk/kBuild/footer.kmk

@@ -1771 +1771 @@
 _TARGET_$(target)_UNPACKED :=
 _TARGET_$(target)_DIGEST :=
-local clean_files := $($(target)_CLEAN)
+local clean_files := $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(KBUILD_TYPE))
 
 # The 'sources'.
-#$ (warning dbg fetch: target=$(target) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(KBUILD_TARGET_ARCH)) $($(target)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)))
-$(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(KBUILD_TARGET_ARCH)) $($(target)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),\
+#$ (warning dbg fetch: target=$(target) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(KBUILD_TARGET).$(bld_trg_arch)))
+$(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)),\
         $(evalval def_fetch_src))
 
@@ -2841 +2841 @@
         $($(target)_$(srcsrc)_IFFLAGS.$(bld_trg)) \
         $($(target)_$(srcsrc)_IFFLAGS.$(bld_trg).$(bld_trg_arch))
+clean_files += \
+        $($(srcdst)_CLEAN) \
+        $($(srcdst)_CLEAN.$(bld_trg)) \
+        $($(srcdst)_CLEAN.$(bld_trg).$(bld_trg_arch)) \
+        $($(srcsrc)_CLEAN) \
+        $($(srcsrc)_CLEAN.$(bld_trg)) \
+        $($(srcsrc)_CLEAN.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_$(srcdst)_CLEAN) \
+        $($(target)_$(srcdst)_CLEAN.$(bld_trg)) \
+        $($(target)_$(srcdst)_CLEAN.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_$(srcsrc)_CLEAN) \
+        $($(target)_$(srcsrc)_CLEAN.$(bld_trg)) \
+        $($(target)_$(srcsrc)_CLEAN.$(bld_trg).$(bld_trg_arch))
 
 
@@ -3005 +3018 @@
 INSTARGET_DIRS_$(target) :=
 
+local clean_files := $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type))
+
 $(foreach directory,$($(target)_DIRS) $($(target)_DIRS.$(bld_trg)) $($(target)_DIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_DIRS.$(bld_trg_arch)) $($(target)_DIRS.$(bld_trg_cpu)) $($(target)_DIRS.$(bld_type)), \
         $(evalval def_install_directory))
@@ -3024 +3039 @@
 _INSTALLS_FILES += $(INSTARGET_$(target))
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
-_CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type))
+_CLEAN_FILES += $(clean_files)
 _DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
 endef
@@ -3030 +3045 @@
 ## process all install targets
 $(foreach target, $(INSTALLS) $(INSTALLS.$(KBUILD_TARGET)) $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
-        $(evalval def_install))
+        $(evalvalctx def_install))
 
 ifdef KBUILD_PROFILE_SELF