Changeset 966 in kBuild

Timestamp:

May 27, 2007 1:47:57 PM (18 years ago)

Author:

bird

Message:

Fix the clean rule

File:

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

trunk/kBuild/footer.kmk

@@ -1161 +1161 @@
 endif
 
+## Temporary macro for testing the new multi target rules.
+ifdef USE_MULTI_TARGET
+ _M_PLUSS=+
+else
+ _M_PLUSS=
+endif
+
 ## Generates the rules for building a specific object, and the aliases
 # for building a source file.
 # @param    $(obj)    The object file.
 define def_target_source_rule
-$(obj) $($(target)_$(source)_OUTPUT_): \
+$(obj) $(_M_PLUSS) $($(target)_$(source)_OUTPUT_): \
                 $($(target)_$(source)_DEPEND_) \
                 $(_DEP_COMPILE_CMDS) \
@@ -1209 +1216 @@
 # @param    $($(target)_CMDS_PREV_) The link commands from the previous run.
 define def_link_rule
-$(out) $($(target)_OUTPUT_): \
+$(out) $(_M_PLUSS) $($(target)_OUTPUT_): \
                 $($(target)_DEPEND_) \
                 $(_DEP_LINK_CMDS) \
@@ -2310 +2317 @@
 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)))
+        $(QUIET)$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $(rsort $(dir $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)))
  endif
 endif
@@ -2507 +2514 @@
 endif # __footer_kmk__
 
-