Changeset 1771 in kBuild

Timestamp:

Sep 8, 2008 2:07:02 AM (16 years ago)

Author:

bird

Message:

qt3,qt4: Fixed defpath bug, source was omitted.

Location:

trunk/kBuild/units

Files:

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

trunk/kBuild/units/qt3.kmk

@@ -435 +435 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -524 +525 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -615 +617 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
 else
 local deps      += $(source)
@@ -701 +704 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)

trunk/kBuild/units/qt4.kmk

@@ -465 +465 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -551 +552 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -636 +638 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -729 +732 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)
@@ -817 +821 @@
 # default path + source dep.
 ifneq ($(defpath),)
-local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
-local incs      := $(abspathex $(incs),$($(target)_PATH))
+local source    := $(abspathex $(source),$(defpath))
+local deps      := $(abspathex $(deps),$(defpath)) $(source)
+local incs      := $(abspathex $(incs),$(defpath))
 else
 local deps      += $(source)