Changeset 2763 for trunk/kBuild/subheader.kmk

Timestamp:

Jan 28, 2015, 7:25:31 PM (10 years ago)

Author:

bird

Message:

subheader/footer.kmk: No need to redefine def_subfooter/def_subheader all the time; moved them to header.kmk and merged them (identical) into a single define.

File:

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

trunk/kBuild/subheader.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2006-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
+# Copyright (c) 2006-2015 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
 #
 # This file is part of kBuild.
@@ -53 +53 @@
  # Set the default path and makefile for all new targets.
  #
- define def_subfooter
-  ifndef $(target)_PATH
-   ifndef $(target)_DEFPATH
-    $(target)_DEFPATH := $(PATH_SUB_CURRENT)
-   endif
-   $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
-  else ifndef $(target)_DEFPATH
-   $(target)_DEFPATH := $($(target)_PATH)
-  endif
-  ifndef $(target)_MAKEFILE
-   $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
-  endif
-  ifndef $(target)_0_OUTDIR
-   $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
-   $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
-  endif
- endef
-
- # TODO: Wish there was an easy way of only enumerating only new targets...
+ ## @todo Wish there was an easy way of only enumerating only new targets...
  $(foreach target,\
         $(ALL_TARGETS) \
@@ -85 +67 @@
         $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
         $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
- ,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter)))
+ ,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter_header_target_pass)))