Changeset 2239 for trunk/kBuild/units

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.

Location:

trunk/kBuild/units

Files:

• qt3.kmk (modified) (3 diffs)
• qt4.kmk (modified) (4 diffs)

trunk/kBuild/units/qt3.kmk

@@ -436 +436 @@
 # fetch the properties.
 local tool      := $(kb-src-tool dummy_var)
-local qtnlsdir  := $(PATH_$(target))/qtnls
+local qtnlsdir  := $($(target)_0_OUTDIR)/qtnls
 local outbase   := $(qtnlsdir)/$(notdir $(basename $(source)))
 local out       := $(outbase).qm
@@ -523 +523 @@
 # fetch the properties.
 local tool      := $(kb-src-tool dummy_var)
-local qtuicdir  := $(PATH_$(target))/qtuic
+local qtuicdir  := $($(target)_0_OUTDIR)/qtuic
 local outbase   := $(qtuicdir)/$(notdir $(basename $(source)))
 local out.h     := $(outbase).tmp.h
@@ -856 +856 @@
 
 # Calc the MOC and UI output directories and add them to BLDDIRS and INCS.
-local qtmocdir := $(PATH_$(target))/qtmoc
-local qtuicdir := $(PATH_$(target))/qtuic
-local qtnlsdir := $(PATH_$(target))/qtnls
+local qtmocdir := $($(target)_0_OUTDIR)/qtmoc
+local qtuicdir := $($(target)_0_OUTDIR)/qtuic
+local qtnlsdir := $($(target)_0_OUTDIR)/qtnls
 $(eval $(target)_BLDDIRS += $(qtmocdir) $(qtuicdir) $(qtnlsdir) )
 $(eval $(target)_INCS    += $(qtmocdir) $(qtuicdir) )

trunk/kBuild/units/qt4.kmk

@@ -500 +500 @@
 # fetch the properties.
 local tool      := $(kb-src-tool dummy_var)
-local qtnlsdir  := $(PATH_$(target))/qtnls
+local qtnlsdir  := $($(target)_0_OUTDIR)/qtnls
 local outbase   := $(qtnlsdir)/$(notdir $(basename $(source)))
 local out       := $(outbase).qm
@@ -586 +586 @@
 # fetch the properties.
 local tool      := $(kb-src-tool dummy_var)
-local qtrccdir  := $(PATH_$(target))/qtrcc
+local qtrccdir  := $($(target)_0_OUTDIR)/qtrcc
 local outbase   := $(qtrccdir)/$(notdir $(basename $(source)))
 local out       := $(outbase).tmp.gen.cpp
@@ -672 +672 @@
 # fetch the properties.
 local tool      := $(kb-src-tool dummy_var)
-local qtuicdir  := $(PATH_$(target))/qtuic
+local qtuicdir  := $($(target)_0_OUTDIR)/qtuic
 local outbase   := $(qtuicdir)/$(notdir $(basename $(source)))
 local out       := $(outbase).tmp.gen.h
@@ -994 +994 @@
 
 # Calc the MOC and UI output directories and add them to BLDDIRS and INCS.
-local qtmocdir := $(PATH_$(target))/qtmoc
-local qtuicdir := $(PATH_$(target))/qtuic
-local qtrccdir := $(PATH_$(target))/qtrcc
-local qtnlsdir := $(PATH_$(target))/qtnls
+local qtmocdir := $($(target)_0_OUTDIR)/qtmoc
+local qtuicdir := $($(target)_0_OUTDIR)/qtuic
+local qtrccdir := $($(target)_0_OUTDIR)/qtrcc
+local qtnlsdir := $($(target)_0_OUTDIR)/qtnls
 $(eval $(target)_BLDDIRS += $(qtmocdir) $(qtuicdir) $(qtrccdir) $(qtnlsdir))
 $(eval $(target)_INCS    += $(qtmocdir) $(qtuicdir))