Changeset 2238 in kBuild for trunk

Timestamp:

Jan 9, 2009 3:17:33 AM (16 years ago)

Author:

bird

Message:

footer.kmk: TARGET_$(target) -> $(target)_1_TARGET. Old value is still valid for a while. Ref #57.

File:

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

trunk/kBuild/footer.kmk

@@ -1418 +1418 @@
 
 # TARGET_*
-TARGET_$(target) := $(out)
+TARGET_$(target)   := $(out)
+$(target)_1_TARGET := $(out)
 
 # INSTARGET_*
@@ -1564 +1565 @@
 local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
 # TARGET_*
-TARGET_$(target)  := $(PATH_TARGET)/$(target).ins
+$(target)_1_TARGET:= $(PATH_TARGET)/$(target).ins
+
 # INSTARGET_ later.
 # PATH_*
@@ -1768 +1770 @@
 local archive := $(out)
 TARGET_$(target)_$(srcname) := $(out)
+$(target)_$(srcname)_1_TARGET = $(TARGET_$(target)_$(srcname))
 local dirdep := $(call DIRDEP,$(fetchdir))
 local tool := $(firstword \
@@ -2334 +2337 @@
 local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
 TARGET_$(target)  := $(out)
+$(target)_1_TARGET:= $(out)
 # no local here - must be writable across some foreachs.
 othersrc          :=
@@ -2586 +2590 @@
 local out         := $(outbase)$(suff)
 TARGET_$(target)  := $(out)
+$(target)_1_TARGET:= $(out)
 local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
 # no local here - must be writable across some foreachs.
@@ -3423 +3428 @@
 
 # the collection target
-local clean_files += $(PATH_TARGET)/$(target).ins
-TARGET_$(target)  := $(PATH_TARGET)/$(target).ins
-$(TARGET_$(target)): $$(INSTARGET_$(target)) | $$(INSTARGET_DIRS_$(target)) $(call DIRDEP,$(PATH_TARGET))
+local clean_files  += $(PATH_TARGET)/$(target).ins
+$(target)_1_TARGET := $(PATH_TARGET)/$(target).ins
+$($(target)_1_TARGET): $$(INSTARGET_$(target)) | $$(INSTARGET_DIRS_$(target)) $(call DIRDEP,$(PATH_TARGET))
         @$(QUIET2)$(APPEND) $@
 
-$(target): $$(TARGET_$(target))
-
-_INSTALLS += $(TARGET_$(target))
+$(target): $$($(target)_1_TARGET)
+
+_INSTALLS += $($(target)_1_TARGET)
 _INSTALLS_FILES += $(INSTARGET_$(target))
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
@@ -3770 +3775 @@
         @$(ECHO) "target: $(target)" $(NLTAB)\
         @$(ECHO) "  PATH_$(target)=$(PATH_$(target))" $(NLTAB)\
-        @$(ECHO) "  TARGET_$(target)=$(TARGET_$(target))" $(NLTAB)\
+        @$(ECHO) "  $(target)_1_TARGET=$($(target)_1_TARGET)" $(NLTAB)\
         @$(ECHO) "  INSTARGET_$(target)=$(INSTARGET_$(target))" $(NLTAB)\
 $(foreach prop,$(PROPS_SINGLE) $(PROPS_ACCUMULATE_L) $(PROPS_ACCUMULATE_R) 2_OBJS CLEAN, \