Changeset 110 for trunk/kBuild/footer.kmk

Timestamp:

Jun 25, 2004, 12:04:23 AM (21 years ago)

Author:

bird

Message:

ARG! another regression.

File:

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

trunk/kBuild/footer.kmk

@@ -110 +110 @@
 
 ## Figure out where to put object files.
-# @param    $target      source file
-# @param    $source      normalized main target
-_OBJECT_BASE = $(PATH_TARGET)/$(source)/$(basename $(target))
+# @param    $1      source file
+# @param    $2      normalized main target
+_OBJECT_BASE = $(PATH_TARGET)/$(2)/$(basename $(1))
 
 ## Figure out where to put object files.
-# @param    $target      real target name.
-# @param    $source      normalized main target
-_TARGET_BASE = $(PATH_TARGET)/$(source)/$(basename $(target))
+# @param    $1      real target name.
+# @param    $2      normalized main target
+_TARGET_BASE = $(PATH_TARGET)/$(2)/$(basename $(1))
 
 
@@ -546 +546 @@
         )
 $(eval outbase     := $(call _OBJECT_BASE,$(source),$(target)))
+$(eval PATH_$(target)_$(source) := $(patsubst %/,%,$(dir $(outbase))))
 $(eval dirdep      := $(dir $(outbase)).dir_created)
 $(eval objsuff     := $(firstword \
@@ -639 +640 @@
 ## @todo prefix
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
+$(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
 $(eval lib         := $(outbase)$(libsuff))
 $(eval objs         = $(_OBJS_$(target)))
@@ -687 +689 @@
         $($(target)_LDFLAGS.$(BUILD_TARGET_CPU))\
 )
+$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
+$(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
 $(eval exesuff     := $(firstword $($(target)_EXESUFF) $($(target)_EXESUFF) $(TOOL_$(tool)_LDEXESUFF) $(SUFF_EXE)))
-$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval exe         := $(outbase)$(exesuff))
 $(eval objs         = $(_OBJS_$(target)))
@@ -786 +789 @@
 $(eval $(def_target_sources))
 
-# library
+# sysmod
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
 $(eval flags       :=\
@@ -805 +808 @@
         $($(target)_LDFLAGS.$(BUILD_TARGET_CPU))\
 )
+$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
+$(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
 $(eval syssuff     := $(firstword $($(target)_SYSSUFF) $($(target)_SYSSUFF) $(TOOL_$(tool)_LDSYSSUFF) $(SUFF_SYS)))
-$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval sys         := $(outbase)$(syssuff))
 $(eval objs         = $(_OBJS_$(target)))