Changeset 2763


Ignore:
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.

Location:
trunk/kBuild
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/header.kmk

    r2751 r2763  
    55
    66#
    7 # Copyright (c) 2004-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
     7# Copyright (c) 2004-2015 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    15671567
    15681568#
     1569# An internal define used by subheader.kmk and subfooter.kmk.
     1570# We keep them here to avoid redefining them for each sub-makefile.
     1571#
     1572define def_subfooter_header_target_pass
     1573 ifndef $(target)_PATH
     1574  ifndef $(target)_DEFPATH
     1575   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
     1576  endif
     1577  $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
     1578 else ifndef $(target)_DEFPATH
     1579  $(target)_DEFPATH := $($(target)_PATH)
     1580 endif
     1581 ifndef $(target)_MAKEFILE
     1582  $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
     1583 endif
     1584 ifndef $(target)_0_OUTDIR
     1585  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
     1586  $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
     1587 endif
     1588endef
     1589
     1590
     1591#
    15691592# Validate any KBUILD_BLD_TYPES additions and finally the KBUILD_TYPE.
    15701593#

  • trunk/kBuild/subfooter.kmk

    r2755 r2763  
    55
    66#
    7 # Copyright (c) 2006-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
     7# Copyright (c) 2006-2015 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    4242# Set the default path for all new targets.
    4343#
    44 define def_subheader
    45  ifndef $(target)_PATH
    46   ifndef $(target)_DEFPATH
    47    $(target)_DEFPATH := $(PATH_SUB_CURRENT)
    48   endif
    49   $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH),$(target)_DEFPATH)
    50  else ifndef $(target)_DEFPATH
    51   $(target)_DEFPATH := $($(target)_PATH)
    52  endif
    53  ifndef $(target)_MAKEFILE
    54   $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
    55  endif
    56  ifndef $(target)_0_OUTDIR
    57   $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
    58   $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR),$(target)_0_OUTDIR)
    59  endif
    60 endef
    61 
    62 # TODO: Wish there was an easy way of only enumerating only new targets...
     44## @todo Wish there was an easy way of only enumerating only new targets...
    6345$(foreach target,\
    6446        $(ALL_TARGETS) \
    … …  
    7456        $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
    7557        $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
    76 ,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subheader)))
    77 
     58,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter_header_target_pass)))
    7859
    7960

  • trunk/kBuild/subheader.kmk

    r2755 r2763  
    55
    66#
    7 # Copyright (c) 2006-2014 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
     7# Copyright (c) 2006-2015 knut st. osmundsen <bird-kBuild-spam-xiv@anduin.net>
    88#
    99# This file is part of kBuild.
    … …  
    5353 # Set the default path and makefile for all new targets.
    5454 #
    55  define def_subfooter
    56   ifndef $(target)_PATH
    57    ifndef $(target)_DEFPATH
    58     $(target)_DEFPATH := $(PATH_SUB_CURRENT)
    59    endif
    60    $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
    61   else ifndef $(target)_DEFPATH
    62    $(target)_DEFPATH := $($(target)_PATH)
    63   endif
    64   ifndef $(target)_MAKEFILE
    65    $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
    66   endif
    67   ifndef $(target)_0_OUTDIR
    68    $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
    69    $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
    70   endif
    71  endef
    72 
    73  # TODO: Wish there was an easy way of only enumerating only new targets...
     55 ## @todo Wish there was an easy way of only enumerating only new targets...
    7456 $(foreach target,\
    7557        $(ALL_TARGETS) \
    … …  
    8567        $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))     $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))    $(INSTALLS.$(KBUILD_TYPE))    \
    8668        $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))       $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))      $(OTHERS.$(KBUILD_TYPE))      \
    87  ,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter)))
     69 ,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter_header_target_pass)))
    8870
    8971
Note: See TracChangeset for help on using the changeset viewer.