Changeset 979

Timestamp:

May 27, 2007, 9:05:11 PM (18 years ago)

Author:

bird

Message:

We're no longer required to use the slow $(call ) sequence to invoke kmk-only functions.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (3 diffs)
• subfooter.kmk (modified) (1 diff)
• subheader.kmk (modified) (1 diff)

trunk/kBuild/footer.kmk

@@ -1427 +1427 @@
 # Adjust paths if we got a default path.
 ifneq ($(defpath),)
- objs := $(call abspathex,$(objs),$(defpath))
- deps := $(call abspathex,$(deps),$(defpath))
- orderdeps := $(call abspathex,$(orderdeps),$(defpath))
- othersrc := $(call abspathex,$(othersrc),$(defpath))
+ objs := $(abspathex $(objs),$(defpath))
+ deps := $(abspathex $(deps),$(defpath))
+ orderdeps := $(abspathex $(orderdeps),$(defpath))
+ othersrc := $(abspathex $(othersrc),$(defpath))
 endif
 
@@ -1727 +1727 @@
 # Adjust paths if we got a default path.
 ifneq ($(defpath),)
- libpath := $(call abspathex,$(libpath),$(defpath))
- objs := $(call abspathex,$(objs),$(defpath))
- deps := $(call abspathex,$(deps),$(defpath))
- orderdeps := $(call abspathex,$(orderdeps),$(defpath))
- othersrc := $(call abspathex,$(othersrc),$(defpath))
+ libpath := $(abspathex $(libpath),$(defpath))
+ objs := $(abspathex $(objs),$(defpath))
+ deps := $(abspathex $(deps),$(defpath))
+ orderdeps := $(abspathex $(orderdeps),$(defpath))
+ othersrc := $(abspathex $(othersrc),$(defpath))
  # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_PATH)/lib if relative to current dir!
 endif
@@ -2087 +2087 @@
 # Adjust the source if we got a default PATH. (This must be done this late!)
 ifdef $(target)_PATH
- srcsrc := $(call abspathex,$(srcsrc),$($(target)_PATH))
+ srcsrc := $(abspathex $(srcsrc),$($(target)_PATH))
 endif
 

trunk/kBuild/subfooter.kmk

@@ -67 +67 @@
  # Switch back to the context of previous makefile on the stack.
  #
- MAKEFILE_CURRENT := $(call stack-pop,_SUB_MAKEFILE_STACK)
+ MAKEFILE_CURRENT := $(stack-pop _SUB_MAKEFILE_STACK)
  PATH_SUB_CURRENT := $(abspath $(dir $(MAKEFILE_CURRENT)))
 

trunk/kBuild/subheader.kmk

@@ -77 +77 @@
 
  # push the current old makefile onto the stack.
- $(call stack-push,_SUB_MAKEFILE_STACK,$(MAKEFILE_CURRENT))
+ $(stack-push _SUB_MAKEFILE_STACK,$(MAKEFILE_CURRENT))
 
  # the current makefile is the 2nd from the end of the MAKEFILE_LIST (we're the last one).
  __tmp := $(MAKEFILE_LIST)
- $(call stack-popv,__tmp)
- MAKEFILE_CURRENT := $(call stack-top,__tmp)
+ $(stack-popv __tmp)
+ MAKEFILE_CURRENT := $(stack-top __tmp)
  PATH_SUB_CURRENT := $(abspath $(dir $(MAKEFILE_CURRENT)))
 endif