Changeset 741 for trunk/kBuild

Timestamp:

Dec 17, 2006, 8:41:04 AM (19 years ago)

Author:

bird

Message:

some cleanup.

File:

• trunk/kBuild/footer.kmk (modified) (7 diffs)

trunk/kBuild/footer.kmk

@@ -982 +982 @@
 ## wrapper the compile command dependency check.
 ifndef NO_COMPILE_CMDS_DEPS
- ifeq ($(filter comp-cmds,$(KMK_FEATURES)),comp-cmds)
-  _DEP_COMPILE_CMDS = $(comp-cmds $(target)_$(source)_CMDS_PREV_,$(target)_$(source)_CMDS_,FORCE)
- else
-  _DEP_COMPILE_CMDS = $(comp-vars $(target)_$(source)_CMDS_PREV_,$(target)_$(source)_CMDS_,FORCE)
- endif
+ _DEP_COMPILE_CMDS = $(comp-cmds $(target)_$(source)_CMDS_PREV_,$(target)_$(source)_CMDS_,FORCE)
 else
  _DEP_COMPILE_CMDS =
@@ -1023 +1019 @@
 ## wrapper the link command dependency check.
 ifndef NO_COMPILE_CMDS_DEPS
- ifeq ($(filter comp-cmds,$(KMK_FEATURES)),comp-cmds)
-  _DEP_LINK_CMDS = $(comp-cmds $(target)_CMDS_PREV_,$(target)_CMDS_,FORCE)
- else
-  _DEP_LINK_CMDS = $(comp-vars $(target)_CMDS_PREV_,$(target)_CMDS_,FORCE)
- endif
+ _DEP_LINK_CMDS = $(comp-cmds $(target)_CMDS_PREV_,$(target)_CMDS_,FORCE)
 else
  _DEP_LINK_CMDS =
@@ -1074 +1066 @@
 define def_link_install_rule
 $(INSTARGET_$(target)) : $(out) | $(call DIRDEP,$(dir $(INSTARGET_$(target))))
-        $$(call MSG_L1,Installing $(target),=> $$@)
+        $$(call MSG_L1,Installing $(target) => $$@)
         $$(QUIET)$$(INSTALL) $$(if $(mode),-m $(mode)) $(out) $$@
 
@@ -1093 +1085 @@
 # @param    bld_trg_cpu   Build target cpu.
 def_target_source_c_cpp_asm_rc_new = $(kb-src-one )
-ifneq ($(filter kb-src-one,$(KMK_FEATURES)),)
+ifdef KMK_VERSION
  def_target_source_c_cpp_asm_rc_var = def_target_source_c_cpp_asm_rc_new
 else
@@ -1235 +1227 @@
  objs := $(call abspathex,$(objs),$(defpath))
  deps := $(call abspathex,$(deps),$(defpath))
+ othersrc := $(call abspathex,$(othersrc),$(defpath))
 endif
 
@@ -1444 +1437 @@
  objs := $(call abspathex,$(objs),$(defpath))
  deps := $(call abspathex,$(deps),$(defpath))
+ othersrc := $(call abspathex,$(othersrc),$(defpath))
  # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_PATH)/lib if relative to current dir!
 endif
@@ -1638 +1632 @@
 # the install rule
 $(insdst) : $(srcsrc) | $(call DIRDEP,$(dir $(insdst)))
-        $$(call MSG_L1,Installing $(srcsrc),=> $(insdst))
+        $$(call MSG_L1,Installing $(insdst),(<= $(srcsrc)))
         $$(QUIET)$$(if $$(filter $(INSTALL),$(inscmd)),,$$(RM) -f $$@)
         $$(QUIET)$(inscmd)