Ignore:
Timestamp:
Apr 9, 2008, 2:04:42 AM (17 years ago)
Author:
bird
Message:

Environment / global variable policy changes. Renamed the following but will continue to check for the old ones:
BUILD_TYPE -> KBUILD_TYPE
BUILD_TARGET -> KBUILD_TARGET
BUILD_TARGET_ARCH -> KBUILD_TARGET_ARCH
BUILD_TARGET_CPU -> KBUILD_TARGET_CPU
BUILD_PLATFORM -> KBUILD_HOST
BUILD_PLATFORM_ARCH -> KBUILD_HOST_ARCH
BUILD_PLATFORM_CPU -> KBUILD_HOST_CPU
PATH_KBUILD -> KBUILD_PATH
PATH_KBUILD_BIN -> KBUILD_BIN_PATH

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/header.kmk

    r1501 r1504  
    44# kBuild - File included at top of a makefile.
    55#
    6 # Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
     6# Copyright (c) 2004-2008 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    77#
    88#
    … …  
    4949 endif
    5050else
    51  ifneq ($(int-ge $(KBUILD_VERSION_PATCH),2),1)
    52   $(warning kBuild: kmk version mismatch! Expected 0.1.2 or later. Actual version is $(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).)
     51 ifneq ($(int-ge $(KBUILD_VERSION_PATCH),3),1)
     52  $(warning kBuild: kmk version mismatch! Expected 0.1.3 or later. Actual version is $(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).)
    5353 endif
    5454endif
    … …  
    160160# Set default build type.
    161161#
    162 ifndef BUILD_TYPE
    163  BUILD_TYPE := release
    164 else
    165  if1of ($(BUILD_TYPE), $(KBUILD_OSES) $(KBUILD_ARCHES))
    166   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' is an OS or architecture!)
    167  endif
    168  ifneq (.$(words $(BUILD_TYPE)).$(BUILD_TYPE).,.1.$(strip $(BUILD_TYPE)).)
    169   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' contains spaces/tabs!)
    170  endif
     162ifndef KBUILD_TYPE
     163 ifdef BUILD_TYPE
     164  KBUILD_TYPE := $(BUILD_TYPE)
     165 endif
     166else ifdef BUILD_TYPE
     167 ifneq ($(KBUILD_TYPE),$(BUILD_TYPE))
     168  ifeq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),environment:command line)
     169   KBUILD_TYPE := $(BUILD_TYPE)
     170  else ifneq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),command line:environment)
     171   $(error kBuild: KBUILD_TYPE and BUILD_TYPE disagree.)
     172  endif
     173 endif
     174endif
     175override BUILD_TYPE = $(KBUILD_TYPE)
     176
     177ifndef KBUILD_TYPE
     178 KBUILD_TYPE := release
     179else
     180 if1of ($(KBUILD_TYPE), $(KBUILD_OSES) $(KBUILD_ARCHES))
     181  $(error kBuild: The KBUILD_TYPE value '$(KBUILD_TYPE)' is an OS or architecture!)
     182 endif
     183 ifneq (.$(words $(KBUILD_TYPE)).$(KBUILD_TYPE).,.1.$(strip $(KBUILD_TYPE)).)
     184  $(error kBuild: The KBUILD_TYPE value '$(KBUILD_TYPE)' contains spaces/tabs!)
     185 endif
     186endif
     187
     188
     189#
     190# Host platform legacy
     191# kmk deals with this, so this is only temporary until I've rebuilt everything.
     192#
     193ifndef KBUILD_HOST
     194 KBUILD_HOST := $(BUILD_PLATFORM)
     195endif
     196ifndef KBUILD_HOST_ARCH
     197 KBUILD_HOST_ARCH := $(BUILD_PLATFORM_ARCH)
     198endif
     199ifndef KBUILD_HOST_CPU
     200 KBUILD_HOST_CPU := $(BUILD_PLATFORM_CPU)
    171201endif
    172202
    … …  
    178208# unless the user starts messing about with environment variables.
    179209#
    180 ifneq (.$(words $(BUILD_PLATFORM)).$(BUILD_PLATFORM).,.1.$(strip $(BUILD_PLATFORM)).)
    181  $(error kBuild: The BUILD_PLATFORM value '$(BUILD_PLATFORM)' contains spaces/tabs!)
    182 endif
    183 ifneq ($(words $(filter $(BUILD_PLATFORM),$(KBUILD_OSES))),1)
    184  $(error kBuild: BUILD_PLATFORM value '$(BUILD_PLATFORM)' is not recognized (valid: $(KBUILD_OSES)))
    185 endif
    186 
    187 ifneq (.$(words $(BUILD_PLATFORM_ARCH)).$(BUILD_PLATFORM_ARCH).,.1.$(strip $(BUILD_PLATFORM_ARCH)).)
    188  $(error kBuild: The BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' contains spaces/tabs!)
    189 endif
    190 ifneq ($(words $(filter $(BUILD_PLATFORM_ARCH),$(KBUILD_ARCHES))),1)
    191  $(error kBuild: BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
    192 endif
    193 
    194 ifeq ($(strip $(BUILD_PLATFORM_CPU)),)
    195  BUILD_PLATFORM_CPU := blend
    196 else
    197  ifneq (.$(words $(BUILD_PLATFORM_CPU)).$(BUILD_PLATFORM_CPU).,.1.$(strip $(BUILD_PLATFORM_CPU)).)
    198   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
    199  endif
    200  if1of ($(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
    201   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' was found in the OS or architecture keywords!)
    202  endif
    203  ifeq ($(BUILD_PLATFORM_CPU),$(BUILD_TYPE))
    204   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' is the same as the BUILD_TYPE!)
    205  endif
    206 endif
     210ifneq (.$(words $(KBUILD_HOST)).$(KBUILD_HOST).,.1.$(strip $(KBUILD_HOST)).)
     211 $(error kBuild: The KBUILD_HOST value '$(KBUILD_HOST)' contains spaces/tabs!)
     212endif
     213ifneq ($(words $(filter $(KBUILD_HOST),$(KBUILD_OSES))),1)
     214 $(error kBuild: KBUILD_HOST value '$(KBUILD_HOST)' is not recognized (valid: $(KBUILD_OSES)))
     215endif
     216
     217ifneq (.$(words $(KBUILD_HOST_ARCH)).$(KBUILD_HOST_ARCH).,.1.$(strip $(KBUILD_HOST_ARCH)).)
     218 $(error kBuild: The KBUILD_HOST_ARCH value '$(KBUILD_HOST_ARCH)' contains spaces/tabs!)
     219endif
     220ifneq ($(words $(filter $(KBUILD_HOST_ARCH),$(KBUILD_ARCHES))),1)
     221 $(error kBuild: KBUILD_HOST_ARCH value '$(KBUILD_HOST_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
     222endif
     223
     224ifeq ($(strip $(KBUILD_HOST_CPU)),)
     225 KBUILD_HOST_CPU := blend
     226else
     227 ifneq (.$(words $(KBUILD_HOST_CPU)).$(KBUILD_HOST_CPU).,.1.$(strip $(KBUILD_HOST_CPU)).)
     228  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' contains spaces/tabs!)
     229 endif
     230 if1of ($(KBUILD_HOST_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
     231  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' was found in the OS or architecture keywords!)
     232 endif
     233 ifeq ($(KBUILD_HOST_CPU),$(KBUILD_TYPE))
     234  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' is the same as the KBUILD_TYPE!)
     235 endif
     236endif
     237
     238
     239#
     240# Deal with target platform legacy.
     241#
     242ifndef KBUILD_TARGET
     243 ifdef BUILD_TARGET
     244  KBUILD_TARGET := $(BUILD_TARGET)
     245 endif
     246else ifdef BUILD_TARGET
     247 ifneq ($(KBUILD_TARGET),$(BUILD_TARGET))
     248  ifeq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),environment:command line)
     249   KBUILD_TARGET := $(BUILD_TARGET)
     250  else ifneq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),command line:environment)
     251   $(error kBuild: KBUILD_TARGET and BUILD_TARGET disagree)
     252  endif
     253 endif
     254endif
     255override BUILD_TARGET = $(KBUILD_TARGET)
     256
     257ifndef KBUILD_TARGET_ARCH
     258 ifdef BUILD_TARGET_ARCH
     259  KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
     260 endif
     261else ifdef BUILD_TARGET_ARCH
     262 ifneq ($(KBUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH))
     263  ifeq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),environment:command line)
     264   KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
     265  else ifneq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),command line:environment)
     266   $(error kBuild: KBUILD_TARGET_ARCH and BUILD_TARGET_ARCH disagree)
     267  endif
     268 endif
     269endif
     270override BUILD_TARGET_ARCH = $(KBUILD_TARGET_ARCH)
     271
     272ifndef KBUILD_TARGET_CPU
     273 ifdef BUILD_TARGET_CPU
     274  KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
     275 endif
     276else ifdef BUILD_TARGET_CPU
     277 ifneq ($(KBUILD_TARGET_CPU),$(BUILD_TARGET_CPU))
     278  ifeq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),environment:command line)
     279   KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
     280  else ifneq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),command line:environment)
     281   $(error kBuild: KBUILD_TARGET_CPU and BUILD_TARGET_CPU disagree)
     282  endif
     283 endif
     284endif
     285override BUILD_TARGET_CPU = $(KBUILD_TARGET_CPU)
    207286
    208287
    209288#
    210289# Assert or set default target platform.
    211 # When not defined use the corresponding BUILD_PLATFORM value.
    212 #
    213 ifndef BUILD_TARGET
    214  BUILD_TARGET := $(BUILD_PLATFORM)
    215 else
    216  ifneq (.$(words $(BUILD_TARGET)).$(BUILD_TARGET).,.1.$(strip $(BUILD_TARGET)).)
    217   $(error kBuild: The BUILD_TARGET value '$(BUILD_TARGET)' contains spaces/tabs!)
    218  endif
    219  ifneq ($(words $(filter $(BUILD_TARGET),$(KBUILD_OSES))),1)
    220   $(error kBuild: BUILD_TARGET value '$(BUILD_TARGET)' is not recognized (valid: $(KBUILD_OSES)))
    221  endif
    222 endif
    223 
    224 ifndef BUILD_TARGET_ARCH
    225  BUILD_TARGET_ARCH := $(BUILD_PLATFORM_ARCH)
    226 else
    227  ifneq (.$(words $(BUILD_TARGET_ARCH)).$(BUILD_TARGET_ARCH).,.1.$(strip $(BUILD_TARGET_ARCH)).)
    228   $(error kBuild: The BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' contains spaces/tabs!)
    229  endif
    230  ifneq ($(words $(filter $(BUILD_TARGET_ARCH),$(KBUILD_ARCHES))),1)
    231   $(error kBuild: BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
    232  endif
    233 endif
    234 
    235 ifndef BUILD_TARGET_CPU
    236  BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
    237 else ifeq ($(strip $(BUILD_TARGET_CPU)),)
    238  ifeq ($(BUILD_TARGET_ARCH),$(BUILD_PLATFORM_ARCH))
    239   BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
     290# When not defined use the corresponding KBUILD_HOST value.
     291#
     292ifndef KBUILD_TARGET
     293 KBUILD_TARGET := $(KBUILD_HOST)
     294else
     295 ifneq (.$(words $(KBUILD_TARGET)).$(KBUILD_TARGET).,.1.$(strip $(KBUILD_TARGET)).)
     296  $(error kBuild: The KBUILD_TARGET value '$(KBUILD_TARGET)' contains spaces/tabs!)
     297 endif
     298 ifneq ($(words $(filter $(KBUILD_TARGET),$(KBUILD_OSES))),1)
     299  $(error kBuild: KBUILD_TARGET value '$(KBUILD_TARGET)' is not recognized (valid: $(KBUILD_OSES)))
     300 endif
     301endif
     302
     303ifndef KBUILD_TARGET_ARCH
     304 KBUILD_TARGET_ARCH := $(KBUILD_HOST_ARCH)
     305else
     306 ifneq (.$(words $(KBUILD_TARGET_ARCH)).$(KBUILD_TARGET_ARCH).,.1.$(strip $(KBUILD_TARGET_ARCH)).)
     307  $(error kBuild: The KBUILD_TARGET_ARCH value '$(KBUILD_TARGET_ARCH)' contains spaces/tabs!)
     308 endif
     309 ifneq ($(words $(filter $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES))),1)
     310  $(error kBuild: KBUILD_TARGET_ARCH value '$(KBUILD_TARGET_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
     311 endif
     312endif
     313
     314ifndef KBUILD_TARGET_CPU
     315 KBUILD_TARGET_CPU := $(KBUILD_HOST_CPU)
     316else ifeq ($(strip $(KBUILD_TARGET_CPU)),)
     317 ifeq ($(KBUILD_TARGET_ARCH),$(KBUILD_HOST_ARCH))
     318  KBUILD_TARGET_CPU := $(KBUILD_HOST_CPU)
    240319 else
    241   BUILD_TARGET_CPU := blend
    242  endif
    243 else
    244  ifneq (.$(words $(BUILD_TARGET_CPU)).$(BUILD_TARGET_CPU).,.1.$(strip $(BUILD_TARGET_CPU)).)
    245   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' contains spaces/tabs!)
    246  endif
    247  if1of ($(BUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
    248   $(error kBuild: The BUILD_TARGET_CPU value was found in the OS or architecture keywords!)
    249  endif
    250  ifeq ($(BUILD_TARGET_CPU),$(BUILD_TYPE))
    251   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' is the same as the BUILD_TYPE!)
     320  KBUILD_TARGET_CPU := blend
     321 endif
     322else
     323 ifneq (.$(words $(KBUILD_TARGET_CPU)).$(KBUILD_TARGET_CPU).,.1.$(strip $(KBUILD_TARGET_CPU)).)
     324  $(error kBuild: The KBUILD_TARGET_CPU value '$(KBUILD_TARGET_CPU)' contains spaces/tabs!)
     325 endif
     326 if1of ($(KBUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
     327  $(error kBuild: The KBUILD_TARGET_CPU value was found in the OS or architecture keywords!)
     328 endif
     329 ifeq ($(KBUILD_TARGET_CPU),$(KBUILD_TYPE))
     330  $(error kBuild: The KBUILD_TARGET_CPU value '$(KBUILD_TARGET_CPU)' is the same as the KBUILD_TYPE!)
    252331 endif
    253332endif
    … …  
    292371endif
    293372ifndef PATH_OUT
    294  ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
    295   PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
     373 ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places - obsolete)
     374  PATH_OUT          := $(PATH_OUT_BASE)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(KBUILD_TYPE)
    296375 else
    297   PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)
     376  PATH_OUT          := $(PATH_OUT_BASE)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/$(KBUILD_TYPE)
    298377 endif
    299378endif # !define PATH_OUT
    … …  
    308387PATH_DOC             = $(PATH_INS)/doc
    309388
    310 # PATH_KBUILD is determined by kmk.
    311 ifeq ($(strip $(PATH_KBUILD)),)
    312  $(error kBuild: PATH_KBUILD is missing or empty! kmk is supposed to set it.)
    313 endif
    314 # PATH_KBUILD_BIN is determined by kmk.
    315 ifeq ($(strip $(PATH_KBUILD_BIN)),)
    316  $(error kBuild: PATH_KBUILD_BIN is missing or empty! kmk is supposed to set it.)
     389# KBUILD_PATH / PATH_KBUILD is determined by kmk.
     390ifndef KBUILD_PATH
     391 KBUILD_PATH := $(PATH_KBUILD)
     392endif
     393ifeq ($(strip $(KBUILD_PATH)),)
     394 $(error kBuild: KBUILD_PATH is missing or empty! kmk is supposed to set it.)
     395endif
     396# KBUILD_BIN_PATH / PATH_KBUILD_BIN is determined by kmk.
     397ifndef KBUILD_BIN_PATH
     398 KBUILD_BIN_PATH := $(PATH_KBUILD_BIN)
     399endif
     400ifeq ($(strip $(KBUILD_BIN_PATH)),)
     401 $(error kBuild: KBUILD_BIN_PATH is missing or empty! kmk is supposed to set it.)
    317402endif
    318403
    319404# kBuild files which might be of interest.
    320 FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
    321 #FILE_KBUILD_CONFIG  := $(PATH_KBUILD)/config.kmk
    322 FILE_KBUILD_FOOTER  := $(PATH_KBUILD)/footer.kmk
     405FILE_KBUILD_HEADER  := $(KBUILD_PATH)/header.kmk
     406#FILE_KBUILD_CONFIG  := $(KBUILD_PATH)/config.kmk
     407FILE_KBUILD_FOOTER  := $(KBUILD_PATH)/footer.kmk
    323408
    324409## MAKEFILE is the name of the main makefile.
    … …  
    335420
    336421# OS/2
    337 ifeq ($(BUILD_PLATFORM),os2)
     422ifeq ($(KBUILD_HOST),os2)
    338423EXEC_X86_WIN32      := innopec.exe
    339424HOSTSUFF_EXE        := .exe
    … …  
    341426
    342427# Linux
    343 ifeq ($(BUILD_PLATFORM),linux)
     428ifeq ($(KBUILD_HOST),linux)
    344429EXEC_X86_WIN32      := wine
    345430HOSTSUFF_EXE        :=
    … …  
    347432
    348433# Win, Win32, Win64, NT.
    349 if1of ($(BUILD_PLATFORM), win nt)
     434if1of ($(KBUILD_HOST), win nt)
    350435EXEC_X86_WIN32      :=
    351436HOSTSUFF_EXE        := .exe
    … …  
    353438
    354439# FreeBSD
    355 ifeq ($(BUILD_PLATFORM),freebsd)
     440ifeq ($(KBUILD_HOST),freebsd)
    356441EXEC_X86_WIN32      := wine
    357442HOSTSUFF_EXE        :=
    … …  
    359444
    360445# Darwin / Mac OS X
    361 ifeq ($(BUILD_PLATFORM),darwin)
     446ifeq ($(KBUILD_HOST),darwin)
    362447EXEC_X86_WIN32      := false
    363448HOSTSUFF_EXE        :=
    … …  
    365450
    366451# Solaris
    367 ifeq ($(BUILD_PLATFORM),solaris)
     452ifeq ($(KBUILD_HOST),solaris)
    368453EXEC_X86_WIN32      := false
    369454HOSTSUFF_EXE        :=
    … …  
    376461#
    377462SUFF_DEP    := .dep
    378 if1of ($(BUILD_TARGET), win nt os2)
     463if1of ($(KBUILD_TARGET), win nt os2)
    379464SUFF_OBJ    := .obj
    380465SUFF_LIB    := .lib
    … …  
    383468SUFF_SYS    := .sys
    384469SUFF_RES    := .res
    385 else ifeq ($(BUILD_TARGET),l4)
     470else ifeq ($(KBUILD_TARGET),l4)
    386471SUFF_OBJ    := .o
    387472SUFF_LIB    := .a
    … …  
    390475SUFF_SYS    := .a
    391476SUFF_RES    :=
    392 else ifeq ($(BUILD_TARGET),darwin)
     477else ifeq ($(KBUILD_TARGET),darwin)
    393478SUFF_OBJ    := .o
    394479SUFF_LIB    := .a
    … …  
    402487SUFF_DLL    := .so
    403488SUFF_EXE    :=
    404  if1of ($(BUILD_TARGET), freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
     489 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
    405490SUFF_SYS    := .ko
    406491 else
    … …  
    414499#
    415500ifeq ($(KMK),kmk)
    416 KMK         := $(PATH_KBUILD_BIN)/kmk$(HOSTSUFF_EXE)
     501KMK         := $(KBUILD_BIN_PATH)/kmk$(HOSTSUFF_EXE)
    417502endif
    418503MAKE        := $(KMK)
    419504
    420 GMAKE       := $(PATH_KBUILD_BIN)/kmk_gmake$(HOSTSUFF_EXE)
    421 
    422 DEP_EXT     := $(PATH_KBUILD_BIN)/kDep$(HOSTSUFF_EXE)
     505GMAKE       := $(KBUILD_BIN_PATH)/kmk_gmake$(HOSTSUFF_EXE)
     506
     507DEP_EXT     := $(KBUILD_BIN_PATH)/kDep$(HOSTSUFF_EXE)
    423508if1of (kDep, $(KMK_BUILTIN))
    424509DEP         := kmk_builtin_kDep
    … …  
    427512endif
    428513
    429 DEP_IDB_EXT := $(PATH_KBUILD_BIN)/kDepIDB$(HOSTSUFF_EXE)
     514DEP_IDB_EXT := $(KBUILD_BIN_PATH)/kDepIDB$(HOSTSUFF_EXE)
    430515if1of (kDepIDB, $(KMK_BUILTIN))
    431516DEP_IDB     := kmk_builtin_kDepIDB
    … …  
    434519endif
    435520
    436 DEP_PRE_EXT := $(PATH_KBUILD_BIN)/kDepPre$(HOSTSUFF_EXE)
     521DEP_PRE_EXT := $(KBUILD_BIN_PATH)/kDepPre$(HOSTSUFF_EXE)
    437522if1of (kDepPre, $(KMK_BUILTIN))
    438523DEP_PRE     := kmk_builtin_kDepPre
    … …  
    441526endif
    442527
    443 KOBJCACHE_EXT := $(PATH_KBUILD_BIN)/kObjCache$(HOSTSUFF_EXE)
     528KOBJCACHE_EXT := $(KBUILD_BIN_PATH)/kObjCache$(HOSTSUFF_EXE)
    444529if1of (kObjCache, $(KMK_BUILTIN))
    445530KOBJCACHE   := kmk_builtin_kObjCache
    … …  
    448533endif
    449534
    450 APPEND_EXT  := $(PATH_KBUILD_BIN)/kmk_append$(HOSTSUFF_EXE)
     535APPEND_EXT  := $(KBUILD_BIN_PATH)/kmk_append$(HOSTSUFF_EXE)
    451536APPEND      := kmk_builtin_append
    452537
    453 CAT_EXT     := $(PATH_KBUILD_BIN)/kmk_cat$(HOSTSUFF_EXE)
     538CAT_EXT     := $(KBUILD_BIN_PATH)/kmk_cat$(HOSTSUFF_EXE)
    454539CAT         := kmk_builtin_cat
    455540
    456 CMP_EXT     := $(PATH_KBUILD_BIN)/kmk_cmp$(HOSTSUFF_EXE)
     541CMP_EXT     := $(KBUILD_BIN_PATH)/kmk_cmp$(HOSTSUFF_EXE)
    457542CMP         := kmk_builtin_cmp
    458543
    459 CP_EXT      := $(PATH_KBUILD_BIN)/kmk_cp$(HOSTSUFF_EXE)
     544CP_EXT      := $(KBUILD_BIN_PATH)/kmk_cp$(HOSTSUFF_EXE)
    460545CP          := kmk_builtin_cp
    461546
    462 ECHO_EXT    := $(PATH_KBUILD_BIN)/kmk_echo$(HOSTSUFF_EXE)
     547ECHO_EXT    := $(KBUILD_BIN_PATH)/kmk_echo$(HOSTSUFF_EXE)
    463548ECHO        := kmk_builtin_echo
    464549
    465 INSTALL_EXT := $(PATH_KBUILD_BIN)/kmk_install$(HOSTSUFF_EXE)
     550INSTALL_EXT := $(KBUILD_BIN_PATH)/kmk_install$(HOSTSUFF_EXE)
    466551INSTALL     := kmk_builtin_install
    467552
    468 LN_EXT      := $(PATH_KBUILD_BIN)/kmk_ln$(HOSTSUFF_EXE)
     553LN_EXT      := $(KBUILD_BIN_PATH)/kmk_ln$(HOSTSUFF_EXE)
    469554LN          := kmk_builtin_ln
    470555
    471 MD5SUM_EXT  := $(PATH_KBUILD_BIN)/kmk_md5sum$(HOSTSUFF_EXE)
     556MD5SUM_EXT  := $(KBUILD_BIN_PATH)/kmk_md5sum$(HOSTSUFF_EXE)
    472557MD5SUM      := kmk_builtin_md5sum
    473558
    474 MKDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_mkdir$(HOSTSUFF_EXE)
     559MKDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_mkdir$(HOSTSUFF_EXE)
    475560MKDIR       := kmk_builtin_mkdir
    476561
    477 MV_EXT      := $(PATH_KBUILD_BIN)/kmk_mv$(HOSTSUFF_EXE)
     562MV_EXT      := $(KBUILD_BIN_PATH)/kmk_mv$(HOSTSUFF_EXE)
    478563MV          := kmk_builtin_mv
    479564
    480 PRINTF_EXT  := $(PATH_KBUILD_BIN)/kmk_printf$(HOSTSUFF_EXE)
     565PRINTF_EXT  := $(KBUILD_BIN_PATH)/kmk_printf$(HOSTSUFF_EXE)
    481566PRINTF      := kmk_builtin_printf
    482567
    483 REDIRECT_EXT:= $(PATH_KBUILD_BIN)/kmk_redirect$(HOSTSUFF_EXE)
     568REDIRECT_EXT:= $(KBUILD_BIN_PATH)/kmk_redirect$(HOSTSUFF_EXE)
    484569if1of (redirect, $(KMK_BUILTIN))
    485570REDIRECT    := kmk_builtin_redirect
    … …  
    488573endif
    489574
    490 RM_EXT      := $(PATH_KBUILD_BIN)/kmk_rm$(HOSTSUFF_EXE)
     575RM_EXT      := $(KBUILD_BIN_PATH)/kmk_rm$(HOSTSUFF_EXE)
    491576RM          := kmk_builtin_rm
    492577
    493 RMDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_rmdir$(HOSTSUFF_EXE)
     578RMDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_rmdir$(HOSTSUFF_EXE)
    494579RMDIR       := kmk_builtin_rmdir
    495580
    496 SED_EXT     := $(PATH_KBUILD_BIN)/kmk_sed$(HOSTSUFF_EXE)
     581SED_EXT     := $(KBUILD_BIN_PATH)/kmk_sed$(HOSTSUFF_EXE)
    497582if1of (sed, $(KMK_BUILTIN))
    498583SED_INT     := kmk_builtin_sed
    … …  
    502587SED         := $(SED_EXT)
    503588
    504 TEST_EXT    := $(PATH_KBUILD_BIN)/kmk_test$(HOSTSUFF_EXE)
     589TEST_EXT    := $(KBUILD_BIN_PATH)/kmk_test$(HOSTSUFF_EXE)
    505590TEST        := kmk_builtin_test
    506591
    507592# Our default shell is the Almquist shell from *BSD.
    508 ASH         := $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)
     593ASH         := $(KBUILD_BIN_PATH)/kmk_ash$(HOSTSUFF_EXE)
    509594MAKESHELL   := $(ASH)
    510595SHELL       := $(ASH)
    … …  
    10281113
    10291114else
    1030  _KBUILD_MSG_STYLE_FILE := $(firstword $(foreach path, $(KBUILD_MSG_STYLE_PATHS) $(PATH_KBUILD)/msgstyles, $(wildcard $(path)/$(KBUILD_MSG_STYLE).kmk)))
     1115 _KBUILD_MSG_STYLE_FILE := $(firstword $(foreach path, $(KBUILD_MSG_STYLE_PATHS) $(KBUILD_PATH)/msgstyles, $(wildcard $(path)/$(KBUILD_MSG_STYLE).kmk)))
    10311116 ifneq ($(_KBUILD_MSG_STYLE_FILE),)
    10321117  include $(_KBUILD_MSG_STYLE_FILE)
    … …  
    10791164
    10801165#
    1081 # Validate any KBUILD_BLD_TYPES additions and finally the BUILD_TYPE.
     1166# Validate any KBUILD_BLD_TYPES additions and finally the KBUILD_TYPE.
    10821167#
    10831168if1of ($(KBUILD_BLD_TYPES), $(KBUILD_OSES))
    … …  
    10901175 $(error kBuild: found KBUILD_OSES in KBUILD_ARCHES!)
    10911176endif
    1092 ifn1of ($(BUILD_TYPE), $(KBUILD_BLD_TYPES))
    1093  $(error kBuild: BUILD_TYPE(=$(BUILD_TYPE)) is not found in KBUILD_BLD_TYPES(=$(KBUILD_BLD_TYPES))!)
     1177ifn1of ($(KBUILD_TYPE), $(KBUILD_BLD_TYPES))
     1178 $(error kBuild: KBUILD_TYPE(=$(KBUILD_TYPE)) is not found in KBUILD_BLD_TYPES(=$(KBUILD_BLD_TYPES))!)
    10941179endif
    10951180
Note: See TracChangeset for help on using the changeset viewer.