Changeset 442

Timestamp:

May 28, 2006, 4:18:45 PM (19 years ago)

Author:

bird

Message:

Last change didn't work - fixed it. Don't specify -B for the target and object aliases.

File:

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

trunk/kBuild/footer.kmk ¶

@@ -298 +298 @@
 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop)
 #$ (warning dbgtype: TEMPLATE_$($(target)_TEMPLATE)_$(prop) $(target)_$(prop)=$($(target)_$(prop)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop)))
-$(target)_$(prop) := $(value $(target)_$(prop)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
-#$(warning dbgtype: $(target)_$(prop)=$($(target)_$(prop)))
+$(target)_$(prop) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
+#$ (warning dbgtype: $(target)_$(prop)=$($(target)_$(prop)))
 endif
 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE)
 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
-$(target)_$(prop).$(BUILD_TYPE) := $(value $(target)_$(prop).$(BUILD_TYPE)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
+$(target)_$(prop).$(BUILD_TYPE) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
 endif
 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET)
 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET))
-$(target)_$(prop).$(BUILD_TARGET) := $(value $(target)_$(prop).$(BUILD_TARGET)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET))
+$(target)_$(prop).$(BUILD_TARGET) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET))
 endif
 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_CPU)
 #$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_CPU))
-$(target)_$(prop).$(BUILD_TARGET_CPU) := $(value $(target)_$(prop).$(BUILD_TARGET)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_CPU))
+$(target)_$(prop).$(BUILD_TARGET_CPU) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_CPU))
 endif
 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_ARCH)
 #$ (warning dbg6: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_ARCH))
-$(target)_$(prop).$(BUILD_TARGET_ARCH) := $(value $(target)_$(prop).$(BUILD_TARGET)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_ARCH))
+$(target)_$(prop).$(BUILD_TARGET_ARCH) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TARGET_ARCH))
 endif
 endef
@@ -324 +324 @@
 $(foreach prop,$(PROPS_SINGLE),$(eval $(value def_inherit_template_one)))
 $(foreach prop,$(PROPS_DEFERRED),$(eval $(def_inherit_template_one_deferred))) # exploits the 2 evaluation, so no value!
-$(foreach prop,$(PROPS_ACCUMULATE),$(eval $(value def_inherit_template_one_accumulate)))
+$(foreach prop,$(PROPS_ACCUMULATE),$(eval $(def_inherit_template_one_accumulate))) # += works fine (better) without value.
 endef
 
@@ -434 +434 @@
 
 $(basename $(notdir $(obj))).o::
-        + $$(MAKE) -B -f $$(MAKEFILE) $(obj)
+        + $$(MAKE) -f $$(MAKEFILE) $(obj)
 $(basename $$(notdir $$(obj))).obj::
-        + $$(MAKE) -B -f $$(MAKEFILE) $(obj)
+        + $$(MAKE) -f $$(MAKEFILE) $(obj)
 endef
 
@@ -477 +477 @@
 
 $(basename $(notdir $(out)))::
-        + $$(MAKE) -B -f $$(MAKEFILE) $(out)
+        + $$(MAKE) -f $$(MAKEFILE) $(out)
 endef