Changeset 2236

Timestamp:

Jan 9, 2009, 3:59:39 AM (17 years ago)

Author:

bird

Message:

footer.kmk: The remaining $(target)_OBJS_ -> $(target)_2_OBJS work.

File:

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

trunk/kBuild/footer.kmk

@@ -2166 +2166 @@
 endef
 
-if $(KBUILD_VERSION_PATCH) != 4
 define def_src_handler_obj
 ifeq ($(defpath),)
@@ -2174 +2173 @@
 endif
 endef
-else  # legacy - remove
-define def_src_handler_obj
-ifeq ($(defpath),)
- $(target)_OBJS_ += $(source)
-else
- $(target)_OBJS_ += $(abspathex $(source), $(defpath))
-endif
-endef
-endif # legacy - remove
 ## @}
 
@@ -2202 +2192 @@
 # @param    $(defpath)
 # @param    much-more...
-# @returns  othersrc, $(target)_OBJS_, ++
+# @returns  othersrc, $(target)_2_OBJS, ++
 define def_target_sources
 local target_src_handlers := $($(target)_SRC_HANDLERS) $(KBUILD_SRC_HANDLERS)
@@ -2297 +2287 @@
 _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))
 _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))
-_OBJS += $($(target)_OBJS_)
+_OBJS += $($(target)_2_OBJS)
 
 endef # def_target_install_pluss
@@ -2346 +2336 @@
 # no local here - must be writable across some foreachs.
 othersrc          :=
-$(target)_OBJS_   :=
+$(target)_2_OBJS  :=
 
 # Do units pre source callouts.
@@ -2419 +2409 @@
 # Adjust paths if we got a default path.
 ifneq ($(defpath),)
- $(target)_OBJS_  := $(abspathex $($(target)_OBJS_),$(defpath))
+ $(target)_2_OBJS := $(abspathex $($(target)_2_OBJS),$(defpath))
  local deps       := $(abspathex $(deps),$(defpath))
  local orderdeps  := $(abspathex $(orderdeps),$(defpath))
@@ -2490 +2480 @@
 
 # eliminate this guy?
-local objs = $($(target)_OBJS_)
+local objs = $($(target)_2_OBJS)
 
 # dependency file
@@ -2531 +2521 @@
 $(target)_2_OUTPUT := $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT)
 $(target)_2_OUTPUT_MAYBE := $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT_MAYBE)
-$(target)_2_DEPEND := $(TOOL_$(tool)_LINK_LIBRARY_DEPEND) $(deps) $($(target)_OBJS_)
+$(target)_2_DEPEND := $(TOOL_$(tool)_LINK_LIBRARY_DEPEND) $(deps) $($(target)_2_OBJS)
 $(target)_2_DEPORD := $(TOOL_$(tool)_LINK_LIBRARY_DEPORD) $(dirdep) $(orderdeps)
 
@@ -2599 +2589 @@
 # no local here - must be writable across some foreachs.
 othersrc          :=
-$(target)_OBJS_   :=
+$(target)_2_OBJS  :=
 
 # Do units pre source callouts.
@@ -2785 +2775 @@
 ifneq ($(defpath),)
  local libpath    := $(abspathex $(libpath),$(defpath))
- $(target)_OBJS_  := $(abspathex $($(target)_OBJS_),$(defpath))
+ $(target)_2_OBJS := $(abspathex $($(target)_2_OBJS),$(defpath))
  local deps       := $(abspathex $(deps),$(defpath))
  local orderdeps  := $(abspathex $(orderdeps),$(defpath))
@@ -2855 +2845 @@
 
 # eliminate this guy?
-local objs = $($(target)_OBJS_)
+local objs = $($(target)_2_OBJS)
 
 # installation targets
@@ -2954 +2944 @@
 $(target)_2_OUTPUT := $(TOOL_$(tool)_$(tool_do)_OUTPUT)
 $(target)_2_OUTPUT_MAYBE := $(TOOL_$(tool)_$(tool_do)_OUTPUT_MAYBE)
-$(target)_2_DEPEND := $(TOOL_$(tool)_$(tool_do)_DEPEND) $(deps) $($(target)_OBJS_)
+$(target)_2_DEPEND := $(TOOL_$(tool)_$(tool_do)_DEPEND) $(deps) $($(target)_2_OBJS)
 $(target)_2_DEPORD := $(TOOL_$(tool)_$(tool_do)_DEPORD) $(dirdep) $(orderdeps)
 
@@ -2962 +2952 @@
 
 # Update globals.
-_OBJS += $($(target)_OBJS_)
+_OBJS += $($(target)_2_OBJS)
 _OUT_FILES += $($(target)_2_OUTPUT) $($(target)_2_OUTPUT_MAYBE) $(out)
 _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))
@@ -3782 +3772 @@
         @$(ECHO) "  TARGET_$(target)=$(TARGET_$(target))" $(NLTAB)\
         @$(ECHO) "  INSTARGET_$(target)=$(INSTARGET_$(target))" $(NLTAB)\
-$(foreach prop,$(PROPS_SINGLE) $(PROPS_ACCUMULATE_L) $(PROPS_ACCUMULATE_R) OBJS_ CLEAN, \
+$(foreach prop,$(PROPS_SINGLE) $(PROPS_ACCUMULATE_L) $(PROPS_ACCUMULATE_R) 2_OBJS CLEAN, \
         $(eval _tmp:=$(firstword $($(target)_BLD_TRG) $(KBUILD_TARGET))) \
         $(if $($(target)_$(prop).$(_tmp)),\