Changeset 904 in kBuild

Timestamp:

May 23, 2007 5:31:56 AM (18 years ago)

Author:

bird

Message:

Recognize the CLEAN attribute. header.kmk

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (4 diffs)
• header.kmk (modified) (1 diff)

trunk/kBuild/footer.kmk

@@ -1322 +1322 @@
 
 _OUT_FILES += $($(target)_OUTPUT_) $(out)
-_CLEAN_FILES += $($(target)_CLEAN)
-_DIRS += $($(target)_BLDDIRS)
+_CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(BUILD_TARGET)) $($(target)_CLEAN.$(BUILD_TYPE))
+_DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(BUILD_TARGET))
 _OBJS += $($(target)_OBJS_)
 
@@ -1851 +1851 @@
 _OBJS += $($(target)_OBJS_)
 _OUT_FILES += $($(target)_OUTPUT_) $(out)
-_CLEAN_FILES += $($(target)_CLEAN)
-_DIRS += $($(target)_BLDDIRS)
+_CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(BUILD_TARGET)) $($(target)_CLEAN.$(BUILD_TYPE))
+_DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(BUILD_TARGET))
 _INSTALLS_FILES += $(INSTARGET_$(target))
 
@@ -2259 +2259 @@
 _INSTALLS_FILES += $(INSTARGET_$(target))
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
-_CLEAN_FILES += $($(target)_CLEAN)
-_DIRS += $($(target)_BLDDIRS)
+_CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(BUILD_TARGET)) $($(target)_CLEAN.$(BUILD_TYPE))
+_DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(BUILD_TARGET))
 endef
 
@@ -2308 +2308 @@
         $(call MSG_CLEAN)
         $(QUIET)$(RM) -f $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)
+ifeq ($(RMDIR),kmk_builtin_rmdir)
+ ifeq ($(filter rsort,$(KMK_FEATURES)),rsort) # TODO: Drop this when switching gmake to the gmakenew code!
+        $(RMDIR) --ignore-fail-on-non-empty --ignore-fail-on-not-exist $(rsort $(dir $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)))
+ endif
+endif
 
 

trunk/kBuild/header.kmk

@@ -612 +612 @@
         INCS CINCS CXXINCX ASINCS RCINCS \
         LIBS LIBPATH \
-        DIRS BLDDIRS
+        DIRS BLDDIRS \
+        CLEAN
 
 ## PROPS_ALL