Changeset 2239 in kBuild
- Timestamp:
- Jan 9, 2009 3:36:01 AM (16 years ago)
- Location:
- trunk/kBuild
- Files:
-
- 5 edited
-
footer.kmk (modified) (7 diffs)
-
subfooter.kmk (modified) (1 diff)
-
subheader.kmk (modified) (1 diff)
-
units/qt3.kmk (modified) (3 diffs)
-
units/qt4.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/footer.kmk
r2238 r2239 1401 1401 $(target)) 1402 1402 local outbase := $(call TARGET_BASE,$(name),$(target)) 1403 ifndef PATH_$(target) 1404 PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))) 1405 else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase)))) 1406 $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase)))) 1407 endif 1403 $(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase))) 1404 PATH_$(target) := $($(target)_0_OUTDIR) 1408 1405 ## @todo fix the fun at the last line (AR != LIB => mess). 1409 1406 local suff := $(firstword \ … … 1570 1567 # PATH_* 1571 1568 local outbase := $(call TARGET_BASE,$(target),$(target)) 1572 PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))) 1569 $(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase))) 1570 PATH_$(target) := $($(target)_0_OUTDIR) 1573 1571 endef # def_pass1_install 1574 1572 $(eval-opt-var def_pass1_install) … … 2321 2319 $(target)) 2322 2320 local outbase := $(call TARGET_BASE,$(name),$(target)) 2323 ifndef PATH_$(target) 2324 PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))) 2325 else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase)))) 2326 $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase)))) 2327 endif 2321 $(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase))) 2322 PATH_$(target) := $($(target)_0_OUTDIR) 2328 2323 local suff := $(firstword\ 2329 2324 $($(target)_LIBSUFF.$(bld_trg).$(bld_trg_arch))\ … … 2575 2570 $(target)) 2576 2571 local outbase := $(call TARGET_BASE,$(name),$(target)) 2577 ifndef PATH_$(target) 2578 PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))) 2579 else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase)))) 2580 $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase)))) 2581 endif 2572 $(target)_0_OUTDIR:= $(patsubst %/,%,$(dir $(outbase))) 2573 PATH_$(target) := $($(target)_0_OUTDIR) 2582 2574 local suff := $(firstword \ 2583 2575 $($(target)_$(EXT)SUFF.$(bld_trg).$(bld_trg_arch))\ … … 3410 3402 INSTARGET_DIRS_$(target) := 3411 3403 local outbase := $(call TARGET_BASE,$(target),$(target)) 3412 ifndef PATH_$(target) 3413 PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))) 3414 else ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase)))) 3415 $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase)))) 3416 endif 3404 $(target)_0_OUTDIR := $(patsubst %/,%,$(dir $(outbase))) 3405 PATH_$(target) := $($(target)_0_OUTDIR) 3417 3406 3418 3407 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)) 3440 3429 _CLEAN_FILES += $(clean_files) 3441 _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))3430 _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)) 3442 3431 endef # def_install 3443 3432 $(eval-opt-var def_install) … … 3774 3763 @$(foreach target, $(_ALL_TARGETS),\ 3775 3764 @$(ECHO) "target: $(target)" $(NLTAB)\ 3776 @$(ECHO) " PATH_$(target)=$(PATH_$(target))" $(NLTAB)\3765 @$(ECHO) " $(target)_0_OUTDIR=$($(target)_0_OUTDIR)" $(NLTAB)\ 3777 3766 @$(ECHO) " $(target)_1_TARGET=$($(target)_1_TARGET)" $(NLTAB)\ 3778 3767 @$(ECHO) " INSTARGET_$(target)=$(INSTARGET_$(target))" $(NLTAB)\ -
trunk/kBuild/subfooter.kmk
r2084 r2239 56 56 $(target)_MAKEFILE := $(MAKEFILE_CURRENT) 57 57 endif 58 ifndef PATH_$(target) 59 PATH_$(target) := $(call TARGET_PATH,$(target)) 58 ifndef $(target)_0_OUTDIR 59 $(target)_0_OUTDIR := $(call TARGET_PATH,$(target)) 60 PATH_$(target) := $($(target)_0_OUTDIR) 60 61 endif 61 62 endef -
trunk/kBuild/subheader.kmk
r2084 r2239 67 67 $(target)_MAKEFILE := $(MAKEFILE_CURRENT) 68 68 endif 69 ifndef PATH_$(target) 70 PATH_$(target) := $(call TARGET_PATH,$(target)) 69 ifndef $(target)_0_OUTDIR 70 $(target)_0_OUTDIR := $(call TARGET_PATH,$(target)) 71 PATH_$(target) := $($(target)_0_OUTDIR) 71 72 endif 72 73 endef -
trunk/kBuild/units/qt3.kmk
r2221 r2239 436 436 # fetch the properties. 437 437 local tool := $(kb-src-tool dummy_var) 438 local qtnlsdir := $( PATH_$(target))/qtnls438 local qtnlsdir := $($(target)_0_OUTDIR)/qtnls 439 439 local outbase := $(qtnlsdir)/$(notdir $(basename $(source))) 440 440 local out := $(outbase).qm … … 523 523 # fetch the properties. 524 524 local tool := $(kb-src-tool dummy_var) 525 local qtuicdir := $( PATH_$(target))/qtuic525 local qtuicdir := $($(target)_0_OUTDIR)/qtuic 526 526 local outbase := $(qtuicdir)/$(notdir $(basename $(source))) 527 527 local out.h := $(outbase).tmp.h … … 856 856 857 857 # Calc the MOC and UI output directories and add them to BLDDIRS and INCS. 858 local qtmocdir := $( PATH_$(target))/qtmoc859 local qtuicdir := $( PATH_$(target))/qtuic860 local qtnlsdir := $( PATH_$(target))/qtnls858 local qtmocdir := $($(target)_0_OUTDIR)/qtmoc 859 local qtuicdir := $($(target)_0_OUTDIR)/qtuic 860 local qtnlsdir := $($(target)_0_OUTDIR)/qtnls 861 861 $(eval $(target)_BLDDIRS += $(qtmocdir) $(qtuicdir) $(qtnlsdir) ) 862 862 $(eval $(target)_INCS += $(qtmocdir) $(qtuicdir) ) -
trunk/kBuild/units/qt4.kmk
r2197 r2239 500 500 # fetch the properties. 501 501 local tool := $(kb-src-tool dummy_var) 502 local qtnlsdir := $( PATH_$(target))/qtnls502 local qtnlsdir := $($(target)_0_OUTDIR)/qtnls 503 503 local outbase := $(qtnlsdir)/$(notdir $(basename $(source))) 504 504 local out := $(outbase).qm … … 586 586 # fetch the properties. 587 587 local tool := $(kb-src-tool dummy_var) 588 local qtrccdir := $( PATH_$(target))/qtrcc588 local qtrccdir := $($(target)_0_OUTDIR)/qtrcc 589 589 local outbase := $(qtrccdir)/$(notdir $(basename $(source))) 590 590 local out := $(outbase).tmp.gen.cpp … … 672 672 # fetch the properties. 673 673 local tool := $(kb-src-tool dummy_var) 674 local qtuicdir := $( PATH_$(target))/qtuic674 local qtuicdir := $($(target)_0_OUTDIR)/qtuic 675 675 local outbase := $(qtuicdir)/$(notdir $(basename $(source))) 676 676 local out := $(outbase).tmp.gen.h … … 994 994 995 995 # Calc the MOC and UI output directories and add them to BLDDIRS and INCS. 996 local qtmocdir := $( PATH_$(target))/qtmoc997 local qtuicdir := $( PATH_$(target))/qtuic998 local qtrccdir := $( PATH_$(target))/qtrcc999 local qtnlsdir := $( PATH_$(target))/qtnls996 local qtmocdir := $($(target)_0_OUTDIR)/qtmoc 997 local qtuicdir := $($(target)_0_OUTDIR)/qtuic 998 local qtrccdir := $($(target)_0_OUTDIR)/qtrcc 999 local qtnlsdir := $($(target)_0_OUTDIR)/qtnls 1000 1000 $(eval $(target)_BLDDIRS += $(qtmocdir) $(qtuicdir) $(qtrccdir) $(qtnlsdir)) 1001 1001 $(eval $(target)_INCS += $(qtmocdir) $(qtuicdir))
Note:
See TracChangeset
for help on using the changeset viewer.
