Changeset 1798 for trunk/kBuild

Timestamp:

Sep 21, 2008, 3:06:36 AM (17 years ago)

Author:

bird

Message:

footer.kmk: experimental includedep-queue feature behind KB_HAVE_INCLUDEDEP_QUEUE tests.

File:

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

trunk/kBuild/footer.kmk

@@ -2353 +2353 @@
 local dep := $(out)$(SUFF_DEP)
 ifndef NO_LINK_CMDS_DEPS
- ifndef ($(_KB_TEST),)
-  _DEPFILES += $(dep)
+ _DEPFILES_INCLUDED += $(dep)
+ ifdef KB_HAVE_INCLUDEDEP_QUEUE
+  includedep-queue $(dep)
  else
-  _DEPFILES_INCLUDED += $(dep)
-  $(eval includedep $(dep))
+  includedep $(dep)
  endif
 endif
@@ -2750 +2750 @@
 local dep := $(outbase)$(SUFF_DEP)
 ifndef NO_LINK_CMDS_DEPS
- ifndef ($(_KB_TEST),)
-  _DEPFILES += $(dep)
+ ifdef KB_HAVE_INCLUDEDEP_QUEUE
+  includedep-queue $(dep)
  else
-  _DEPFILES_INCLUDED += $(dep)
-  $(eval includedep $(dep))
+  includedep $(dep)
  endif
 endif
@@ -3559 +3558 @@
 # Include dependency files.
 #
-ifneq ($(_DEPFILES),)
- $(foreach dep, $(_DEPFILES), $(eval includedep $(dep)))
+ifdef _DEPFILES
+ # TODO: first works the second doesn't, provided _KB_INCLUDE_DEPS is undefined:
+ #   if "$(_KB_INCLUDE_DEPS)" == "1"
+ #   if $(_KB_INCLUDE_DEPS) == "1"
+
+ ifdef KB_HAVE_INCLUDEDEP_QUEUE
+  includedep-queue $(_DEPFILES)
+ else
+  $(foreach dep, $(_DEPFILES), $(eval includedep $(dep)))
+ endif
 endif