Changeset 889 in kBuild

Timestamp:

May 2, 2007 10:37:57 PM (18 years ago)

Author:

bird

Message:

Implemented the NAME property.

Location:

trunk/kBuild

Files:

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

trunk/kBuild/footer.kmk

@@ -581 +581 @@
 bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_$(bld_trg_base_var)_CPU))
 
-tool := $(call _TARGET_TOOL,$(target),$(tool_prefix))
-outbase := $(call TARGET_BASE,$(target),$(target))
+tool        := $(call _TARGET_TOOL,$(target),$(tool_prefix))
+name        := $(firstword\
+        $($(target)_NAME.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg))\
+        $($(target)_NAME.$(bld_type))\
+        $($(target)_NAME)\
+        $(target))
+outbase     := $(call TARGET_BASE,$(name),$(target))
 ifndef PATH_$(target)
  PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
@@ -1340 +1347 @@
 $(error kBuild: Library target $(target) does not have a tool defined!)
 endif
-outbase     := $(call TARGET_BASE,$(target),$(target))
+name        := $(firstword\
+        $($(target)_NAME.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg))\
+        $($(target)_NAME.$(bld_type))\
+        $($(target)_NAME)\
+        $(target))
+outbase     := $(call TARGET_BASE,$(name),$(target))
 ifndef PATH_$(target)
  PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
@@ -1366 +1380 @@
 # library linking
 tool        := $(call _TARGET_TOOL,$(target),AR)
-outbase     := $(call TARGET_BASE,$(target),$(target))
+name        := $(firstword\
+        $($(target)_NAME.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg))\
+        $($(target)_NAME.$(bld_type))\
+        $($(target)_NAME)\
+        $(target))
+outbase     := $(call TARGET_BASE,$(name),$(target))
 flags       :=\
         $(TOOL_$(tool)_ARFLAGS)\
@@ -1539 +1560 @@
 
 tool        := $(call _TARGET_TOOL,$(target),LD)
-outbase     := $(call TARGET_BASE,$(target),$(target))
+name        := $(firstword\
+        $($(target)_NAME.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg))\
+        $($(target)_NAME.$(bld_type))\
+        $($(target)_NAME)\
+        $(target))
+outbase     := $(call TARGET_BASE,$(name),$(target))
 ifndef PATH_$(target)
  PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
@@ -1562 +1590 @@
 # more link stuff.
 tool        := $(call _TARGET_TOOL,$(target),LD)
-outbase     := $(call TARGET_BASE,$(target),$(target))
+name        := $(firstword\
+        $($(target)_NAME.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg_arch))\
+        $($(target)_NAME.$(bld_trg))\
+        $($(target)_NAME.$(bld_type))\
+        $($(target)_NAME)\
+        $(target))
+outbase     := $(call TARGET_BASE,$(name),$(target))
 flags       :=\
         $(TOOL_$(tool)_LDFLAGS)\

trunk/kBuild/header.kmk

@@ -547 +547 @@
 
 ## PROPS_DEFERRED
-# This list of non-accumulative target properties which are functions,
-# and thus should not be expanded until the very last moment.
-PROPS_DEFERRED := INSTFUN INSTALLER PRE_CMDS POST_CMDS
+# This list of non-accumulative target properties which are or may be
+# functions, and thus should not be expanded until the very last moment.
+PROPS_DEFERRED := INSTFUN INSTALLER PRE_CMDS POST_CMDS NAME
 
 ## PROPS_ACCUMULATE_R