Changeset 111

Timestamp:

Jun 25, 2004, 12:28:10 AM (21 years ago)

Author:

bird

Message:

PATH_ feature fix.

File:

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

trunk/kBuild/footer.kmk

@@ -323 +323 @@
 
 $(eval tool:=$(call _SOURCE_TOOL,$(source),$(target),$(type)))
+$(eval outbase     := $(call _OBJECT_BASE,$(source),$(target)))
+$(eval PATH_$(target)_$(source) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval dirdep      := $(dir $(outbase)).dir_created)
 $(eval defs        :=\
         $(TOOL_$(tool)_DEFS)\
@@ -545 +548 @@
         $($(target)_$(source)_$(type)FLAGS.$(BUILD_TARGET_CPU))\
         )
-$(eval outbase     := $(call _OBJECT_BASE,$(source),$(target)))
-$(eval PATH_$(target)_$(source) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval dirdep      := $(dir $(outbase)).dir_created)
 $(eval objsuff     := $(firstword \
         $($(target)_$(source)_OBJSUFF.$(BUILD_TARGET))\
@@ -623 +623 @@
 $$(error kBuild: Library target $(target) doesn't have a tool defined!)
 endif
+## @todo prefix
+$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
+$(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval lib         := $(outbase)$(libsuff))
 $(eval flags       :=\
         $(TOOL_$(tool)_ARFLAGS)\
@@ -638 +642 @@
         $(SUFF_LIB)\
 ))
-## @todo prefix
-$(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
-$(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval lib         := $(outbase)$(libsuff))
 $(eval objs         = $(_OBJS_$(target)))
 $(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
@@ -672 +672 @@
 # library
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
+$(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 exe         := $(outbase)$(exesuff))
+$(eval objs         = $(_OBJS_$(target)))
 $(eval flags       :=\
         $(TOOL_$(tool)_LDFLAGS)\
@@ -689 +694 @@
         $($(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 exe         := $(outbase)$(exesuff))
-$(eval objs         = $(_OBJS_$(target)))
 $(eval libs        :=\
         $($(target)_LIBS.$(BUILD_TARGET_CPU))\
@@ -791 +791 @@
 # sysmod
 $(eval tool        := $(call _TARGET_TOOL,$(target),LD))
+$(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 sys         := $(outbase)$(syssuff))
+$(eval objs         = $(_OBJS_$(target)))
 $(eval flags       :=\
         $(TOOL_$(tool)_LDFLAGS)\
@@ -808 +813 @@
         $($(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 sys         := $(outbase)$(syssuff))
-$(eval objs         = $(_OBJS_$(target)))
 $(eval libs        :=\
         $($(target)_LIBS.$(BUILD_TARGET_CPU))\