Changeset 2239 for trunk/kBuild/footer.kmk

Timestamp:

Jan 9, 2009, 4:36:01 AM (17 years ago)

Author:

bird

Message:

footer.kmk,subheader.kmk,subfooter.kmk,qt3.kmk,qt4.kmk: PATH_$(target) -> $(target)_0_OUTDIR, old variable is still valid for a while. References #57.

File:

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

trunk/kBuild/footer.kmk

@@ -1401 +1401 @@
         $(target))
 local outbase     := $(call TARGET_BASE,$(name),$(target))
-ifndef PATH_$(target)
- PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
-else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
- $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
-endif
+$(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase)))
+PATH_$(target)    := $($(target)_0_OUTDIR)
 ## @todo fix the fun at the last line (AR != LIB => mess).
 local suff := $(firstword \
@@ -1570 +1567 @@
 # PATH_*
 local outbase     := $(call TARGET_BASE,$(target),$(target))
-PATH_$(target)    := $(patsubst %/,%,$(dir $(outbase)))
+$(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase)))
+PATH_$(target)    := $($(target)_0_OUTDIR)
 endef # def_pass1_install
 $(eval-opt-var def_pass1_install)
@@ -2321 +2319 @@
         $(target))
 local outbase     := $(call TARGET_BASE,$(name),$(target))
-ifndef PATH_$(target)
- PATH_$(target)   := $(patsubst %/,%,$(dir $(outbase)))
-else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
- $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
-endif
+$(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase)))
+PATH_$(target)    := $($(target)_0_OUTDIR)
 local suff        := $(firstword\
         $($(target)_LIBSUFF.$(bld_trg).$(bld_trg_arch))\
@@ -2575 +2570 @@
         $(target))
 local outbase     := $(call TARGET_BASE,$(name),$(target))
-ifndef PATH_$(target)
- PATH_$(target)   := $(patsubst %/,%,$(dir $(outbase)))
-else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
- $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
-endif
+$(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase)))
+PATH_$(target)    := $($(target)_0_OUTDIR)
 local suff := $(firstword \
         $($(target)_$(EXT)SUFF.$(bld_trg).$(bld_trg_arch))\
@@ -3410 +3402 @@
 INSTARGET_DIRS_$(target) :=
 local outbase := $(call TARGET_BASE,$(target),$(target))
-ifndef PATH_$(target)
- PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
-else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
- $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
-endif
+$(target)_0_OUTDIR := $(patsubst %/,%,$(dir $(outbase)))
+PATH_$(target) := $($(target)_0_OUTDIR)
 
 local clean_files := $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type))
@@ -3439 +3428 @@
 _INSTALLS_DIRS += $(INSTARGET_DIRS_$(target))
 _CLEAN_FILES += $(clean_files)
-_DIRS += $(PATH_$(target)) $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
+_DIRS += $($(target)_0_OUTDIR) $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
 endef # def_install
 $(eval-opt-var def_install)
@@ -3774 +3763 @@
         @$(foreach target, $(_ALL_TARGETS),\
         @$(ECHO) "target: $(target)" $(NLTAB)\
-        @$(ECHO) "  PATH_$(target)=$(PATH_$(target))" $(NLTAB)\
+        @$(ECHO) "  $(target)_0_OUTDIR=$($(target)_0_OUTDIR)" $(NLTAB)\
         @$(ECHO) "  $(target)_1_TARGET=$($(target)_1_TARGET)" $(NLTAB)\
         @$(ECHO) "  INSTARGET_$(target)=$(INSTARGET_$(target))" $(NLTAB)\