Changeset 145 in kBuild

Timestamp:

Sep 7, 2004 3:26:23 PM (21 years ago)

Author:

bird

Message:

PATH2 and define PATH before sources are processed.

File:

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

trunk/kBuild/footer.kmk

@@ -623 +623 @@
 # @param    $(target)   Normalized library (target) name.
 define def_lib
-# source -> object
-$(eval $(def_target_sources))
-
-# library
+# library basics
 $(eval tool        := $(call _TARGET_TOOL,$(target),AR))
 ifeq ($(tool),)
@@ -634 +631 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
+$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval libsuff     := $(firstword\
         $($(target)_LIBSUFF.$(BUILD_TARGET))\
@@ -642 +641 @@
 ))
 $(eval lib         := $(outbase)$(libsuff))
+
+# source -> object
+$(eval $(def_target_sources))
+
+# library linking
+$(eval tool        := $(call _TARGET_TOOL,$(target),AR))
 $(eval flags       :=\
         $(TOOL_$(tool)_ARFLAGS)\
@@ -685 +690 @@
 # @param    $(target)   Normalized target (program) name.
 define def_program
-# source -> object
-$(eval $(def_target_sources))
-
-# library
+# basics
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
+$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval exesuff     := $(firstword $($(target)_EXESUFF) $($(target)_EXESUFF) $(TOOL_$(tool)_LDEXESUFF) $(SUFF_EXE)))
 $(eval exe         := $(outbase)$(exesuff))
+
+# source -> object
+$(eval $(def_target_sources))
+
+# more library stuff.
+$(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval objs         = $(_OBJS_$(target)))
 $(eval flags       :=\
@@ -832 +842 @@
 # @param    $(target)   Normalized target (program) name.
 define def_dll
-# source -> object
-$(eval $(def_target_sources))
-
-# dllmod
+# dllmod basics
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
+$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval dllsuff     := $(firstword $($(target)_DLLSUFF) $($(target)_DLLSUFF) $(TOOL_$(tool)_LDDLLSUFF) $(SUFF_DLL)))
 $(eval dll         := $(outbase)$(dllsuff))
+
+# source -> object
+$(eval $(def_target_sources))
+
+# dllmod linking. 
+$(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval objs         = $(_OBJS_$(target)))
 $(eval flags       :=\
@@ -993 +1008 @@
 # @param    $(target)   Normalized target (program) name.
 define def_sysmod
-# source -> object
-$(eval $(def_target_sources))
-
-# sysmod
+# sysmod basics
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
+$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval syssuff     := $(firstword $($(target)_SYSSUFF) $($(target)_SYSSUFF) $(TOOL_$(tool)_LDSYSSUFF) $(SUFF_SYS)))
 $(eval sys         := $(outbase)$(syssuff))
+
+# source -> object
+$(eval $(def_target_sources))
+
+# sysmod linking
+$(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval objs         = $(_OBJS_$(target)))
 $(eval flags       :=\