Ignore:
Timestamp:
Sep 8, 2008, 4:07:02 AM (17 years ago)
Author:
bird
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/units/qt4.kmk

    r1769 r1771  
    465465# default path + source dep.
    466466ifneq ($(defpath),)
    467 local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
    468 local incs      := $(abspathex $(incs),$($(target)_PATH))
     467local source    := $(abspathex $(source),$(defpath))
     468local deps      := $(abspathex $(deps),$(defpath)) $(source)
     469local incs      := $(abspathex $(incs),$(defpath))
    469470else
    470471local deps      += $(source)
    … …  
    551552# default path + source dep.
    552553ifneq ($(defpath),)
    553 local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
    554 local incs      := $(abspathex $(incs),$($(target)_PATH))
     554local source    := $(abspathex $(source),$(defpath))
     555local deps      := $(abspathex $(deps),$(defpath)) $(source)
     556local incs      := $(abspathex $(incs),$(defpath))
    555557else
    556558local deps      += $(source)
    … …  
    636638# default path + source dep.
    637639ifneq ($(defpath),)
    638 local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
    639 local incs      := $(abspathex $(incs),$($(target)_PATH))
     640local source    := $(abspathex $(source),$(defpath))
     641local deps      := $(abspathex $(deps),$(defpath)) $(source)
     642local incs      := $(abspathex $(incs),$(defpath))
    640643else
    641644local deps      += $(source)
    … …  
    729732# default path + source dep.
    730733ifneq ($(defpath),)
    731 local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
    732 local incs      := $(abspathex $(incs),$($(target)_PATH))
     734local source    := $(abspathex $(source),$(defpath))
     735local deps      := $(abspathex $(deps),$(defpath)) $(source)
     736local incs      := $(abspathex $(incs),$(defpath))
    733737else
    734738local deps      += $(source)
    … …  
    817821# default path + source dep.
    818822ifneq ($(defpath),)
    819 local deps      := $(abspathex $(deps) $(source),$($(target)_PATH))
    820 local incs      := $(abspathex $(incs),$($(target)_PATH))
     823local source    := $(abspathex $(source),$(defpath))
     824local deps      := $(abspathex $(deps),$(defpath)) $(source)
     825local incs      := $(abspathex $(incs),$(defpath))
    821826else
    822827local deps      += $(source)
Note: See TracChangeset for help on using the changeset viewer.