Changeset 1755 in kBuild

Timestamp:

Sep 6, 2008 3:34:38 AM (16 years ago)

Author:

bird

Message:

Changing <target>_PATH into <target>_DEFPATH. For the moment both are set and _PATH still take precedence.

Location:

trunk/kBuild

Files:

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

trunk/kBuild/footer.kmk

@@ -2200 +2200 @@
         $(SUFF_LIB))
 local out         := $(outbase)$(suff)
-local defpath     := $($(target)_PATH)
+local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
 TARGET_$(target)  := $(out)
 # no local here - must be writable across some foreachs.
@@ -2449 +2449 @@
 local out         := $(outbase)$(suff)
 TARGET_$(target)  := $(out)
-local defpath     := $($(target)_PATH)
+local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
 # no local here - must be writable across some foreachs.
 othersrc          :=
@@ -2642 +2642 @@
  local 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!
+ # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_DEFPATH)/lib if relative to current dir!
 endif
 
@@ -3057 +3057 @@
 
 # Adjust the source if we got a default PATH. (This must be done this late!)
-ifdef $(target)_PATH
- local srcsrc := $(abspathex $(srcsrc),$($(target)_PATH))
+local defpath := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
+ifneq ($(defpath),)
+ local srcsrc := $(abspathex $(srcsrc),$(defpath))
 endif
 

trunk/kBuild/subfooter.kmk

@@ -46 +46 @@
   $(target)_PATH := $(PATH_SUB_CURRENT)
  endif
+ ifndef $(target)_DEFPATH
+  $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+ endif
  ifndef $(target)_MAKEFILE
   $(target)_MAKEFILE := $(MAKEFILE_CURRENT)

trunk/kBuild/subheader.kmk

@@ -56 +56 @@
    $(target)_PATH := $(PATH_SUB_CURRENT)
   endif
+  ifndef $(target)_DEFPATH
+   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+  endif
   ifndef $(target)_MAKEFILE
    $(target)_MAKEFILE := $(MAKEFILE_CURRENT)