Changeset 3284 for trunk/kBuild/units


Ignore:
Timestamp:
Jan 5, 2019, 2:40:31 AM (7 years ago)
Author:
bird
Message:

footer-pass2-compiling-targets.kmk,units: Added a dedicated pass 2 variable for units to put their intermediates in so as to not mess with inheritance or for us to do silly things wrt expansion for every property variant. Only the new variable is now always listed as an order-only dependency for each source compilation rule.

Location:
trunk/kBuild/units
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/units/dtrace.kmk

    r3160 r3284  
    3333
    3434ifdef UNIT_dtrace
    35  $(error kBuild: The lex unit was included twice!)
     35 $(error kBuild: The dtrace unit was included twice!)
    3636endif
    3737UNIT_dtrace = dtrace
    … …  
    9191# update globals
    9292_OUT_FILES += $(out)
    93 $(target)_INTERMEDIATES += $(out)
     93$(target)_2_INTERMEDIATES += $(out)
    9494
    9595endef # def_dtrace_hdr_rule
    … …  
    134134$(target)_2_OBJS <= $(out)
    135135
    136 endef # def_dtrace_hdr_rule
     136endef # def_dtrace_obj_rule
    137137
    138138

  • trunk/kBuild/units/lex.kmk

    r3160 r3284  
    8888_OUT_FILES += $(out) $(output_extra) $(output_maybe)
    8989$(target)_GEN_SOURCES_ += $(out)
    90 $(target)_INTERMEDIATES += $(intermediates)
     90$(target)_2_INTERMEDIATES += $(intermediates)
    9191
    9292endef # def_lex_rule

  • trunk/kBuild/units/qt3.kmk

    r3121 r3284  
    513513endif
    514514
    515 $(target)_INTERMEDIATES += $(realout.h)
     515$(target)_2_INTERMEDIATES += $(realout.h)
    516516$(target)_GEN_SOURCES_ += $(realout.cpp)
    517517$(target)_CLEAN += $(out.h) $(out.cpp) $(realout.h) $(realout.cpp) $(more_output) $(maybe_output) $(dep)
    … …  
    602602endif
    603603
    604 $(target)_INTERMEDIATES += $(realout)
     604$(target)_2_INTERMEDIATES += $(realout)
    605605$(target)_GEN_SOURCES_ += $(realout)
    606606$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    … …  
    693693endif
    694694
    695 $(target)_INTERMEDIATES += $(realout)
     695$(target)_2_INTERMEDIATES += $(realout)
    696696$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    697697

  • trunk/kBuild/units/qt4.kmk

    r3121 r3284  
    611611endif
    612612
    613 $(target)_INTERMEDIATES += $(realout)
     613$(target)_2_INTERMEDIATES += $(realout)
    614614$(target)_GEN_SOURCES_ += $(realout)
    615615$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    … …  
    698698endif
    699699
    700 $(target)_INTERMEDIATES += $(realout)
     700$(target)_2_INTERMEDIATES += $(realout)
    701701$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    702702
    … …  
    784784endif
    785785
    786 $(target)_INTERMEDIATES += $(realout)
     786$(target)_2_INTERMEDIATES += $(realout)
    787787$(target)_GEN_SOURCES_ += $(realout)
    788788$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    … …  
    877877endif
    878878
    879 $(target)_INTERMEDIATES += $(realout)
     879$(target)_2_INTERMEDIATES += $(realout)
    880880$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    881881

  • trunk/kBuild/units/qt5.kmk

    r3160 r3284  
    641641endif
    642642
    643 $(target)_INTERMEDIATES += $(realout)
     643$(target)_2_INTERMEDIATES += $(realout)
    644644$(target)_GEN_SOURCES_ += $(realout)
    645645$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    … …  
    735735endif
    736736
    737 $(target)_INTERMEDIATES += $(realout)
     737$(target)_2_INTERMEDIATES += $(realout)
    738738$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    739739
    … …  
    828828endif
    829829
    830 $(target)_INTERMEDIATES += $(realout)
     830$(target)_2_INTERMEDIATES += $(realout)
    831831$(target)_GEN_SOURCES_ += $(realout)
    832832$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    … …  
    928928endif
    929929
    930 $(target)_INTERMEDIATES += $(realout)
     930$(target)_2_INTERMEDIATES += $(realout)
    931931$(target)_CLEAN += $(out) $(realout) $(more_output) $(maybe_output) $(dep)
    932932

  • trunk/kBuild/units/yacc.kmk

    r3121 r3284  
    8383_OUT_FILES += $(out) $(output_extra) $(output_maybe)
    8484$(target)_GEN_SOURCES_ += $(out)
    85 $(target)_INTERMEDIATES += $(intermediates)
     85$(target)_2_INTERMEDIATES += $(intermediates)
    8686
    8787endef # def_yacc_rule
Note: See TracChangeset for help on using the changeset viewer.