Changeset 1795 for trunk/kBuild/footer.kmk

Timestamp:

Sep 20, 2008, 1:50:32 AM (17 years ago)

Author:

bird

Message:

footer.kmk: use the new kb-src-one when available.

File:

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

trunk/kBuild/footer.kmk

@@ -2037 +2037 @@
 define def_src_handler_c
 local type := C
- $(kb-src-one )
+ $(kb-src-one 2)
 endef
 
 define def_src_handler_cxx
 local type := CXX
- $(kb-src-one )
+ $(kb-src-one 2)
 endef
 
 define def_src_handler_objc
 local type := OBJC
- $(kb-src-one )
+ $(kb-src-one 2)
 endef
 
 define def_src_handler_asm
 local type := AS
- $(kb-src-one )
+ $(kb-src-one 2)
 endef
 
 define def_src_handler_rc
 local type := RC
- $(kb-src-one )
+ $(kb-src-one 2)
 endef
 
@@ -2353 +2353 @@
 local dep := $(out)$(SUFF_DEP)
 ifndef NO_LINK_CMDS_DEPS
- _DEPFILES_INCLUDED += $(dep)
- $(eval includedep $(dep))
+ ifndef ($(_KB_TEST),)
+  _DEPFILES += $(dep)
+ else
+  _DEPFILES_INCLUDED += $(dep)
+  $(eval includedep $(dep))
+ endif
 endif
 
@@ -2746 +2750 @@
 local dep := $(outbase)$(SUFF_DEP)
 ifndef NO_LINK_CMDS_DEPS
- _DEPFILES_INCLUDED += $(dep)
- $(eval includedep $(dep))
+ ifndef ($(_KB_TEST),)
+  _DEPFILES += $(dep)
+ else
+  _DEPFILES_INCLUDED += $(dep)
+  $(eval includedep $(dep))
+ endif
 endif
 
@@ -3560 +3568 @@
  $(info prof: $(int-sub $(_KBUILD_TS_FOOTER_END), $(_KBUILD_TS_HEADER_START)) - $(int-sub $(_KBUILD_TS_FOOTER_END), $(_KBUILD_TS_PREV)) - end of footer.kmk)
  $(info prof: footer.kmk: $(int-sub $(_KBUILD_TS_FOOTER_END), $(_KBUILD_TS_FOOTER_START)))
+ $(info stat: $(make-stats ))
  $(info prof: ALL=$(words $(_ALL_TARGETS)) BLDPROGS=$(words $(_ALL_BLDPROGS)) LIBRARIES=$(words $(_ALL_LIBRARIES)) IMPORT_LIBS=$(words $(IMPORT_LIBS)) DLLS=$(words $(DLLS)) PROGRAMS=$(words $(_ALL_PROGRAMS)) )
  $(info prof: SYSMODS=$(words $(_ALL_SYSMODS)) OTHERS=$(words $(_ALL_OTHERS)) INSTALLS=$(words $(_ALL_INSTALLS)) FETCHES=$(words $(_ALL_FETCHES)) PACKING=$(words $(_PACKING)) TESTING=$(words $(TESTING)) )
  $(info prof: DIRS=$(words $(_DIR_ALL)) TOOLS=$(words $(_TOOLS)) SDKS=$(words $(_SDKS)) USES=$(words $(_USES)) OUT_FILES=$(words $(_OUT_FILES)) OBJS=$(words $(_OBJS)) CLEAN_FILES=$(words $(CLEAN_FILES) $(OTHER_CLEAN)) )
- $(info prof: DEPFILES_INCLUDED=$(words $(_DEPFILES_INCLUDED)) DEPFILES=$(words $(DEPFILES)) MAKEFILES=$(words $(MAKEFILE_LIST)) )
- $(info stat: $(make-stats ))
+ $(info prof: DEPFILES_INCLUDED=$(words $(_DEPFILES_INCLUDED)) DEPFILES=$(words $(_DEPFILES)) MAKEFILES=$(words $(MAKEFILE_LIST)) )
  _KBUILD_TS_PREV := $(_KBUILD_TS_FOOTER_END)
 endif