VirtualBox

儲存庫 vbox 的更動 8758


忽略:
時間撮記:
2008-5-11 下午06:27:49 (17 年 以前)
作者:
vboxsync
訊息:

BUILD_TARGET* -> KBUILD_TARGET*.

位置:
trunk
檔案:
修改 36 筆資料

圖例:

未更動
新增
刪除

  • trunk/Config.kmk

    r8757 r8758  
    3838# Install paths.
    3939PATH_INS            := $(PATH_OUT)
    40 ifeq ($(BUILD_TARGET),darwin)
     40ifeq ($(KBUILD_TARGET),darwin)
    4141 INST_DIST            = dist/
    4242 INST_SDK             = $(INST_DIST)sdk/
    … …  
    137137# This indicates that additions (of some kind or another) is being _built_.
    138138# VBOX_WITHOUT_ADDITIONS overrides it.
    139 if1of ($(BUILD_TARGET),l4 linux os2 solaris win)
     139if1of ($(KBUILD_TARGET),l4 linux os2 solaris win)
    140140 VBOX_WITH_ADDITIONS = 1
    141141else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
    … …  
    148148VBOX_WITH_ADDITION_DRIVERS = 1
    149149# Build win32 additions (cross building them on linux and l4 using wine).
    150 if1of ($(BUILD_TARGET),l4 linux win)
     150if1of ($(KBUILD_TARGET),l4 linux win)
    151151 VBOX_WITH_WIN32_ADDITIONS = 1
    152152endif
    … …  
    154154# Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
    155155# VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
    156 if1of ($(BUILD_TARGET),l4 linux)
     156if1of ($(KBUILD_TARGET),l4 linux)
    157157 VBOX_WITH_LINUX_ADDITIONS = 1
    158158endif
    … …  
    162162  VBOX_WITH_X11_ADDITIONS = 1
    163163 endif
    164  if1of ($(BUILD_TARGET), solaris)
     164 if1of ($(KBUILD_TARGET), solaris)
    165165  VBOX_WITH_X11_ADDITIONS = 1
    166166 endif
    … …  
    192192# build enhanced version of rdesktop
    193193VBOX_WITH_VRDP_RDESKTOP = 1
    194 if1of ($(BUILD_TARGET).$(BUILD_TARGET_ARCH), win.x86 l4.x86 l4.amd64)
     194if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 l4.x86 l4.amd64)
    195195# build the support driver & library with IDT patching.
    196196VBOX_WITH_IDT_PATCHING = 1
    … …  
    201201VBOX_WITH_VBOXDRV = 1
    202202# build with secure label support
    203 ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that.
     203ifeq ($(filter win.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) # too much work with freetype and all that.
    204204VBOX_WITH_SECURELABEL = 1
    205205endif
    … …  
    259259# Enables the ffmpeg module for recording test runs.
    260260# Enable this for non-Linux builds later.
    261 ifeq ($(BUILD_TARGET),linux)
     261ifeq ($(KBUILD_TARGET),linux)
    262262#  VBOX_WITH_FFMPEG = 1
    263263endif
    … …  
    275275VBOX_DO_STRIP_MODULES = 1
    276276# Use kStuff for MACH-O and LX binary loading.
    277 if1of ($(BUILD_TARGET),darwin os2)
     277if1of ($(KBUILD_TARGET),darwin os2)
    278278IPRT_WITH_KSTUFF = 1
    279279endif
    … …  
    292292# Enable use of the $ORIGIN rpath feature. This is the default on
    293293# Solaris, but not else where for various reasons (ld.so, dist builds).
    294 ifeq ($(BUILD_TARGET),solaris)
     294ifeq ($(KBUILD_TARGET),solaris)
    295295 VBOX_WITH_ORIGIN = 1
    296296endif
    … …  
    316316
    317317# l4 have to skip a few things.
    318 ifeq ($(BUILD_TARGET),l4)
     318ifeq ($(KBUILD_TARGET),l4)
    319319 VBOX_WITH_VBOXDRV=
    320320 VBOX_WITH_ADDITION_DRIVERS=
    … …  
    331331
    332332# Darwin have to skip a few things at present.
    333 ifeq ($(BUILD_TARGET),darwin)
     333ifeq ($(KBUILD_TARGET),darwin)
    334334 # Internal networking requires testing and possibly proper ring-3/ring0 separation.
    335335 VBOX_WITH_INTERNAL_NETWORKING=
    … …  
    343343
    344344# Most stuff doesn't build yet on the new targets.
    345 ifeq ($(BUILD_TARGET),os2)
     345ifeq ($(KBUILD_TARGET),os2)
    346346 VBOX_WITH_INSTALLER=
    347347 VBOX_WITH_SECURELABEL=
    … …  
    355355endif
    356356
    357 ifeq ($(BUILD_TARGET),solaris)
     357ifeq ($(KBUILD_TARGET),solaris)
    358358 VBOX_WITH_SECURELABEL=
    359359 VBOX_WITH_VRDP_AUTHMOD=
    … …  
    363363endif
    364364
    365 ifeq ($(BUILD_TARGET),freebsd)
     365ifeq ($(KBUILD_TARGET),freebsd)
    366366 VBOX_WITH_INSTALLER=
    367367 VBOX_WITH_SECURELABEL=
    … …  
    433433 VBOX_WITH_TESTSUITE=
    434434 VBOX_WITH_INTEL_PXE=
    435  ifeq ($(BUILD_TARGET),darwin)
     435 ifeq ($(KBUILD_TARGET),darwin)
    436436  # Qt/Mac v3.3.x requires patching to work for us.
    437437  VBOX_WITH_QTGUI=
    438438 endif
    439  ifn1of ($(BUILD_TARGET),linux solaris)
     439 ifn1of ($(KBUILD_TARGET),linux solaris)
    440440  # Only the Linux, Solaris installers are public
    441441  VBOX_WITH_INSTALLER=
    … …  
    501501# Image and object format config.
    502502#
    503 if1of ($(BUILD_TARGET), linux l4 freebsd netbsd openbsd solaris)
     503if1of ($(KBUILD_TARGET), linux l4 freebsd netbsd openbsd solaris)
    504504 VBOX_LDR_FMT = elf
    505505endif
    506 ifeq ($(BUILD_TARGET),darwin)
     506ifeq ($(KBUILD_TARGET),darwin)
    507507 VBOX_LDR_FMT = macho
    508508endif
    509 ifeq ($(BUILD_TARGET),os2)
     509ifeq ($(KBUILD_TARGET),os2)
    510510 VBOX_LDR_FMT = lx
    511511 VBOX_LDR_FMT32 = lx
    … …  
    513513 DONT_USE_YASM = 1 # yasm doesn't implement omf yet.
    514514endif
    515 ifeq ($(BUILD_TARGET),win)
     515ifeq ($(KBUILD_TARGET),win)
    516516 VBOX_LDR_FMT = pe
    517517endif
    … …  
    526526#
    527527ifeq ($(VBOX_LDR_FMT),elf)
    528  ifeq ($(BUILD_TARGET_ARCH),x86)
     528 ifeq ($(KBUILD_TARGET_ARCH),x86)
    529529VBOX_ASFLAGS_FMT = -f elf32 -DASM_FORMAT_ELF
    530530 else
    … …  
    542542endif
    543543ifeq ($(VBOX_LDR_FMT),pe)
    544  ifeq ($(BUILD_TARGET_ARCH),x86)
     544 ifeq ($(KBUILD_TARGET_ARCH),x86)
    545545VBOX_ASFLAGS_FMT = -f win32 -DASM_FORMAT_PE
    546546 else
    … …  
    611611#
    612612ifndef VBOX_GCC_TOOL
    613  ifeq ($(BUILD_TARGET),win)
     613 ifeq ($(KBUILD_TARGET),win)
    614614  VBOX_GCC_TOOL := MINGW32
    615615  TOOL_MINGW32_CFLAGS := $(UNDEFINED) # override -g
    616  else ifeq ($(BUILD_TARGET),os2)
     616 else ifeq ($(KBUILD_TARGET),os2)
    617617  VBOX_GCC_TOOL := GXX3OMF
    618  else ifeq ($(BUILD_TARGET),darwin)
     618 else ifeq ($(KBUILD_TARGET),darwin)
    619619  VBOX_GCC_TOOL := GXX4MACHO
    620  else ifeq ($(BUILD_TARGET),solaris)
     620 else ifeq ($(KBUILD_TARGET),solaris)
    621621  VBOX_GCC_TOOL := GXX3PLAIN
    622622  VBOX_GCC32_TOOL := GXX3PLAIN
    623623 else
    624624  VBOX_GCC_TOOL := GXX3
    625   ifeq ($(BUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),x86.amd64) ## @todo mixing target/host here!
     625  ifeq ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),x86.amd64) ## @todo mixing target/host here!
    626626   VBOX_GCC_TOOL := GXX32
    627627   VBOX_WITH_VBOXDRV=
    628628   VBOX_WITH_LINUX_ADDITIONS=
    629629   VBOX_WITH_WIN32_ADDITIONS=
    630   else ifeq ($(BUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),amd64.x86)
     630  else ifeq ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),amd64.x86)
    631631   VBOX_GCC_TOOL := GXX64
    632632   VBOX_WITH_VBOXDRV=
    … …  
    637637endif
    638638ifndef VBOX_GCC32_TOOL
    639  ifeq ($(BUILD_TARGET_ARCH),x86)
     639 ifeq ($(KBUILD_TARGET_ARCH),x86)
    640640  VBOX_GCC32_TOOL := $(VBOX_GCC_TOOL)
    641  else ifeq ($(BUILD_TARGET),win)
     641 else ifeq ($(KBUILD_TARGET),win)
    642642  VBOX_GCC32_TOOL := MINGW32
    643643 else
    … …  
    650650#
    651651ifndef VBOX_VCC_TOOL
    652  ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.amd64)
     652 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.amd64)
    653653  VBOX_USE_VCC80 ?= 1 # Enforce VCC80 when targetting AMD64.
    654654 endif
    655655 ifdef VBOX_USE_VCC80
    656   ifeq ($(BUILD_TARGET_ARCH),x86)
     656  ifeq ($(KBUILD_TARGET_ARCH),x86)
    657657   VBOX_VCC_TOOL := VCC80X86
    658658  else
    … …  
    671671PATH_DEVTOOLS := $(abspath $(PATH_DEVTOOLS))
    672672PATH_DEVTOOLS_BLD ?= $(PATH_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
    673 PATH_DEVTOOLS_TRG ?= $(PATH_DEVTOOLS)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)
     673PATH_DEVTOOLS_TRG ?= $(PATH_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
    674674
    675675## @todo Remove the default tool crap here!
    … …  
    687687#
    688688ifdef L4_DIR
    689  ifeq ($(BUILD_TARGET),l4)
     689 ifeq ($(KBUILD_TARGET),l4)
    690690  L4_API  ?= l4v2
    691   L4_ARCH ?= $(BUILD_TARGET_ARCH)
     691  L4_ARCH ?= $(KBUILD_TARGET_ARCH)
    692692  ifeq ($(L4_ARCH),x86)
    693693   L4_CPU ?= 586
    … …  
    726726
    727727# Produce debugging information that the Fiasco kernel debugger can read.
    728 ifeq ($(BUILD_TARGET).$(BUILD_TYPE),l4.debug)
     728ifeq ($(KBUILD_TARGET).$(BUILD_TYPE),l4.debug)
    729729 DEBUG_L4 = -gstabs+
    730730endif
    … …  
    812812# ARCH_BITS_DEFS.
    813813#
    814 ifeq ($(BUILD_TARGET_ARCH),amd64)
     814ifeq ($(KBUILD_TARGET_ARCH),amd64)
    815815 ARCH_BITS_DEFS := HC_ARCH_BITS=64 GC_ARCH_BITS=32
    816 else ifeq ($(BUILD_TARGET_ARCH),x86)
     816else ifeq ($(KBUILD_TARGET_ARCH),x86)
    817817 ARCH_BITS_DEFS := HC_ARCH_BITS=32 GC_ARCH_BITS=32
    818818else
    819  error BUILD_TARGET_ARCH=$(BUILD_TARGET_ARCH)
     819 error BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)
    820820endif
    821821
    … …  
    823823# Add the output dir(s) to the dynamic loader search path.
    824824#
    825 if1of ($(BUILD_TARGET), linux l4 freebsd netbsd openbsd solaris)
     825if1of ($(KBUILD_TARGET), linux l4 freebsd netbsd openbsd solaris)
    826826 export LD_LIBRARY_PATH:=$(PATH_BIN):$(PATH_LIB):$(LD_LIBRARY_PATH)
    827827endif
    828 ifeq ($(BUILD_TARGET),os2)
     828ifeq ($(KBUILD_TARGET),os2)
    829829 #fixme! export BEGINLIBPATH:=$(PATH_BIN);$(PATH_LIB);$(BEGINLIBPATH)
    830830endif
    831 ifeq ($(BUILD_TARGET),win)
     831ifeq ($(KBUILD_TARGET),win)
    832832 export PATH:=$(PATH_BIN);$(PATH_LIB);$(PATH)
    833833endif
    … …  
    836836# Common libraries and tools.
    837837#
    838 ifeq ($(BUILD_TARGET),darwin)
     838ifeq ($(KBUILD_TARGET),darwin)
    839839 LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dylib
    840840 LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    … …  
    847847 LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.dylib
    848848endif
    849 ifeq ($(BUILD_TARGET),l4)
     849ifeq ($(KBUILD_TARGET),l4)
    850850 LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.s.so
    851851 LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    … …  
    858858 LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.s.so
    859859endif
    860 if1of ($(BUILD_TARGET), linux freebsd netbsd openbsd solaris)
     860if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    861861 LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.so
    862862 LIB_RUNTIME_EF  = $(PATH_LIB)/RuntimeEFCPP.a
    … …  
    869869 LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.so
    870870endif
    871 ifeq ($(BUILD_TARGET),os2)
     871ifeq ($(KBUILD_TARGET),os2)
    872872 LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dll
    873873 LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    … …  
    881881 OBJ_SYS0        = $(PATH_OBJ)/src/VBox/Runtime/RuntimeR0/os2/sys0.obj
    882882endif
    883 ifeq ($(BUILD_TARGET),win)
     883ifeq ($(KBUILD_TARGET),win)
    884884 LIB_RUNTIME     = $(PATH_LIB)/VBoxRT.lib
    885885 LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.lib
    … …  
    910910endif
    911911ifeq ($(VBOX_XCURSOR_LIBS),)
    912  ifeq ($(BUILD_TARGET),solaris)
     912 ifeq ($(KBUILD_TARGET),solaris)
    913913  VBOX_XCURSOR_LIBS := $(lastword $(wildcard $(PATH_DEVTOOLS_TRG)/libXcursor/*/lib/libXcursor.a))
    914914  ifneq ($(VBOX_XCURSOR_LIBS),)
    … …  
    966966# Windows install tools...
    967967VBOX_PATH_WIX  ?= $(PATH_DEVTOOLS)/win.x86/wix/v2.0.4611.0
    968 VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$(BUILD_TARGET_ARCH)/DIFx/v2.1
     968VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1
    969969
    970970# We need to export YASM for OSE, but since it was converted to .zip we need to
    … …  
    975975
    976976# XPCOM setup for all but win32.
    977 ifneq ($(BUILD_TARGET),win)
     977ifneq ($(KBUILD_TARGET),win)
    978978 VBOX_WITH_XPCOM      = 1
    979979 VBOX_XPIDL          ?= $(VBOX_PATH_SDK)/bin/xpidl$(HOSTSUFF_EXE)
    … …  
    986986        $(VBOX_PATH_SDK)/include/xpcom/xpcom \
    987987        $(VBOX_PATH_SDK)/include/xpcom/ipcd
    988  ifneq ($(BUILD_TARGET),os2)
     988 ifneq ($(KBUILD_TARGET),os2)
    989989  # libIDL-config (for xpcom18a4)
    990990  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
    … …  
    994994endif
    995995
    996 ifeq ($(BUILD_TARGET),os2)
     996ifeq ($(KBUILD_TARGET),os2)
    997997 # search DLLs in the EXE directory first
    998998 VBOX_XPIDL    := BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH" $(VBOX_XPIDL)
    … …  
    10011001
    10021002# The X11 LIBPATH. (The amd64 hack is for RHEL4.)
    1003 ifeq ($(BUILD_TARGET_ARCH),amd64)
     1003ifeq ($(KBUILD_TARGET_ARCH),amd64)
    10041004 VBOX_LIBPATH_X11 ?= /usr/X11R6/lib64 /usr/X11R6/lib
    10051005else
    … …  
    10461046#       VBOX_GCC_RPATH_OPT - Different GCC/LD combinations needs different options.
    10471047VBOX_ORIGIN = $$ORIGIN
    1048 ifeq ($(BUILD_TARGET),solaris)
     1048ifeq ($(KBUILD_TARGET),solaris)
    10491049 VBOX_GCC_RPATH_OPT = -R
    10501050else
    … …  
    11391139        $(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
    11401140        $(APPEND) '$@' 'VBOX_LD_as_needed              ?= $(call VBOX_GCC_CHECK_LD,--as-needed,)'
    1141 ifneq ($(BUILD_TARGET),l4)
     1141ifneq ($(KBUILD_TARGET),l4)
    11421142# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
    11431143# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
    … …  
    11481148        $(APPEND) '$@' 'endif'
    11491149endif
    1150 ifneq ($(BUILD_TARGET),l4)
     1150ifneq ($(KBUILD_TARGET),l4)
    11511151# Set default attribute for inline functions to ``hidden'' to reduce the number
    11521152# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
    … …  
    12271227  VBOX_MAKE_CAT64_FN   ?= $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),XP_X64;Server2003_X64;Vista_X64)
    12281228  VBOX_MAKE_CAT32_FN   ?= $(call VBOX_MAKE_CAT_HLP_FN,$(1),$(2),2000;XP_X86;Server2003_X86;Vista_X86)
    1229   ifeq ($(BUILD_TARGET_ARCH),x86)
     1229  ifeq ($(KBUILD_TARGET_ARCH),x86)
    12301230   VBOX_MAKE_CAT_FN    ?= $(call VBOX_MAKE_CAT32_FN,$(1),$(2))
    12311231  else
    … …  
    12491249# Windows .inf editing.
    12501250#
    1251 ifeq ($(BUILD_TARGET_ARCH),x86)
     1251ifeq ($(KBUILD_TARGET_ARCH),x86)
    12521252 VBOX_EDIT_INF_FN = $(call VBOX_EDIT_INF32_FN,$(1),$(2))
    12531253else
    … …  
    12671267#
    12681268VBOX_PREF_LIB =
    1269 if1of ($(BUILD_TARGET),win os2)
     1269if1of ($(KBUILD_TARGET),win os2)
    12701270VBOX_SUFF_LIB = .lib
    12711271else
    … …  
    12731273endif
    12741274VBOX_SUFF_DLL = $(SUFF_DLL)
    1275 ifeq ($(BUILD_TARGET),os2) # GXX3OMF produces out .o at the moment.
     1275ifeq ($(KBUILD_TARGET),os2) # GXX3OMF produces out .o at the moment.
    12761276VBOX_SUFF_OBJ = .o
    12771277else
    … …  
    12851285#
    12861286SDK_VBOX_LIBXML2          = .
    1287 #if1of ($(BUILD_TARGET),win os2 solaris)
     1287#if1of ($(KBUILD_TARGET),win os2 solaris)
    12881288 SDK_VBOX_LIBXML2_INCS   ?= $(PATH_ROOT)/src/libs/libxml2-2.6.30/include
    12891289 SDK_VBOX_LIBXML2_LIBS   ?= $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
    12901290 SDK_VBOX_LIBXML2_DEFS   ?= LIBXML_STATIC
    12911291 SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
    1292 #else if1of ($(BUILD_TARGET),linux)
     1292#else if1of ($(KBUILD_TARGET),linux)
    12931293# SDK_VBOX_LIBXML2_INCS      ?=
    12941294# SDK_VBOX_LIBXML2_LIBS      ?=
    … …  
    13021302
    13031303SDK_VBOX_LIBXSLT          = .
    1304 #if1of ($(BUILD_TARGET),win os2 solaris)
     1304#if1of ($(KBUILD_TARGET),win os2 solaris)
    13051305 SDK_VBOX_LIBXSLT_INCS   ?= $(PATH_ROOT)/src/libs/libxslt-1.1.22
    13061306 SDK_VBOX_LIBXSLT_LIBS   ?= $(PATH_LIB)/VBox-libxslt$(VBOX_SUFF_LIB)
    13071307 SDK_VBOX_LIBXSLT_DEFS   ?=
    13081308 SDK_VBOX_LIBXSLT_DEFS.win += WIN32 _WINDOWS _MBCS _REENTRANT
    1309 #else if1of ($(BUILD_TARGET),linux)
     1309#else if1of ($(KBUILD_TARGET),linux)
    13101310# SDK_VBOX_LIBXSLT_INCS      ?=
    13111311# SDK_VBOX_LIBXSLT_LIBS      ?=
    … …  
    13231323
    13241324SDK_VBOX_ZLIB         = .
    1325 if1of ($(BUILD_TARGET), win os2)
     1325if1of ($(KBUILD_TARGET), win os2)
    13261326 SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.1
    13271327 SDK_VBOX_ZLIB_LIBS  ?= $(PATH_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
    … …  
    13361336
    13371337SDK_VBOX_FFMPEG       = .
    1338 if1of ($(BUILD_TARGET), win os2 darwin)
     1338if1of ($(KBUILD_TARGET), win os2 darwin)
    13391339 SDK_VBOX_FFMPEG_INCS ?= \
    13401340        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavutil \
    13411341        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavcodec \
    13421342        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavformat
    1343  ifeq ($(BUILD_TARGET),win)
     1343 ifeq ($(KBUILD_TARGET),win)
    13441344  ## @todo Michael! Where is $(PATH_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from?
    13451345  #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpeg.a
    … …  
    13651365#
    13661366## @todo convert this into SDK and integrate the Qt stuff into kBuild.
    1367 ifeq ($(BUILD_TARGET),win)
     1367ifeq ($(KBUILD_TARGET),win)
    13681368 VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
    13691369 VBOX_DLL_QT ?= $(firstword $(wildcard $(VBOX_PATH_QT)/bin/VBoxQt3*.dll) \
    … …  
    13841384                           $(wildcard $(VBOX_PATH_QT)/lib/dynamic/qtmain.lib))
    13851385 QTDIR ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3.*)))
    1386 else ifeq ($(BUILD_TARGET),os2)
     1386else ifeq ($(KBUILD_TARGET),os2)
    13871387 QTDIR ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.1
    13881388 VBOX_PATH_QT ?= $(QTDIR)
    … …  
    13911391 LIB_QT_PRL ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.prl)))
    13921392 QTDIR := $(VBOX_PATH_QT)
    1393 else ifeq ($(BUILD_TARGET),darwin)
     1393else ifeq ($(KBUILD_TARGET),darwin)
    13941394 ifndef VBOX_PATH_QT
    13951395  VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
    … …  
    14351435 LIB_QT ?= qt-mt
    14361436endif
    1437 ifeq ($(KBUILD_HOST),$(BUILD_TARGET))
     1437ifeq ($(KBUILD_HOST),$(KBUILD_TARGET))
    14381438 VBOX_PATH_QT_HOST ?= $(VBOX_PATH_QT)
    14391439else
    … …  
    14451445VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
    14461446
    1447 ifeq ($(BUILD_TARGET),os2)
     1447ifeq ($(KBUILD_TARGET),os2)
    14481448 # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
    14491449 VBOX_DLL_QT_PATH := $(dir $(VBOX_DLL_QT))
    … …  
    14581458# The linux kernel headers(/sources).
    14591459#
    1460 if1of ($(BUILD_TARGET), linux)
     1460if1of ($(KBUILD_TARGET), linux)
    14611461 ifeq ($(origin VBOX_LINUX_SRC),undefined)
    14621462  ifneq ($(wildcard /lib/modules/$(shell uname -r)/build/include/linux/autoconf.h),)
    … …  
    14771477    kernelpath := $(VBOX_LINUX_SRC)
    14781478   endif
    1479    ifeq ($(BUILD_TARGET_ARCH),x86)
     1479   ifeq ($(KBUILD_TARGET_ARCH),x86)
    14801480     VBOX_LINUX_INCS                += $(kernelpath)/include/asm-i386/mach-default \
    14811481                                       $(kernelpath)/include/asm-x86/mach-default
    … …  
    15201520TEMPLATE_VBOXGC_CXXFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC32_Wno-variadic-macros) -pipe -fno-exceptions -fno-rtti $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
    15211521TEMPLATE_VBOXGC_CFLAGS              = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC32_Wno-variadic-macros) -pipe -Wmissing-prototypes -Wstrict-prototypes $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
    1522 ifeq ($(BUILD_TARGET),solaris)
     1522ifeq ($(KBUILD_TARGET),solaris)
    15231523 TEMPLATE_VBOXGC_LDFLAGS            = -r
    15241524else
    … …  
    15281528 TEMPLATE_VBOXGC_LDFLAGS.release    = $(if $(VBOX_DO_STRIP_MODULES),-S,)
    15291529endif
    1530 ifn1of ($(BUILD_TARGET), solaris freebsd)
     1530ifn1of ($(KBUILD_TARGET), solaris freebsd)
    15311531 TEMPLATE_VBOXGC_LIBS               = \
    15321532        $(VBOX_GCC32_LIBGCC) # instricts
    … …  
    16231623TEMPLATE_VBOXR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
    16241624TEMPLATE_VBOXR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
    1625 ifeq ($(BUILD_TARGET),solaris)
     1625ifeq ($(KBUILD_TARGET),solaris)
    16261626 TEMPLATE_VBOXR0_LDFLAGS             = -r
    16271627else
    … …  
    16311631 TEMPLATE_VBOXR0_LDFLAGS.release     = $(if $(VBOX_DO_STRIP_MODULES),-S,)
    16321632endif
    1633 ifn1of ($(BUILD_TARGET),solaris freebsd)
     1633ifn1of ($(KBUILD_TARGET),solaris freebsd)
    16341634 TEMPLATE_VBOXR0_LIBS                = \
    16351635        $(VBOX_GCC_LIBGCC) # instricts
    … …  
    16651665TEMPLATE_VBOXR0DRV_DEFS                = IN_RING0 IN_RT_R0 $(ARCH_BITS_DEFS)
    16661666
    1667 ifeq ($(BUILD_TARGET),win)
     1667ifeq ($(KBUILD_TARGET),win)
    16681668 TEMPLATE_VBOXR0DRV_TOOL               = $(VBOX_VCC_TOOL)
    16691669 TEMPLATE_VBOXR0DRV_RCDEFS             = \
    … …  
    16881688endif
    16891689
    1690 ifeq ($(BUILD_TARGET),linux)
     1690ifeq ($(KBUILD_TARGET),linux)
    16911691TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
    16921692TEMPLATE_VBOXR0DRV_DEFS                = __KERNEL__ MODULE IN_RING0 IN_RT_R0
    … …  
    16991699        -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
    17001700        -Wno-sign-compare -Wdeclaration-after-statement
    1701 TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(BUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti
     1701TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti
    17021702  ifndef VBOX_LINUX_VERSION_2_4
    17031703# 2.6
    … …  
    17121712endif
    17131713
    1714 ifeq ($(BUILD_TARGET),os2)
     1714ifeq ($(KBUILD_TARGET),os2)
    17151715TEMPLATE_VBOXR0DRV_TOOL                = GXX3OMF
    17161716TEMPLATE_VBOXR0DRV_CXXFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs $(VBOX_GCC_Wno-variadic-macros) -pipe $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing -fno-rtti -fno-exceptions
    … …  
    17211721endif
    17221722
    1723 ifeq ($(BUILD_TARGET),darwin)
     1723ifeq ($(KBUILD_TARGET),darwin)
    17241724TEMPLATE_VBOXR0DRV_TOOL                = GXX4MACHO
    17251725TEMPLATE_VBOXR0DRV_DEFS               += KERNEL KERNEL_PRIVATE DRIVER_PRIVATE APPLE NeXT
    … …  
    17461746endif
    17471747
    1748 ifeq ($(BUILD_TARGET),solaris)
     1748ifeq ($(KBUILD_TARGET),solaris)
    17491749## The Solaris /usr/platform/i86pc/include and /usr/include directories.
    17501750VBOX_SOLARIS_SYS_INCS ?= /usr/platform/i86pc/include /usr/include
    … …  
    17681768endif # Solaris
    17691769
    1770 ifeq ($(BUILD_TARGET),freebsd)
     1770ifeq ($(KBUILD_TARGET),freebsd)
    17711771# x86 FreeBSD:
    17721772#  cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE \
    … …  
    18511851TEMPLATE_VBOXR3EXE_DEFS                = IN_RING3 $(ARCH_BITS_DEFS)
    18521852TEMPLATE_VBOXR3EXE_LIBS.kprofile       = $(LIB_KPROFILE)
    1853 ifeq ($(BUILD_TARGET),win)
     1853ifeq ($(KBUILD_TARGET),win)
    18541854 TEMPLATE_VBOXR3EXE_TOOL               = $(VBOX_VCC_TOOL)
    18551855 TEMPLATE_VBOXR3EXE_RCDEFS             = \
    … …  
    19141914        -Wl,--rpath-link,$(L4_LIBDIR)
    19151915TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack $(VBOX_LD_as_needed)
    1916  ifeq ($(BUILD_TARGET),linux)
     1916 ifeq ($(KBUILD_TARGET),linux)
    19171917TEMPLATE_VBOXR3EXE_LIBS                = pthread m rt dl
    1918  else ifeq ($(BUILD_TARGET),l4)
     1918 else ifeq ($(KBUILD_TARGET),l4)
    19191919TEMPLATE_VBOXR3EXE_LIBS                = \
    19201920        $(L4_LIBDIR)/libvboxserver.s.so \
    … …  
    19231923        $(L4_LIBDIR)/libdl.s.so \
    19241924        $(L4_LIBDIR)/libuc.0.s.so
    1925  else ifeq ($(BUILD_TARGET),os2)
     1925 else ifeq ($(KBUILD_TARGET),os2)
    19261926TEMPLATE_VBOXR3EXE_TOOL                = GXX3OMF
    19271927TEMPLATE_VBOXR3EXE_LIBS                = socket iconv
    1928  else ifeq ($(BUILD_TARGET),darwin)
     1928 else ifeq ($(KBUILD_TARGET),darwin)
    19291929TEMPLATE_VBOXR3EXE_TOOL                = GXX4MACHO
    19301930TEMPLATE_VBOXR3EXE_LIBS                =
    19311931TEMPLATE_VBOXR3EXE_LDFLAGS             = -read_only_relocs suppress
    1932  else if1of ($(BUILD_TARGET),freebsd netbsd openbsd)
     1932 else if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
    19331933TEMPLATE_VBOXR3EXE_TOOL                = GXX3
    19341934TEMPLATE_VBOXR3EXE_LIBS                = pthread
    … …  
    19371937        /usr/X11R6/include \
    19381938        /usr/local/include
    1939  else ifeq ($(BUILD_TARGET),solaris)
     1939 else ifeq ($(KBUILD_TARGET),solaris)
    19401940TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
    19411941TEMPLATE_VBOXR3EXE_DEFS               += LIBICONV_PLUG _REENTRANT # Avoid the GNU libiconv, for now at least.
    19421942TEMPLATE_VBOXR3EXE_LIBS                = rt socket
    19431943 else
    1944 $(warning Warning: VBOX Build: Target $(BUILD_TARGET) is not officially supported!)
     1944$(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
    19451945TEMPLATE_VBOXR3EXE_CXXFLAGS.profile    = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.release)
    19461946TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile   = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.krelease)
    … …  
    19601960TEMPLATE_VBOXR3_DEFS.l4     = $(TEMPLATE_VBOXR3EXE_DEFS.l4) __PIC__
    19611961TEMPLATE_VBOXR3_DEFS.darwin = $(TEMPLATE_VBOXR3EXE_DEFS.darwin) PIC
    1962 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    1963  ifneq ($(BUILD_TARGET),win)
     1962ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     1963 ifneq ($(KBUILD_TARGET),win)
    19641964  TEMPLATE_VBOXR3_DEFS = $(TEMPLATE_VBOXR3EXE_DEFS) PIC
    19651965  TEMPLATE_VBOXR3_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -fPIC
    … …  
    19801980 TEMPLATE_VBOXR3TSTEXE_LDFLAGS= '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..' $(TEMPLATE_VBOXR3EXE_LDFLAGS)
    19811981endif
    1982 ifeq ($(BUILD_TARGET),win)
     1982ifeq ($(KBUILD_TARGET),win)
    19831983 ifdef VBOX_SIGNING_MODE
    19841984  TEMPLATE_VBOXR3TSTEXE_POST_CMDS =
    … …  
    20022002TEMPLATE_VBOXR3NPEXE                     = VBox Ring 3 Non-pedantic
    20032003TEMPLATE_VBOXR3NPEXE_EXTENDS             = VBOXR3EXE
    2004 ifneq ($(BUILD_TARGET),win) # (only gcc)
     2004ifneq ($(KBUILD_TARGET),win) # (only gcc)
    20052005 TEMPLATE_VBOXR3NPEXE_TOOL                = $(VBOX_GCC_TOOL)
    20062006 TEMPLATE_VBOXR3NPEXE_CXXFLAGS            = $(filter-out -pedantic,$(TEMPLATE_VBOXR3EXE_CXXFLAGS))
    … …  
    20202020        -nostdlib
    20212021TEMPLATE_VBOXR3NP_DEFS.l4 = $(TEMPLATE_VBOXR3NPEXE_DEFS.l4) __PIC__
    2022 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    2023  ifneq ($(BUILD_TARGET),win)
     2022ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     2023 ifneq ($(KBUILD_TARGET),win)
    20242024  TEMPLATE_VBOXR3NP_DEFS = $(TEMPLATE_VBOXR3NPEXE_DEFS) PIC
    20252025  TEMPLATE_VBOXR3NP_CFLAGS = $(TEMPLATE_VBOXR3NPEXE_CFLAGS) -fPIC
    … …  
    20492049endif
    20502050TEMPLATE_VBOXNOCRTGCC_CXXFLAGS          = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS)
    2051 TEMPLATE_VBOXNOCRTGCC_CXXFLAGS.$(BUILD_TARGET) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(BUILD_TARGET))
    2052 TEMPLATE_VBOXNOCRTGCC_CXXFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(BUILD_TARGET_ARCH))
     2051TEMPLATE_VBOXNOCRTGCC_CXXFLAGS.$(KBUILD_TARGET) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(KBUILD_TARGET))
     2052TEMPLATE_VBOXNOCRTGCC_CXXFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_VBOXNOCRTGCC_CFLAGS.$(KBUILD_TARGET_ARCH))
    20532053TEMPLATE_VBOXNOCRTGCC_INCS              = $(PATH_ROOT)/include/iprt/nocrt
    20542054
    2055 ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.amd64)
     2055ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.amd64)
    20562056 # cross compile to 64-bit ELF (linux).
    20572057 TEMPLATE_VBOXNOCRTGCC_TOOL             = XGCCAMD64LINUX
    … …  
    20612061 TEMPLATE_VBOXNOCRTGCC_LDFLAGS          = -nostdlib
    20622062
    2063 else ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.x86)
     2063else ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
    20642064 # Use the default GCC (MinGW) with the Microsoft linker.
    20652065 # (Drop all '-g' options as we're unable to strip the debug info.)
    … …  
    20802080 TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
    20812081 TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
    2082  ifeq ($(BUILD_TARGET_ARCH),amd64)
     2082 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    20832083  # in 64-bit mode we'll build a sys-module (VBoxREM2).
    2084   if1of ($(BUILD_TARGET),darwin solaris)
     2084  if1of ($(KBUILD_TARGET),darwin solaris)
    20852085   TEMPLATE_VBOXNOCRTGCC_LDFLAGS.solaris= -64 -r
    20862086  else
    … …  
    20892089 else # x86:
    20902090  TEMPLATE_VBOXNOCRTGCC_LDFLAGS         = -nostdlib
    2091   ifn1of ($(BUILD_TARGET), os2 darwin solaris)
     2091  ifn1of ($(KBUILD_TARGET), os2 darwin solaris)
    20922092   TEMPLATE_VBOXNOCRTGCC_LDFLAGS       += -Wl,--no-undefined
    20932093  endif
    … …  
    21032103TEMPLATE_VBOXNOCRTGAS_EXTENDS = VBOXNOCRTGCC
    21042104TEMPLATE_VBOXNOCRTGAS_ASTOOL = $(TEMPLATE_VBOXNOCRTGCC_TOOL)
    2105 ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.x86)
     2105ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
    21062106 TEMPLATE_VBOXNOCRTGAS_ASFLAGS = -s
    21072107else
    … …  
    21262126        $(VBOX_PATH_SDK)/include
    21272127
    2128 ifeq ($(BUILD_TARGET),win)
     2128ifeq ($(KBUILD_TARGET),win)
    21292129  TEMPLATE_VBOXMAINEXE_SDKS              = WINPSDK W2K3DDK
    21302130 ifdef VBOX_USE_VCC80
    … …  
    21722172TEMPLATE_VBOXMAINEXE_LDFLAGS.x86         = -m32
    21732173TEMPLATE_VBOXMAINEXE_LDFLAGS.amd64       = -m64
    2174  ifeq ($(BUILD_TARGET),linux)
     2174 ifeq ($(KBUILD_TARGET),linux)
    21752175TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME)
    21762176TEMPLATE_VBOXMAINEXE_LDFLAGS.linux       = $(VBOX_LD_as_needed)
    2177  else ifeq ($(BUILD_TARGET),l4)
     2177 else ifeq ($(KBUILD_TARGET),l4)
    21782178TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
    21792179# no libs as yet in l4 target - must be added later
    2180  else ifeq ($(BUILD_TARGET),os2)
     2180 else ifeq ($(KBUILD_TARGET),os2)
    21812181TEMPLATE_VBOXMAINEXE_TOOL                = GXX3OMF
    21822182TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
    2183  else ifeq ($(BUILD_TARGET),darwin)
     2183 else ifeq ($(KBUILD_TARGET),darwin)
    21842184TEMPLATE_VBOXMAINEXE_TOOL                = GXX4MACHO
    21852185TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
    21862186TEMPLATE_VBOXMAINEXE_LDFLAGS.darwin      = -bind_at_load -framework Carbon
    2187  else if1of ($(BUILD_TARGET), freebsd netbsd openbsd)
     2187 else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd)
    21882188TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
    21892189TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
    2190  else ifeq ($(BUILD_TARGET),solaris)
     2190 else ifeq ($(KBUILD_TARGET),solaris)
    21912191TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
    21922192TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
    21932193TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) rt
    21942194 else
    2195 $(warning Warning: VBOX Build: Target $(BUILD_TARGET) is not officially supported!)
     2195$(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
    21962196TEMPLATE_VBOXMAINEXE_LIBS                =
    21972197 endif
    … …  
    22232223TEMPLATE_VBOXMAINDLL  = VBox Main Component (shared library)
    22242224TEMPLATE_VBOXMAINDLL_EXTENDS = VBOXMAINEXE
    2225 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    2226  ifneq ($(BUILD_TARGET),win)
     2225ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     2226 ifneq ($(KBUILD_TARGET),win)
    22272227  TEMPLATE_VBOXMAINDLL_DEFS     = PIC $(TEMPLATE_VBOXMAINEXE_DEFS)
    22282228  TEMPLATE_VBOXMAINDLL_CFLAGS   = -fPIC $(TEMPLATE_VBOXMAINEXE_CFLAGS)
    … …  
    22472247TEMPLATE_VBOXMAINCLIENTEXE             = VBox Main Client (executable)
    22482248TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS     = VBOXMAINEXE
    2249 ifeq ($(BUILD_TARGET),win)
     2249ifeq ($(KBUILD_TARGET),win)
    22502250 TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win   = $(TEMPLATE_VBOXMAINEXE_LIBS.win) \
    22512251   $(PATH_SDK_WINPSDK_LIB)/User32.Lib \
    … …  
    22712271TEMPLATE_VBOXMAINCLIENTDLL              = VBox MAIN Client (shared library)
    22722272TEMPLATE_VBOXMAINCLIENTDLL_EXTENDS      = VBOXMAINCLIENTEXE
    2273 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    2274  ifneq ($(BUILD_TARGET),win)
     2273ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     2274 ifneq ($(KBUILD_TARGET),win)
    22752275  TEMPLATE_VBOXMAINCLIENTDLL_DEFS       = PIC $(TEMPLATE_VBOXMAINCLIENTEXE_DEFS)
    22762276  TEMPLATE_VBOXMAINCLIENTDLL_CFLAGS     = -fPIC $(TEMPLATE_VBOXMAINCLIENTEXE_CFLAGS)
    … …  
    22912291        $(VBOX_PATH_QT)/include
    22922292
    2293 ifeq ($(BUILD_TARGET),win)
     2293ifeq ($(KBUILD_TARGET),win)
    22942294 # drag in library configuration (we need QMAKE_PRL_DEFINES)
    22952295 ifneq ($(LIB_QT_PRL),)
    … …  
    23512351        $(LIB_VMM)
    23522352
    2353  ifeq ($(BUILD_TARGET_ARCH),amd64)
     2353 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    23542354  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
    23552355        $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
    … …  
    23592359 endif
    23602360
    2361  ifeq ($(BUILD_TARGET),linux)
     2361 ifeq ($(KBUILD_TARGET),linux)
    23622362  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
    2363  else ifeq ($(BUILD_TARGET),darwin)
     2363 else ifeq ($(KBUILD_TARGET),darwin)
    23642364  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
    23652365  TEMPLATE_VBOXQTGUIEXE_LIBS +=
    23662366  TEMPLATE_VBOXQTGUIEXE_LIBPATH +=
    2367  else ifeq ($(BUILD_TARGET),os2)
     2367 else ifeq ($(KBUILD_TARGET),os2)
    23682368  # drag in library configuration (we need QMAKE_PRL_DEFINES)
    23692369  ifneq ($(LIB_QT_PRL),)
    … …  
    23842384  TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
    23852385        $(VBOX_LIBPATH_X11)
    2386   ifeq ($(BUILD_TARGET),freebsd)
     2386  ifeq ($(KBUILD_TARGET),freebsd)
    23872387   TEMPLATE_VBOXQTGUIEXE_INCS += \
    23882388        /usr/include \
    … …  
    23902390        /usr/local/include
    23912391  endif
    2392   ifeq ($(BUILD_TARGET),solaris)
     2392  ifeq ($(KBUILD_TARGET),solaris)
    23932393   TEMPLATE_VBOXQTGUIEXE_LIBS += \
    23942394        rt socket nsl
    … …  
    23962396 endif
    23972397 ifdef VBOX_WITH_ORIGIN
    2398   ifeq ($(BUILD_TARGET),solaris)
     2398  ifeq ($(KBUILD_TARGET),solaris)
    23992399   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN):$$(VBOX_ORIGIN)/qtgcc/lib'
    24002400  else
    … …  
    24232423TEMPLATE_VBOXQTGUI_EXTENDS = VBOXQTGUIEXE
    24242424TEMPLATE_VBOXQTGUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQTGUIEXE_LIBS))
    2425 ifeq ($(BUILD_TARGET),darwin)
     2425ifeq ($(KBUILD_TARGET),darwin)
    24262426 TEMPLATE_VBOXQTGUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS))
    24272427endif
    2428 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    2429  ifneq ($(BUILD_TARGET),win)
     2428ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     2429 ifneq ($(KBUILD_TARGET),win)
    24302430  TEMPLATE_VBOXQTGUI_DEFS     = PIC $(TEMPLATE_VBOXQTGUIEXE_DEFS)
    24312431  TEMPLATE_VBOXQTGUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQTGUIEXE_CFLAGS)
    … …  
    27082708#
    27092709TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
    2710 ifeq ($(BUILD_TARGET),win) # quick hack
     2710ifeq ($(KBUILD_TARGET),win) # quick hack
    27112711 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXW32GUESTR3
    27122712else
    … …  
    27232723                                    $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) \
    27242724                                    HC_ARCH_BITS=32 GC_ARCH_BITS=32
    2725 if1of ($(BUILD_TARGET),l4 linux) # As few libs as possible on linux.
     2725if1of ($(KBUILD_TARGET),l4 linux) # As few libs as possible on linux.
    27262726 TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
    27272727endif
    2728 ifeq ($(BUILD_TARGET),l4) # cross building linux on l4.
     2728ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4.
    27292729 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG  = linux
    27302730 TEMPLATE_VBOXGUESTR3EXE_DLLSUFF  = .so
    … …  
    27382738TEMPLATE_VBOXGUESTR3DLL_EXTENDS  = VBOXGUESTR3EXE
    27392739## @todo add a INSTFUN that separates dlls and libs.
    2740 ifn1of ($(BUILD_TARGET), os2 win)
     2740ifn1of ($(KBUILD_TARGET), os2 win)
    27412741 TEMPLATE_VBOXGUESTR3DLL_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
    27422742 TEMPLATE_VBOXGUESTR3DLL_CFLAGS     = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
    … …  
    27512751TEMPLATE_VBOXGUESTR3LIB_EXTENDS = VBOXGUESTR3EXE
    27522752TEMPLATE_VBOXGUESTR3LIB_INST    = $(INST_ADDITIONS_LIB)
    2753 if1of ($(BUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.
     2753if1of ($(KBUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.
    27542754 TEMPLATE_VBOXGUESTR3LIB_DEFS       = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
    27552755 TEMPLATE_VBOXGUESTR3LIB_CFLAGS     = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
    … …  
    27652765TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE
    27662766TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE)
    2767 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(BUILD_TARGET)    = $(NO_SUCH_VARIABLE)
     2767TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
    27682768TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
    2769 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TARGET) = $(NO_SUCH_VARIABLE)
     2769TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
    27702770TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(BUILD_TYPE)   = $(NO_SUCH_VARIABLE)
    27712771TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux           = $(NO_SUCH_VARIABLE)
    27722772TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 = -r
    2773 if1of ($(BUILD_TARGET), freebsd linux l4 netbsd openbsd) # the gnu ld guys.
     2773if1of ($(KBUILD_TARGET), freebsd linux l4 netbsd openbsd) # the gnu ld guys.
    27742774 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S
    27752775 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
    … …  
    27912791TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
    27922792TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(BUILD_TYPE)      = $(NO_SUCH_VARIABLE)
    2793 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(BUILD_TARGET)    = $(NO_SUCH_VARIABLE)
     2793TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
    27942794TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
    27952795TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS                  = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
    27962796TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
    2797 if1of ($(BUILD_TARGET), linux l4)
     2797if1of ($(KBUILD_TARGET), linux l4)
    27982798 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) -s
    27992799endif
    … …  
    28102810TEMPLATE_VBOXGUESTR3CPPEXE         = VBox Guest Program with C++ library dependencies
    28112811TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS = VBOXGUESTR3EXE
    2812 ifeq ($(BUILD_TARGET),win)
     2812ifeq ($(KBUILD_TARGET),win)
    28132813 # later
    28142814else
    … …  
    28272827TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = WIN32SDK W2K3DDKX86
    28282828TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
    2829 ifn1of ($(BUILD_TARGET),l4 linux) # must be same as the host.
     2829ifn1of ($(KBUILD_TARGET),l4 linux) # must be same as the host.
    28302830 TEMPLATE_VBOXGUESTR0_DEFS      = $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS)) IN_GUEST IN_GUEST_R0 HC_ARCH_BITS=32 GC_ARCH_BITS=32
    28312831 TEMPLATE_VBOXGUESTR0_BLD_TRG_ARCH = x86
    … …  
    28342834 TEMPLATE_VBOXGUESTR0_DEFS      = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0
    28352835endif
    2836 ifeq ($(BUILD_TARGET),l4) # cross building linux on l4.
     2836ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4.
    28372837 TEMPLATE_VBOXGUESTR0_BLD_TRG   = linux
    28382838 TEMPLATE_VBOXGUESTR0_SYSSUFF   = .ko
    … …  
    29062906
    29072907ifndef VBOX_OSE
    2908 if1of ($(BUILD_TARGET),freebsd linux netbsd openbsd solaris)
     2908if1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd solaris)
    29092909# VBOX_LICENSE_VER is used in several Makefiles
    29102910VBOX_LICENSE_SRC    := $(PATH_ROOT)/doc/License.html

  • trunk/Makefile.kmk

    r8155 r8758  
    4343
    4444# The SDL DLLs
    45 if1of ($(BUILD_TARGET), win os2)
     45if1of ($(KBUILD_TARGET), win os2)
    4646 ifneq ($(VBOX_WITH_VBOXSDL)$(VBOX_WITH_VBOXBFE),)
    4747  include $(PATH_KBUILD)/sdks/LIBSDL.kmk
    … …  
    5252        $(DLL_SDK_LIBSDL_SDLTTF)
    5353  endif
    54   ifeq ($(BUILD_TARGET),os2)
     54  ifeq ($(KBUILD_TARGET),os2)
    5555   bin_SOURCES += \
    5656        $(DLL_SDK_LIBSDL_FSLIB)
    … …  
    6262# The Qt DLLs.
    6363ifneq ($(VBOX_WITH_QTGUI),)
    64  if1of ($(BUILD_TARGET), win os2)
     64 if1of ($(KBUILD_TARGET), win os2)
    6565  #include $(PATH_KBUILD)/sdks/QT3.kmk
    6666  #bin_SOURCES += \
    … …  
    8181
    8282# The compiler runtime DLLs.
    83 ifeq ($(BUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
     83ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
    8484 ifdef VBOX_USE_VCC80
    8585  include $(PATH_KBUILD)/tools/VCC80X86.kmk
    … …  
    103103  VBOX_INSTALL_VCC70_RT = 1
    104104 endif
    105  ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),win.x86)
     105 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
    106106  VBOX_INSTALL_VCC70_RT = 1
    107107 endif
    … …  
    161161# compile things.
    162162#
    163 ifn1of ($(BUILD_TARGET), l4 linux win)
     163ifn1of ($(KBUILD_TARGET), l4 linux win)
    164164 VBOX_PATH_STAGED ?= .
    165165
    … …  
    398398        $(APPEND) [email protected] "INPUT = $(DOXYGEN_INPUT)"
    399399        $(APPEND) [email protected]
    400         $(APPEND) [email protected] "PREDEFINED += $(DEFS) $(DEFS.$(BUILD_TARGET)) $(DEFS.$(BUILD_TARGET_ARCH)) $(ARCH_BITS_DEFS)"
     400        $(APPEND) [email protected] "PREDEFINED += $(DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(ARCH_BITS_DEFS)"
    401401        $(APPEND) [email protected] "PREDEFINED += ARCH_BITS=HC_ARCH_BITS R3_ARCH_BITS=HC_ARCH_BITS R0_ARCH_BITS=HC_ARCH_BITS "
    402402        $(APPEND) [email protected]
    … …  
    545545
    546546additions-build-win.x86:
    547 ifeq ($(BUILD_TARGET),win)
     547ifeq ($(KBUILD_TARGET),win)
    548548        + $(KMK) BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD)
    549549else
    … …  
    552552
    553553additions-build-solaris.x86:
    554 ifeq ($(BUILD_TARGET),solaris)
     554ifeq ($(KBUILD_TARGET),solaris)
    555555        + $(KMK) BUILD_TARGET_ARCH=x86 $(VBOX_ADDITIONS_BUILD)
    556556else
    … …  
    559559
    560560additions-build-os2.x86:
    561 #ifeq ($(BUILD_TARGET),os2)
     561#ifeq ($(KBUILD_TARGET),os2)
    562562#       + $(KMK) BUILD_TARGET_ARCH=x86
    563563#else
    … …  
    566566
    567567additions-build-linux.x86:
    568 ifeq ($(BUILD_TARGET),linux)
     568ifeq ($(KBUILD_TARGET),linux)
    569569        + $(KMK) BUILD_TARGET_ARCH=x86 VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD)
    570570else

  • trunk/src/VBox/Additions/Makefile.kmk

    r8298 r8758  
    5454 VBOX_WITH_ADDITIONS_ISO.linux.x86 = 1
    5555endif
    56 ifeq ($(BUILD_TARGET),solaris)
     56ifeq ($(KBUILD_TARGET),solaris)
    5757 VBOX_WITH_ADDITIONS_ISO.solaris.x86 = 1
    5858endif
    59 ifeq ($(BUILD_TARGET),freebsd)
     59ifeq ($(KBUILD_TARGET),freebsd)
    6060 VBOX_WITH_ADDITIONS_ISO.freebsd.x86 = 1
    6161endif
    … …  
    7272 include $(PATH_SUB_CURRENT)/x11/Makefile.kmk
    7373endif
    74 ifeq ($(BUILD_TARGET),solaris)
     74ifeq ($(KBUILD_TARGET),solaris)
    7575 include $(PATH_SUB_CURRENT)/solaris/Makefile.kmk
    7676endif
    77 ifeq ($(BUILD_TARGET),freebsd)
     77ifeq ($(KBUILD_TARGET),freebsd)
    7878 include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk
    7979endif

  • trunk/src/VBox/Additions/common/Makefile.kmk

    r8155 r8758  
    2626# Include sub-makefile.
    2727include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
    28 if1of ($(BUILD_TARGET), freebsd os2 solaris)
     28if1of ($(KBUILD_TARGET), freebsd os2 solaris)
    2929include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
    3030include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk

  • trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

    r8155 r8758  
    2626# PORTME: OSes using mixed case driver names join OS/2, the others join Solaris below.
    2727
    28 if1of ($(BUILD_TARGET), os2)
     28if1of ($(KBUILD_TARGET), os2)
    2929 #
    3030 # VBoxGuest - The Guest Additions Driver (mixed case).
    … …  
    3737 VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_HGCM
    3838 VBoxGuest_INCS         := $(PATH_SUB_CURRENT)
    39  ifneq ($(BUILD_TARGET),os2)
     39 ifneq ($(KBUILD_TARGET),os2)
    4040  VBoxGuest_SOURCES    = \
    41         VBoxGuest-$(BUILD_TARGET).cpp \
     41        VBoxGuest-$(KBUILD_TARGET).cpp \
    4242        VBoxGuest.cpp
    4343  VBoxGuest_LIBS          = \
    … …  
    7272 endif # OS/2
    7373
    74 else if1of ($(BUILD_TARGET), freebsd solaris)
     74else if1of ($(KBUILD_TARGET), freebsd solaris)
    7575 #
    7676 # vboxguest - The Guest Additions Driver (lower cased).
    … …  
    8585        $(PATH_TARGET)
    8686 vboxguest_SOURCES       = \
    87         VBoxGuest-$(BUILD_TARGET).c \
     87        VBoxGuest-$(KBUILD_TARGET).c \
    8888        VBoxGuest.cpp
    8989 vboxguest_LIBS          = \

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    r8155 r8758  
    2727# Target config.
    2828#
    29 ifn1of ($(BUILD_TARGET),l4 linux win)
     29ifn1of ($(KBUILD_TARGET),l4 linux win)
    3030 LIBRARIES += \
    3131        VBoxGuestR0Lib \
    … …  
    3434        VBoxGuestR3Lib \
    3535        VBoxGuestR3LibShared
    36  if1of ($(BUILD_TARGET),freebsd linux netbsd openbsd)
     36 if1of ($(KBUILD_TARGET),freebsd linux netbsd openbsd)
    3737  LIBRARIES += \
    3838        VBoxGuestR3LibXFree86
    … …  
    6262
    6363ifndef VBOX_WITH_ADDITION_DRIVERS
    64  if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     64 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
    6565  LIBRARIES := $(filter-out VBoxGuestR0Lib VBoxGuestR0LibBase, $(LIBRARIES))
    6666 endif

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r8372 r8758  
    2525
    2626# This can only be built on a real Linux system.
    27 if1of ($(BUILD_TARGET),linux l4)
     27if1of ($(KBUILD_TARGET),linux l4)
    2828 include $(PATH_SUB_CURRENT)/module/Makefile.kmk
    2929 include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk

  • trunk/src/VBox/Additions/x11/Makefile.kmk

    r8155 r8758  
    2424
    2525# Include sub-makefiles.
    26 if1of ($(BUILD_TARGET), freebsd l4 linux solaris)
     26if1of ($(KBUILD_TARGET), freebsd l4 linux solaris)
    2727 include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk
    2828 include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk

  • trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

    r8155 r8758  
    2727# vboxvideo_drv
    2828#
    29 if1of ($(BUILD_TARGET),linux l4)
     29if1of ($(KBUILD_TARGET),linux l4)
    3030 SYSMODS += vboxvideo_drv
    3131 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
    … …  
    115115DLLS += vboxvideo_drv_70
    116116vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
    117 if1of ($(BUILD_TARGET), l4 linux)
     117if1of ($(KBUILD_TARGET), l4 linux)
    118118 vboxvideo_drv_70_CFLAGS += \
    119119        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
    … …  
    121121vboxvideo_drv_70_DEFS := \
    122122        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1
    123 ifeq ($(BUILD_TARGET),solaris) # don't use .solaris or anything here.
     123ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
    124124 vboxvideo_drv_70_DEFS += _XPG6 __EXTENSIONS__
    125125endif

  • trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

    r8155 r8758  
    2828# vboxmouse_drv
    2929#
    30 if1of ($(BUILD_TARGET),linux l4)
     30if1of ($(KBUILD_TARGET),linux l4)
    3131 SYSMODS += vboxmouse_drv
    3232 vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
    … …  
    6565vboxmouse_drv_70_DEFS = \
    6666        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
    67 ifeq ($(BUILD_TARGET),solaris) # don't use .solaris or anything here.
     67ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
    6868 vboxmouse_drv_70_DEFS += _XPG6 __EXTENSIONS__
    6969endif

  • trunk/src/VBox/Debugger/Makefile.kmk

    r8155 r8758  
    133133        $(LIB_VMM) \
    134134        $(LIB_RUNTIME)
    135 ifeq ($(BUILD_TARGET),win)
     135ifeq ($(KBUILD_TARGET),win)
    136136tstVBoxDbg_LIBS        += \
    137137        $(PATH_LIB)/VBoxDbg.lib

  • trunk/src/VBox/Devices/Makefile.kmk

    r8611 r8758  
    100100        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
    101101endif
    102 ifeq ($(BUILD_TARGET),l4)
     102ifeq ($(KBUILD_TARGET),l4)
    103103 VBoxDDU_LIBS           += \
    104104        $(L4_LIBDIR)/libl4sys.p.a
    … …  
    117117# VBoxDDULnxHostR3 (Only needed for l4, currently for executing vditool on L4Linux.)
    118118#
    119 ifeq ($(BUILD_TARGET),l4)
     119ifeq ($(KBUILD_TARGET),l4)
    120120 LIBRARIES                += VBoxDDULnxHostR3
    121121 VBoxDDULnxHostR3_TEMPLATE = VBOXLNXHOSTR3LIB
    … …  
    159159        $(LIB_VMM) \
    160160        $(LIB_RUNTIME)
    161 ifeq ($(BUILD_TARGET),win)
     161ifeq ($(KBUILD_TARGET),win)
    162162 VBoxDD_LIBS           += \
    163163        $(LIB_DDU) \
    … …  
    169169        $(INSTARGET_VBoxDD2)
    170170endif
    171 ifeq ($(BUILD_TARGET),l4)
     171ifeq ($(KBUILD_TARGET),l4)
    172172 VBoxDD_LIBS           += \
    173173        $(L4_LIBDIR)/libl4sys.p.a
    174174endif
    175 ifeq ($(BUILD_TARGET),solaris)
     175ifeq ($(KBUILD_TARGET),solaris)
    176176 VBoxDD_LIBS           += adm
    177177 ifdef VBOX_WITH_SUID_WRAPPER
    … …  
    191191
    192192# damn, fix this.
    193 ifeq ($(BUILD_TARGET),win)
     193ifeq ($(KBUILD_TARGET),win)
    194194$(PATH_LIB)/VBoxDD2.lib: $(PATH_BIN)/VBoxDD2.dll
    195195$(PATH_LIB)/VBoxDDU.lib: $(PATH_BIN)/VBoxDDU.dll
    … …  
    213213        $(LIB_VMM) \
    214214        $(LIB_RUNTIME)
    215 ifeq ($(BUILD_TARGET),l4)
     215ifeq ($(KBUILD_TARGET),l4)
    216216VBoxDD2_LIBS           += \
    217217        $(L4_LIBDIR)/libl4sys.p.a
    … …  
    497497# Drivers (library)
    498498#
    499 ifeq ($(BUILD_TARGET),l4) # We are using real Linux headers, not the cleaned up user space ones
     499ifeq ($(KBUILD_TARGET),l4) # We are using real Linux headers, not the cleaned up user space ones
    500500Drivers_TEMPLATE   = VBOXR3NP
    501501else
    … …  
    551551# -- OS specific --
    552552
    553 ifeq ($(BUILD_TARGET),darwin)
     553ifeq ($(KBUILD_TARGET),darwin)
    554554Drivers_SOURCES      := $(filter-out \
    555555        Storage/DrvHostRaw% \
    … …  
    560560endif # darwin
    561561
    562 ifeq ($(BUILD_TARGET),freebsd)
     562ifeq ($(KBUILD_TARGET),freebsd)
    563563Drivers_SOURCES      := $(filter-out \
    564564        Storage/DrvHost% \
    … …  
    568568
    569569
    570 ifeq ($(BUILD_TARGET),l4)
     570ifeq ($(KBUILD_TARGET),l4)
    571571Drivers_SOURCES       = \
    572572        Input/DrvMouseQueue.cpp \
    … …  
    598598        Serial/DrvHostSerial.cpp
    599599
    600 ifeq ($(BUILD_TARGET),os2)
     600ifeq ($(KBUILD_TARGET),os2)
    601601Drivers_SOURCES      := $(filter-out \
    602602        Storage/DrvHost% \
    … …  
    606606endif
    607607
    608 ifeq ($(BUILD_TARGET),solaris)
     608ifeq ($(KBUILD_TARGET),solaris)
    609609Drivers_SOURCES      := $(filter-out \
    610610        Storage/DrvHost% \

  • trunk/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk

    r8315 r8758  
    162162
    163163# Linker scripts.
    164 ifeq ($(BUILD_TARGET),win)
     164ifeq ($(KBUILD_TARGET),win)
    165165LDSCRIPT = arch/i386/core/etherboot-pe.lds
    166166PLDSCRIPT = arch/i386/core/etherboot.prefix-pe.lds
    … …  
    295295# the final binary to 0xffc00000 and filling out relocations incorrectly
    296296# (first occurrence is the call to prelocate in the pciprefix.o file).
    297 ifeq ($(filter-out darwin.x86 darwin.amd64 os2.x86 solaris.x86 solaris.amd64 win.x86 win.amd64 linux.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
     297ifeq ($(filter-out darwin.x86 darwin.amd64 os2.x86 solaris.x86 solaris.amd64 win.x86 win.amd64 linux.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
    298298$(PATH_TARGET)/pcnet32.zrom: pcnet32.zrom | $(call DIRDEP,$(PATH_TARGET))
    299299        $(CP) -f $< $@

  • trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

    r8155 r8758  
    2828#
    2929PROGRAMS += vditool
    30 ifeq ($(BUILD_TARGET),l4)
     30ifeq ($(KBUILD_TARGET),l4)
    3131 vditool_TEMPLATE = VBOXLNXHOSTR3EXE
    3232 vditool_LIBS     = \
    … …  
    4545ifdef VBOX_WITH_TESTCASES
    4646 PROGRAMS += tstVDI
    47  ifeq ($(BUILD_TARGET),l4)
     47 ifeq ($(KBUILD_TARGET),l4)
    4848  tstVDI_TEMPLATE = VBOXLNXHOSTR3EXE
    4949 else
    … …  
    5959ifdef VBOX_WITH_TESTCASES
    6060 PROGRAMS += tstVD
    61  ifeq ($(BUILD_TARGET),l4)
     61 ifeq ($(KBUILD_TARGET),l4)
    6262  tstVD_TEMPLATE = VBOXLNXHOSTR3EXE
    6363 else

  • trunk/src/VBox/Devices/testcase/Makefile.kmk

    r8757 r8758  
    2828# validation testcases. Perhaps a bit hackish, but extremely useful.
    2929#
    30 ifeq ($(BUILD_TARGET),$(KBUILD_HOST))
    31  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(BUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
     30ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     31 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    3232  OTHERS += \
    3333        $(PATH_TARGET)/tstDeviceStructSize.run

  • trunk/src/VBox/Disassembler/Makefile.kmk

    r8299 r8758  
    2828
    2929DisasmR3_TEMPLATE       = VBOXR3
    30 ifeq ($(BUILD_TARGET),win)
     30ifeq ($(KBUILD_TARGET),win)
    3131DisasmR3_CXXFLAGS      += -EHa
    3232else
    33  ifneq ($(BUILD_TARGET),l4)
     33 ifneq ($(KBUILD_TARGET),l4)
    3434DisasmR3_CXXFLAGS      += -fexceptions
    3535 endif

  • trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

    r8732 r8758  
    3636VBoxBFE_DEFS += VBOX_VRDP
    3737endif
    38 ifneq ($(BUILD_TARGET).$(VBOX_WITHOUT_COM),win.)
     38ifneq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COM),win.)
    3939VBoxBFE_DEFS += VBOXBFE_WITHOUT_COM
    4040endif
    … …  
    7979
    8080# SDL
    81 ifneq ($(BUILD_TARGET),l4)
     81ifneq ($(KBUILD_TARGET),l4)
    8282VBoxBFE_SDKS += LIBSDL
    8383VBoxBFE_DEFS += USE_SDL
    … …  
    8888
    8989# USB Support
    90 if1of ($(BUILD_TARGET), l4 win)
     90if1of ($(KBUILD_TARGET), l4 win)
    9191VBoxBFE_DEFS += VBOXBFE_WITH_USB
    9292VBoxBFE_SOURCES += \
    … …  
    103103        $(PATH_VBoxBFE) \
    104104        $(VBOX_PATH_SDK)/include
    105 ifneq ($(filter-out win os2 l4 darwin,$(BUILD_TARGET)),) # X11
     105ifneq ($(filter-out win os2 l4 darwin,$(KBUILD_TARGET)),) # X11
    106106VBoxBFE_INCS += \
    107107        $(VBOX_XCURSOR_INCS)
    … …  
    114114        $(LIB_RUNTIME) \
    115115        $(LIB_VMM)
    116 ifneq ($(filter-out win os2 l4,$(BUILD_TARGET)),)
     116ifneq ($(filter-out win os2 l4,$(KBUILD_TARGET)),)
    117117VBoxBFE_LIBS += \
    118118        $(LIB_REM)
    119119endif
    120 ifneq ($(filter-out win os2 l4 darwin,$(BUILD_TARGET)),) # X11
     120ifneq ($(filter-out win os2 l4 darwin,$(KBUILD_TARGET)),) # X11
    121121VBoxBFE_LIBS += \
    122122        $(VBOX_XCURSOR_LIBS) \

  • trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r8752 r8758  
    7171        $(PATH_BIN)/sdk/include \
    7272        $(PATH_VBoxSDL)
    73 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     73ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    7474VBoxSDL_INCS += \
    7575        $(VBOX_XCURSOR_INCS)
    … …  
    7979        /usr/local/include \
    8080        /usr/X11R6/include ## @todo figure this out.
    81 ifneq ($(filter-out win solaris,$(BUILD_TARGET)),)
     81ifneq ($(filter-out win solaris,$(KBUILD_TARGET)),)
    8282
    8383VBoxSDL_LIBS = \
    8484        $(LIB_SDK_LIBSDL_SDLMAIN)
    8585endif
    86 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     86ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    8787VBoxSDL_LIBS += \
    8888        $(VBOX_XCURSOR_LIBS) \
    … …  
    122122tstSDL_LIBS = \
    123123        $(LIB_RUNTIME)
    124 ifneq ($(filter-out win solaris,$(BUILD_TARGET)),)
     124ifneq ($(filter-out win solaris,$(KBUILD_TARGET)),)
    125125tstSDL_LIBS += \
    126126        $(LIB_SDK_LIBSDL_SDLMAIN)
    … …  
    130130tstSDL_LIBS.linux += GL
    131131endif
    132 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     132ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    133133tstSDL_LIBPATH = \
    134134        $(VBOX_LIBPATH_X11)

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r8748 r8758  
    8585#
    8686PROGRAMS = VirtualBox
    87 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(BUILD_TARGET)),) # X11
     87ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
    8888DLLS = VBoxKeyboard
    8989OTHERS = $(PATH_BIN)/vboxkeyboard.tar.gz
    … …  
    9191INSTALLS = VirtualBox.nls
    9292
    93 ifeq ($(BUILD_TARGET),os2)
     93ifeq ($(KBUILD_TARGET),os2)
    9494 DLLS += VBoxHlp
    9595 ifneq ($(strip $(VBOX_DLL_QT)),)
    … …  
    155155VirtualBox_TEMPLATE = VBOXQTGUIEXE
    156156VirtualBox_SDKS.win = WINPSDK DXSDK
    157 #ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(BUILD_TARGET)),) - later
    158 ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(BUILD_TARGET)),) # X11 + os2
     157#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(KBUILD_TARGET)),) - later
     158ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2
    159159VirtualBox_SDKS += LIBSDL
    160160endif
    161161
    162 ifeq ($(BUILD_TARGET),darwin)
     162ifeq ($(KBUILD_TARGET),darwin)
    163163# For the launch trick we need different inode numbers.
    164164VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
    … …  
    173173
    174174ifndef VBOX_OSE
    175 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # linux only, yea, right.
     175ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # linux only, yea, right.
    176176# Note: I'm doing this right here because the GUI will _not_ run
    177177#       without that file which might be annoying for developers!
    … …  
    213213# Sources containing local definitions of classes that use the Q_OBJECT macro
    214214VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
    215 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     215ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    216216VirtualBox_QT_MOCSRCS += src/VBoxGlobal.cpp
    217217endif
    … …  
    277277        src/VBoxNetworkFramework.cpp
    278278
    279 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     279ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    280280VirtualBox_SOURCES += \
    281281        src/linux/XKeyboard-new.cpp
    … …  
    305305VirtualBox_QT_UISRCS += ui/VBoxAboutDlg.ui
    306306
    307 ifneq ($(BUILD_TARGET),win)
     307ifneq ($(KBUILD_TARGET),win)
    308308src/HappyHttp.cpp_CXXFLAGS += -fexceptions
    309309src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
    … …  
    390390        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    391391VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
    392 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     392ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    393393VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    394394endif
    … …  
    396396
    397397ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
    398  ifeq ($(BUILD_TARGET),win)
     398 ifeq ($(KBUILD_TARGET),win)
    399399  VirtualBox_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
    400400 else

  • trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

    r8740 r8758  
    7070VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_QT3SUPPORT_LIB
    7171
    72 ifeq ($(BUILD_TARGET),darwin)
     72ifeq ($(KBUILD_TARGET),darwin)
    7373 VBOX_MODULE_QT4    += QtSql QtXml
    7474 VBOX_DEFS_QT4       = QT_SQL_LIB QT_XML_LIB
    … …  
    109109    $(VBOX_INCS_QT4)
    110110
    111 ifeq ($(BUILD_TARGET),win)
     111ifeq ($(KBUILD_TARGET),win)
    112112 # drag in library configuration (we need QMAKE_PRL_DEFINES)
    113113 ifneq ($(LIB_QT_PRL),)
    … …  
    170170        $(LIB_VMM)
    171171
    172  ifeq ($(BUILD_TARGET_ARCH),amd64)
     172 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    173173  TEMPLATE_VBOXQT4GUIEXE_LIBPATH = \
    174174        $(VBOX_PATH_QT4_LIB64) $(VBOX_PATH_QT4_LIB)
    … …  
    178178 endif
    179179
    180  ifeq ($(BUILD_TARGET),linux)
     180 ifeq ($(KBUILD_TARGET),linux)
    181181  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
    182182  TEMPLATE_VBOXQT4GUIEXE_LIBS += \
    183183    $(VBOX_XCURSOR_LIBS)
    184  else ifeq ($(BUILD_TARGET),darwin)
     184 else ifeq ($(KBUILD_TARGET),darwin)
    185185  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(foreach mod, $(VBOX_MODULE_QT4), -framework $(mod)) \
    186186        -framework Carbon -framework QuickTime -bind_at_load
    187187  TEMPLATE_VBOXQT4GUIEXE_LIBS +=
    188188  TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
    189  else ifeq ($(BUILD_TARGET),os2)
     189 else ifeq ($(KBUILD_TARGET),os2)
    190190  # drag in library configuration (we need QMAKE_PRL_DEFINES)
    191191  ifneq ($(LIB_QT_PRL),)
    … …  
    206206  TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
    207207        $(VBOX_LIBPATH_X11)
    208   ifeq ($(BUILD_TARGET),freebsd)
     208  ifeq ($(KBUILD_TARGET),freebsd)
    209209   TEMPLATE_VBOXQT4GUIEXE_INCS += \
    210210        /usr/include \
    … …  
    234234TEMPLATE_VBOXQT4GUI_EXTENDS = VBOXQTGUIEXE
    235235TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS))
    236 ifeq ($(BUILD_TARGET),darwin)
     236ifeq ($(KBUILD_TARGET),darwin)
    237237 TEMPLATE_VBOXQT4GUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS))
    238238endif
    239 ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
    240  ifneq ($(BUILD_TARGET),win)
     239ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
     240 ifneq ($(KBUILD_TARGET),win)
    241241  TEMPLATE_VBOXQT4GUI_DEFS     = PIC $(TEMPLATE_VBOXQT4GUIEXE_DEFS)
    242242  TEMPLATE_VBOXQT4GUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CFLAGS)
    … …  
    296296#
    297297PROGRAMS = VirtualBox
    298 ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(BUILD_TARGET)),) # X11
     298ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
    299299DLLS = VBoxKeyboard4
    300300OTHERS = $(PATH_BIN)/vboxkeyboard4.tar.gz
    … …  
    302302INSTALLS = VirtualBox.nls
    303303
    304 ifeq ($(BUILD_TARGET),os2)
     304ifeq ($(KBUILD_TARGET),os2)
    305305 DLLS += VBoxHlp
    306306 ifneq ($(strip $(VBOX_DLL_QT)),)
    … …  
    367367VirtualBox_NAME     = VirtualBox4
    368368VirtualBox_SDKS.win = WINPSDK DXSDK
    369 #ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(BUILD_TARGET)),) - later
    370 ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(BUILD_TARGET)),) # X11 + os2
     369#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(KBUILD_TARGET)),) - later
     370ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2
    371371VirtualBox_SDKS += LIBSDL
    372372endif
    373373
    374 ifeq ($(BUILD_TARGET),darwin)
     374ifeq ($(KBUILD_TARGET),darwin)
    375375# For the launch trick we need different inode numbers.
    376376VirtualBox_INST = $(INST_BIN)VirtualBox4 $(INST_BIN)VirtualBoxVM4
    … …  
    385385
    386386ifndef VBOX_OSE
    387 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # linux only, yea, right.
     387ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # linux only, yea, right.
    388388# Note: I'm doing this right here because the GUI will _not_ run
    389389#       without that file which might be annoying for developers!
    … …  
    440440# Sources containing local definitions of classes that use the Q_OBJECT macro
    441441VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
    442 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     442ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    443443VirtualBox_QT_MOCSRCS += src/VBoxGlobal.cpp
    444444endif
    … …  
    520520        src/VBoxVMLogViewer.cpp
    521521
    522 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     522ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    523523VirtualBox_SOURCES += \
    524524        src/linux/XKeyboard-new.cpp
    … …  
    543543endif
    544544
    545 ifneq ($(BUILD_TARGET),win)
     545ifneq ($(KBUILD_TARGET),win)
    546546src/HappyHttp.cpp_CXXFLAGS += -fexceptions
    547547src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
    … …  
    628628        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    629629VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
    630 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
     630ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    631631VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL)
    632632endif
    … …  
    634634
    635635ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
    636  ifeq ($(BUILD_TARGET),win)
     636 ifeq ($(KBUILD_TARGET),win)
    637637  VirtualBox_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
    638638 else

  • trunk/src/VBox/HostDrivers/Makefile.kmk

    r8155 r8758  
    2525# Include sub-makefiles.
    2626include $(PATH_SUB_CURRENT)/Support/Makefile.kmk
    27 ifeq ($(BUILD_TARGET),win)
     27ifeq ($(KBUILD_TARGET),win)
    2828 include $(PATH_SUB_CURRENT)/VBoxTAP/Makefile.kmk
    2929endif

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r8732 r8758  
    8888# The Ring-3 Support Library (this is linked into the IPRT dll, VBoxRT).
    8989#
    90 ifneq ($(filter l4%,$(BUILD_TARGET) $(BUILD_TARGET_SUB)),)
     90ifneq ($(filter l4%,$(KBUILD_TARGET) $(BUILD_TARGET_SUB)),)
    9191# L4 has trouble with -pedantic. It also make trouble when inlining is not enabled.
    9292SUPR3_TEMPLATE      = VBOXR3NP
    … …  
    102102SUPR3_SOURCES       = \
    103103        SUPLib.cpp \
    104         $(BUILD_TARGET)/SUPLib-$(BUILD_TARGET).cpp
     104        $(KBUILD_TARGET)/SUPLib-$(KBUILD_TARGET).cpp
    105105
    106106#
    … …  
    122122# VBoxDrv.sys - The Windows driver.
    123123#
    124 ifeq ($(BUILD_TARGET),win)
     124ifeq ($(KBUILD_TARGET),win)
    125125VBoxDrv_TEMPLATE      = VBOXR0DRV
    126126ifdef VBOX_SIGNING_MODE
    … …  
    177177# vboxdrv.ko - The Linux Kernel Module (syntax only).
    178178#
    179 ifeq ($(BUILD_TARGET),linux)
     179ifeq ($(KBUILD_TARGET),linux)
    180180vboxdrv_TEMPLATE      = VBOXR0DRV
    181181vboxdrv_DEFS          = KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE IN_RT_R0 IN_SUP_R0 CONFIG_VBOXDRV_AS_MISC USE_NEW_OS_INTERFACE_FOR_MM
    … …  
    189189vboxdrv_LIBS.debug    = $(vboxdrv_LIBS) $(VBOX_GCC_LIBGCC)
    190190vboxdrv_SOURCES       = \
    191         $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c \
     191        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \
    192192        SUPDRVShared.c
    193193ifndef VBOX_LINUX_VERSION_2_4
    194194vboxdrv_SOURCES      += \
    195         $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).mod.c
     195        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).mod.c
    196196endif
    197197endif # real linux
    … …  
    201201# VBoxDrv.kext - The Darwin Kernel Extension.
    202202#
    203 ifeq ($(BUILD_TARGET),darwin)
     203ifeq ($(KBUILD_TARGET),darwin)
    204204VBoxDrv_TEMPLATE      = VBOXR0DRV
    205205VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    … …  
    214214VBoxDrv_SOURCES       = \
    215215        SUPDRVShared.c \
    216         $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).cpp
     216        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).cpp
    217217
    218218INSTALLS += VBoxDrv.kext
    … …  
    244244# VBoxDrv.sys - The OS/2 driver.
    245245#
    246 ifeq ($(BUILD_TARGET),os2)
     246ifeq ($(KBUILD_TARGET),os2)
    247247VBoxDrv_TEMPLATE      = VBOXR0DRV
    248248VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    … …  
    276276# vboxdrv.ko - The FreeBSD Kernel Module.
    277277#
    278 ifeq ($(BUILD_TARGET),freebsd)
     278ifeq ($(KBUILD_TARGET),freebsd)
    279279vboxdrv_TEMPLATE      = VBOXR0DRV
    280280vboxdrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    … …  
    285285vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    286286vboxdrv_SOURCES       = \
    287         $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c \
     287        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \
    288288        SUPDRVShared.c
    289289endif # freebsd
    … …  
    293293# vboxdrv.o - The Solaris Kernel Module.
    294294#
    295 ifeq ($(BUILD_TARGET),solaris)
     295ifeq ($(KBUILD_TARGET),solaris)
    296296vboxdrv_TEMPLATE      = VBOXR0DRV
    297297vboxdrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE
    … …  
    302302vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    303303vboxdrv_SOURCES       = \
    304         $(BUILD_TARGET)/SUPDrv-$(BUILD_TARGET).c \
     304        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \
    305305        SUPDRVShared.c
    306306endif # solaris

  • trunk/src/VBox/HostServices/Makefile.kmk

    r8155 r8758  
    2727 include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
    2828endif
    29 if1of ($(BUILD_TARGET), win linux solaris)
     29if1of ($(KBUILD_TARGET), win linux solaris)
    3030 ifdef VBOX_WITH_OGL
    3131  include $(PATH_SUB_CURRENT)/SharedOpenGL/Makefile.kmk
    3232 endif
    3333endif
    34 if1of ($(BUILD_TARGET), win linux solaris darwin)
     34if1of ($(KBUILD_TARGET), win linux solaris darwin)
    3535 ifdef VBOX_WITH_SHARED_CLIPBOARD
    3636  include $(PATH_SUB_CURRENT)/SharedClipboard/Makefile.kmk

  • trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

    r8155 r8758  
    4141        clipboard-helper.cpp \
    4242        darwin-pasteboard.cpp
    43 if1of ($(BUILD_TARGET),linux solaris) ## @todo X11
     43if1of ($(KBUILD_TARGET),linux solaris) ## @todo X11
    4444 ifndef VBOX_HEADLESS
    4545  VBoxSharedClipboard_SOURCES += \
    … …  
    5656        $(LIB_RUNTIME) \
    5757        $(LIB_REM)
    58 if1of ($(BUILD_TARGET),linux solaris)
     58if1of ($(KBUILD_TARGET),linux solaris)
    5959 ifndef VBOX_HEADLESS
    6060  VBoxSharedClipboard_LIBPATH = \

  • trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

    r8757 r8758  
    4343endif # VBOX_WITH_TESTCASES
    4444
    45 ifeq ($(BUILD_TARGET),$(KBUILD_HOST))
    46  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(BUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
     45ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     46 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    4747   OTHERS += \
    4848    $(PATH_TARGET)/tstShflSizes.run

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r8757 r8758  
    8989        VMMGC.gc \
    9090        VMMR0.r0
    91 ifeq ($(BUILD_TARGET_ARCH),amd64)
     91ifeq ($(KBUILD_TARGET_ARCH),amd64)
    9292LINUXSTRIPOBJ += \
    9393        VBoxREM2.rel

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r8757 r8758  
    3232SOL_DBG_OBJCOPY  := $(CP) -p    # Solaris ld/gobjcopy(2.15) don't get along on x86, works only on amd64. So just using cp for now.
    3333PKGINFO_ARCH     = $(shell uname -p)
    34 PKG_FILENAME     = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(BUILD_TARGET_ARCH)-r$(VBOX_SVN_REV)
     34PKG_FILENAME     = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV)
    3535DBG_ARCHIVE      = VirtualBox-dbg.tar.bz2
    3636
    … …  
    9090        VMMR0.r0
    9191
    92 ifeq ($(BUILD_TARGET_ARCH),amd64)
     92ifeq ($(KBUILD_TARGET_ARCH),amd64)
    9393SOL64_PKG = 1
    9494SOLARIS_STRIP_OBJS += \
    … …  
    288288        $(QUIET)$(SED) \
    289289                -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
    290                 -e "s/@BUILD_TARGET_ARCH@/$(BUILD_TARGET_ARCH)/g" \
     290                -e "s/@BUILD_TARGET_ARCH@/$(KBUILD_TARGET_ARCH)/g" \
    291291                -e "s/@VBOX_SVN_REV@/$(VBOX_SVN_REV)/g" \
    292292                --output $(SOLARIS_INST_DIR)/ReadMe.txt \
    293293                $(PATH_ROOT)/doc/ReadMe-Solaris.txt
    294294        $(call MSG_L1,Creating install package: $(PKG_FILENAME).tar.gz)
    295         $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKG_FILENAME) $(BUILD_TARGET_ARCH)
     295        $(QUIET)$(SOLARIS_INST_DIR)/makepackage.sh $(SOLARIS_INST_DIR) $(PKG_FILENAME) $(KBUILD_TARGET_ARCH)
    296296        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_INST_DIR)/$(PKG_FILENAME).tar.gz $(PATH_BIN)
    297297        @# Clean up files emitted as side-effect or result of packing

  • trunk/src/VBox/Main/Makefile.kmk

    r8754 r8758  
    3838PROGRAMS        += VBoxSVC
    3939VBOX_MAIN_DEFS   =
    40 ifneq ($(BUILD_TARGET),win)
     40ifneq ($(KBUILD_TARGET),win)
    4141 ifndef VBOX_WITH_XPCOM
    4242  $(error "VBox: VBOX_WITH_XPCOM isn't defined")
    4343 endif
    4444 DLLS           += VBoxSVCM
    45  ifneq ($(BUILD_TARGET),os2)
     45 ifneq ($(KBUILD_TARGET),os2)
    4646  VBOX_MAIN_DEFS+= VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
    4747 endif
    … …  
    6060#PROGRAMS        += tstCFGLdr
    6161
    62 ifeq ($(BUILD_TARGET),win)
     62ifeq ($(KBUILD_TARGET),win)
    6363 OTHERS         += $(PATH_BIN)/comregister.cmd
    6464 IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox.idl
    … …  
    7575 INSTALLS       += xpcom-components
    7676 IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
    77  ifeq ($(BUILD_TARGET),linux)
     77 ifeq ($(KBUILD_TARGET),linux)
    7878  IDLTYPELIB     = $(PATH_BIN)/VirtualBox_XPCOM.xpt
    7979 else
    … …  
    268268
    269269VBoxSVCM_TEMPLATE       = VBOXMAINDLL
    270 ifneq ($(BUILD_TARGET),linux)
     270ifneq ($(KBUILD_TARGET),linux)
    271271VBoxSVCM_INST           = $(INST_BIN)components/
    272272endif
    … …  
    284284        -install_name @executable_path/components/VBoxSVCM.dylib \
    285285        -exported_symbols_list $(PATH_TARGET)/VBoxSVCM.def
    286 ifeq ($(BUILD_TARGET),darwin)
     286ifeq ($(KBUILD_TARGET),darwin)
    287287VBoxSVCM_ORDERDEPS     += $(PATH_TARGET)/VBoxSVCM.def
    288288VBoxSVCM_CLEAN         += $(PATH_TARGET)/VBoxSVCM.def
    … …  
    299299#
    300300VBoxC_TEMPLATE = VBOXMAINDLL
    301 ifneq ($(filter-out linux win,$(BUILD_TARGET)),)
     301ifneq ($(filter-out linux win,$(KBUILD_TARGET)),)
    302302VBoxC_INST = $(INST_BIN)components/
    303303endif
    … …  
    406406endif
    407407
    408 ifeq ($(BUILD_TARGET),darwin)
     408ifeq ($(KBUILD_TARGET),darwin)
    409409VBoxC_ORDERDEPS += $(PATH_TARGET)/VBoxC.def
    410410VBoxC_CLEAN += $(PATH_TARGET)/VBoxC.def
    … …  
    419419Version.cpp_DEPS = $(VBOX_SVN_REV_KMK)
    420420
    421 ConsoleImpl.cpp_DEFS = VBOX_BUILD_TARGET=\"$(BUILD_TARGET).$(BUILD_TARGET_ARCH)\"
     421ConsoleImpl.cpp_DEFS = VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    422422
    423423win32/VBoxC.rc_DEPS = $(PATH_TARGET)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
    … …  
    449449        glue/EventQueue.cpp \
    450450        glue/ErrorInfo.cpp
    451 ifeq ($(BUILD_TARGET),win)
     451ifeq ($(KBUILD_TARGET),win)
    452452 VBoxCOM_DEFS.x86      += _WIN32_WINNT=0x0500
    453453 VBoxCOM_DEFS.amd64    += _WIN32_WINNT=0x0510
    … …  
    465465# Generate _DEPS on all sources which depends on generated headers.
    466466#
    467 ifeq ($(BUILD_TARGET),win)
     467ifeq ($(KBUILD_TARGET),win)
    468468PREREQS = $(PATH_VBoxCOM)/VirtualBox_i.c
    469469else
    … …  
    476476endef
    477477$(foreach src,\
    478         $(VBoxC_SOURCES)   $(VBoxC_SOURCES.$(BUILD_TARGET)) \
    479         $(VBoxSVC_SOURCES) $(VBoxSVC_SOURCES.$(BUILD_TARGET)) \
     478        $(VBoxC_SOURCES)   $(VBoxC_SOURCES.$(KBUILD_TARGET)) \
     479        $(VBoxSVC_SOURCES) $(VBoxSVC_SOURCES.$(KBUILD_TARGET)) \
    480480        $(VBoxCOM_SOURCES) \
    481481        ,$(eval $(value def_src_deps)))
    … …  
    503503        $(VBOX_XML_SCHEMA_H) $(VBOX_XML_SCHEMA_COMMON_H) $(VBOX_XML_CONVERTER_TEMPLATE_H)
    504504
    505 $(VBOX_XML_SCHEMA_H): $(VBOX_XML_SCHEMA.$(BUILD_TARGET)) $(VBOX_BIN2C)
     505$(VBOX_XML_SCHEMA_H): $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_BIN2C)
    506506        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    507507        $(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_xsd $< $@
    … …  
    533533VBoxSVC_SOURCES += $(VBOX_XML_SCHEMADEFS_CPP)
    534534
    535 $(VBOX_XML_SCHEMADEFS_H): $(VBOX_XML_SCHEMADEFS_XSL) $(VBOX_XML_SCHEMA.$(BUILD_TARGET)) $(VBOX_XML_SCHEMA_COMMON)
     535$(VBOX_XML_SCHEMADEFS_H): $(VBOX_XML_SCHEMADEFS_XSL) $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_XML_SCHEMA_COMMON)
    536536        $(call MSG_TOOL,xsltproc,SchemaDefs,$<,$@)
    537537        $(QUIET)$(VBOX_XSLTPROC)  --stringparam mode declare -o $@ $(filter-out $(VBOX_XML_SCHEMA_COMMON),$^)
    538538
    539 $(VBOX_XML_SCHEMADEFS_CPP): $(VBOX_XML_SCHEMADEFS_XSL) $(VBOX_XML_SCHEMA.$(BUILD_TARGET)) $(VBOX_XML_SCHEMA_COMMON)
     539$(VBOX_XML_SCHEMADEFS_CPP): $(VBOX_XML_SCHEMADEFS_XSL) $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_XML_SCHEMA_COMMON)
    540540        $(call MSG_TOOL,xsltproc,SchemaDefs,$<,$@)
    541541        $(QUIET)$(VBOX_XSLTPROC)  --stringparam mode define -o $@ $(filter-out $(VBOX_XML_SCHEMA_COMMON),$^)
    … …  
    551551
    552552xpcom-components_INST = $(INST_BIN)components/
    553 ifeq ($(BUILD_TARGET),linux)
     553ifeq ($(KBUILD_TARGET),linux)
    554554xpcom-components_SYMLINKS = \
    555555        VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \
    … …  
    586586XIDLFILE = idl/VirtualBox.xidl
    587587
    588 ifneq ($(BUILD_TARGET),win)
     588ifneq ($(KBUILD_TARGET),win)
    589589
    590590linux/helpers.cpp: $(IDLTYPELIB)

  • trunk/src/VBox/Main/testcase/Makefile.kmk

    r8505 r8758  
    4545samples_INST = $(INST_SDK_SAMPLES)/API/
    4646samples_MODE = a+r,u+w
    47 ifeq ($(BUILD_TARGET),win)
     47ifeq ($(KBUILD_TARGET),win)
    4848 samples_SOURCES = tstVBoxAPIWin.cpp
    4949else
    … …  
    5959tstAPI_TEMPLATE = VBOXMAINCLIENTEXE
    6060tstAPI_SOURCES  = tstAPI.cpp
    61 ifeq ($(BUILD_TARGET),win) ## @todo just add this to the template.
     61ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
    6262tstAPI_DEPS     = $(VBOX_PATH_SDK)/include/VirtualBox.h
    6363else

  • trunk/src/VBox/Runtime/Makefile.kmk

    r8757 r8758  
    3838 # Only build the additions, sort out the legacy names first.
    3939 #
    40  ifeq ($(BUILD_TARGET),win)
     40 ifeq ($(KBUILD_TARGET),win)
    4141  LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    4242 else
    … …  
    4545  #LIBRARIES.win = RuntimeW32NT4GuestR0
    4646  ifndef VBOX_WITH_ADDITION_DRIVERS
    47    if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     47   if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
    4848    LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES))
    4949   endif
    … …  
    6767   LIBRARIES += RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    6868  endif
    69   ifneq ($(BUILD_TARGET),win)
     69  ifneq ($(KBUILD_TARGET),win)
    7070   LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    7171   #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
    7272   #LIBRARIES.win = RuntimeW32NT4GuestR0
    7373   ifndef VBOX_WITH_ADDITION_DRIVERS
    74     if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
     74    if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
    7575     LIBRARIES := $(filter-out RuntimeGuestR0, $(LIBRARIES))
    7676    endif
    … …  
    242242        r3/tcp.cpp
    243243
    244 #if1of ($(BUILD_TARGET_ARCH),amd64 x86)
     244#if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    245245# RuntimeR3_SOURCES += common/time/timesupA.asm
    246246#else
    … …  
    258258        VBox/RTAssertDoBreakpoint-vbox.cpp \
    259259        VBox/log-vbox.cpp
    260 ifneq ($(BUILD_TARGET),win)
     260ifneq ($(KBUILD_TARGET),win)
    261261RuntimeR3_SOURCES += \
    262262        common/err/errmsgxpcom.cpp
    … …  
    493493RuntimeR3L4_TEMPLATE      = VBOXR3NP
    494494RuntimeR3L4_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF LDR_WITH_PE
    495 ifneq ($(BUILD_TARGET_ARCH),amd64)
     495ifneq ($(KBUILD_TARGET_ARCH),amd64)
    496496RuntimeR3L4_DEFS         += __PIC__
    497497endif
    … …  
    541541RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
    542542RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
    543 RuntimeGuestR3_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
     543RuntimeGuestR3_DEFS.$(KBUILD_TARGET)     := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    544544RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
    545545RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
    546 RuntimeGuestR3_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
     546RuntimeGuestR3_INCS.$(KBUILD_TARGET)     := $(RuntimeR3_INCS.$(KBUILD_TARGET))
    547547RuntimeGuestR3_INCS.$(KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST))
    548548RuntimeGuestR3_SOURCES                  := $(filter-out \
    … …  
    555555        common/time/timesysalias.cpp \
    556556        VBox/logbackdoor.cpp
    557 RuntimeGuestR3_SOURCES.$(BUILD_TARGET)  := $(RuntimeR3_SOURCES.$(BUILD_TARGET))
     557RuntimeGuestR3_SOURCES.$(KBUILD_TARGET)  := $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
    558558RuntimeGuestR3_SOURCES.$(KBUILD_HOST):= $(RuntimeR3_SOURCES.$(KBUILD_HOST))
    559 RuntimeGuestR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
    560 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(BUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(BUILD_TARGET_ARCH))
    561 RuntimeGuestR3_SOURCES.$(BUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(BUILD_TARGET).x86)
     559RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
     560RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
     561RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
    562562RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86 := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)
    563563
    … …  
    572572RuntimeGuestR3Mini_SDKS.win                 := $(RuntimeR3_SDKS.win)
    573573RuntimeGuestR3Mini_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) RT_MINI
    574 RuntimeGuestR3Mini_DEFS.$(BUILD_TARGET)     := $(RuntimeR3_DEFS.$(BUILD_TARGET))
     574RuntimeGuestR3Mini_DEFS.$(KBUILD_TARGET)     := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    575575RuntimeGuestR3Mini_DEFS.$(KBUILD_HOST)   := $(RuntimeR3_DEFS.$(KBUILD_HOST))
    576576RuntimeGuestR3Mini_INCS                     := $(RuntimeR3_INCS)
    577 RuntimeGuestR3Mini_INCS.$(BUILD_TARGET)     := $(RuntimeR3_INCS.$(BUILD_TARGET))
     577RuntimeGuestR3Mini_INCS.$(KBUILD_TARGET)     := $(RuntimeR3_INCS.$(KBUILD_TARGET))
    578578RuntimeGuestR3Mini_INCS.$(KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST))
    579579RuntimeGuestR3Mini_SOURCES = \
    … …  
    636636RuntimeLnxHostR3_DEFS          = IN_RT_R3 IN_SUP_R3 RT_WITH_VBOX RT_NO_GIP
    637637RuntimeLnxHostR3_SOURCES       = \
    638         $(RuntimeR3_SOURCES.linux.$(BUILD_TARGET_ARCH)) \
     638        $(RuntimeR3_SOURCES.linux.$(KBUILD_TARGET_ARCH)) \
    639639        $(RuntimeR3_SOURCES.linux) \
    640640        $(RuntimeR3_SOURCES)
    641641RuntimeLnxHostR3_INCS          = \
    642         $(RuntimeR3_INCS.linux.$(BUILD_TARGET_ARCH)) \
     642        $(RuntimeR3_INCS.linux.$(KBUILD_TARGET_ARCH)) \
    643643        $(RuntimeR3_INCS.linux) \
    644644        $(RuntimeR3_INCS)
    … …  
    650650VBoxRT_TEMPLATE                = VBOXR3
    651651VBoxRT_SDKS.win                = WINPSDK W2K3DDK VBOX_NTDLL
    652 ifeq ($(BUILD_TARGET),darwin)
     652ifeq ($(KBUILD_TARGET),darwin)
    653653VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
    654654endif
    … …  
    658658        VBox/VBoxRTDeps.cpp \
    659659        $(RuntimeR3_SOURCES)
    660 VBoxRT_SOURCES.$(BUILD_TARGET) = $(RuntimeR3_SOURCES.$(BUILD_TARGET))
    661 VBoxRT_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     660VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
     661VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    662662VBoxRT_SOURCES.win            += r3/win/dllmain-win.cpp
    663663VBoxRT_SOURCES.win.x86        += r3/win/VBoxRT-win32.def
    664664VBoxRT_SOURCES.win.amd64      += r3/win/VBoxRT-win64.def
    665665VBoxRT_INCS                    = $(RuntimeR3_INCS)
    666 VBoxRT_INCS.$(BUILD_TARGET)    = $(RuntimeR3_INCS.$(BUILD_TARGET))
    667 VBoxRT_INCS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     666VBoxRT_INCS.$(KBUILD_TARGET)    = $(RuntimeR3_INCS.$(KBUILD_TARGET))
     667VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    668668VBoxRT_LIBS                    = \
    669669        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
    … …  
    687687        $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
    688688        -Wl,-no-whole-archive
    689 ifeq ($(BUILD_TARGET),l4)
     689ifeq ($(KBUILD_TARGET),l4)
    690690VBoxRT_LIBS                   += \
    691691        $(L4_LIBDIR)/libl4sys.a \
    … …  
    818818        VBox/strformat-vbox.cpp
    819819
    820 #if1of ($(BUILD_TARGET_ARCH),amd64 x86)
     820#if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    821821# RuntimeR0_SOURCES += common/time/timesupA.asm
    822822#else
    … …  
    831831        os2/sys0.asm
    832832
    833 ifeq ($(filter-out darwin solaris freebsd,$(BUILD_TARGET)),)
     833ifeq ($(filter-out darwin solaris freebsd,$(KBUILD_TARGET)),)
    834834RuntimeR0_SOURCES += \
    835835        common/math/gcc/adddi3.c \
    … …  
    862862common/string/strlen.cpp_CXXFLAGS.win = -Oi-
    863863
    864 ifeq ($(BUILD_TARGET),l4)
     864ifeq ($(KBUILD_TARGET),l4)
    865865RuntimeR0Drv_BLD_TRG      = linux
    866866RuntimeR0Drv_BLD_TRG_ARCH = x86
    … …  
    11221122RuntimeGuestR0_SDKS.win                := W2K3DDKX86 WINPSDKINCS
    11231123RuntimeGuestR0_DEFS                    := $(RuntimeR0Drv_DEFS)
    1124 RuntimeGuestR0_DEFS.$(BUILD_TARGET)    := $(RuntimeR0Drv_DEFS.$(BUILD_TARGET))
     1124RuntimeGuestR0_DEFS.$(KBUILD_TARGET)    := $(RuntimeR0Drv_DEFS.$(KBUILD_TARGET))
    11251125RuntimeGuestR0_INCS                    := $(PATH_SUB_CURRENT) include
    1126 RuntimeGuestR0_INCS.$(BUILD_TARGET)    := $(RuntimeR0Drv_INCS.$(BUILD_TARGET))
     1126RuntimeGuestR0_INCS.$(KBUILD_TARGET)    := $(RuntimeR0Drv_INCS.$(KBUILD_TARGET))
    11271127RuntimeGuestR0_SOURCES                 := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
    11281128RuntimeGuestR0_SOURCES                 += VBox/logbackdoor.cpp
    1129 RuntimeGuestR0_SOURCES.$(BUILD_TARGET) := $(RuntimeR0Drv_SOURCES.$(BUILD_TARGET))
    1130 RuntimeGuestR0_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) := $(RuntimeR0Drv_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     1129RuntimeGuestR0_SOURCES.$(KBUILD_TARGET) := $(RuntimeR0Drv_SOURCES.$(KBUILD_TARGET))
     1130RuntimeGuestR0_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR0Drv_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    11311131ifdef VBOX_USE_VCC80
    11321132RuntimeGuestR0_SOURCES.win += \
    … …  
    11551155RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT) include
    11561156RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS IN_SUP_R0
    1157 RuntimeW32GuestR0_DEFS.$(BUILD_TARGET) =
     1157RuntimeW32GuestR0_DEFS.$(KBUILD_TARGET) =
    11581158RuntimeW32GuestR0_SOURCES       = \
    11591159        $(filter-out generic/RTLogWriteUser-generic.cpp,$(RuntimeR0Drv_SOURCES)) \
    … …  
    12211221        VBox/strformat-vbox.cpp \
    12221222
    1223 #if1of ($(BUILD_TARGET_ARCH),amd64 x86)
     1223#if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    12241224# RuntimeGC_SOURCES += common/time/timesupA.asm
    12251225#else
    … …  
    12331233endif
    12341234
    1235 if1of ($(BUILD_TARGET), darwin solaris freebsd)
     1235if1of ($(KBUILD_TARGET), darwin solaris freebsd)
    12361236RuntimeGC_SOURCES += \
    12371237        common/math/gcc/adddi3.c \
    … …  
    12621262RuntimeEFCPP_TEMPLATE   = $(RuntimeR3_TEMPLATE)
    12631263RuntimeEFCPP_SDKS       = $(RuntimeR3_SDKS)
    1264 RuntimeEFCPP_SDKS.$(BUILD_TARGET) = $(RuntimeR3_SDKS.$(BUILD_TARGET))
     1264RuntimeEFCPP_SDKS.$(KBUILD_TARGET) = $(RuntimeR3_SDKS.$(KBUILD_TARGET))
    12651265RuntimeEFCPP_DEFS       = $(RuntimeR3_DEFS)
    1266 RuntimeEFCPP_DEFS.$(BUILD_TARGET) = $(RuntimeR3_DEFS.$(BUILD_TARGET))
     1266RuntimeEFCPP_DEFS.$(KBUILD_TARGET) = $(RuntimeR3_DEFS.$(KBUILD_TARGET))
    12671267RuntimeEFCPP_INCS       = $(RuntimeR3_INCS)
    1268 RuntimeEFCPP_INCS.$(BUILD_TARGET) = $(RuntimeR3_INCS.$(BUILD_TARGET))
     1268RuntimeEFCPP_INCS.$(KBUILD_TARGET) = $(RuntimeR3_INCS.$(KBUILD_TARGET))
    12691269RuntimeEFCPP_SOURCES    = r3/alloc-ef-cpp.cpp
    12701270

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r8757 r8758  
    2828#
    2929PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm tstGlobalConfig
    30 ifneq ($(BUILD_TARGET),win)
     30ifneq ($(KBUILD_TARGET),win)
    3131PROGRAMS   += tstVMMFork
    3232endif
    3333ifdef VBOX_WITH_TESTCASES
    3434 PROGRAMS  += tstCFGM tstSSM tstMMHyperHeap tstVMM-2 tstVMREQ tstMicro tstCompiler tstVMMR0CallHost-1
    35  ifneq ($(BUILD_TARGET),l4)
     35 ifneq ($(KBUILD_TARGET),l4)
    3636  PROGRAMS += tstAnimate
    3737 endif
    … …  
    4747# validation testcases. Perhaps a bit hackish, but extremely useful.
    4848#
    49 ifeq ($(BUILD_TARGET),$(KBUILD_HOST))
    50  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(BUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
     49ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
     50 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    5151  OTHERS          += \
    5252        $(PATH_TARGET)/tstAsmStructs.run \
    … …  
    217217                        $(DEFS) \
    218218                        $(DEFS.$(BUILD_TYPE)) \
    219                         $(DEFS.$(BUILD_TARGET)) \
     219                        $(DEFS.$(KBUILD_TARGET)) \
    220220                        IN_RING3 \
    221                         $(DEFS.$(BUILD_TARGET_ARCH)) \
    222                         $(DEFS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     221                        $(DEFS.$(KBUILD_TARGET_ARCH)) \
     222                        $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
    223223                ) \
    224                 -f $(if $(eq $(BUILD_TARGET),darwin),macho,elf) \
     224                -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \
    225225                $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(PATH_TARGET),-I$(inc)/)
    226226

  • trunk/src/libs/Makefile.kmk

    r8155 r8758  
    2424
    2525
    26 subdirs := liblzf-1.51 $(subdirs.$(BUILD_TARGET))
     26subdirs := liblzf-1.51 $(subdirs.$(KBUILD_TARGET))
    2727ifdef IPRT_WITH_KSTUFF
    2828 subdirs += kStuff
    … …  
    5757 # FFmpeg for test videos
    5858 ifdef VBOX_WITH_FFMPEG
    59   ifeq ($(BUILD_TARGET),darwin)
     59  ifeq ($(KBUILD_TARGET),darwin)
    6060   subdirs += ffmpeg-20060710
    6161  endif

  • trunk/src/libs/ffmpeg-20060710/Makefile.kmk

    r8155 r8758  
    2525DLLS                       = VBoxFFmpeg
    2626
    27 ifeq ($(BUILD_TARGET),win)
     27ifeq ($(KBUILD_TARGET),win)
    2828VBoxFFmpeg_TOOL.win.x86    = MINGW32
    2929#VBoxFFmpeg_TOOL.win.amd64  = MINGW64...
    … …  
    302302# The import library for Windows builds.
    303303# The microsoft linker doesn't like the GNU import libraries from this MinGW version.
    304 # 
    305 ifeq ($(BUILD_TARGET),win)
     304#
     305ifeq ($(KBUILD_TARGET),win)
    306306IMPORT_LIBS += VBoxFFmpegImp
    307307VBoxFFmpegImp_TEMPLATE = VBOXR3

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r8155 r8758  
    7575                                     -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \
    7676                                     -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon
    77 ifn1of ($(BUILD_TARGET), os2 win)
     77ifn1of ($(KBUILD_TARGET), os2 win)
    7878 TEMPLATE_XPCOM_CXXFLAGS          += -fPIC
    7979 TEMPLATE_XPCOM_CFLAGS            += -fPIC
    … …  
    112112TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst))) \
    113113                                     $(PATH_VBox-xpcom-string)/idl_ts
    114 ifeq ($(BUILD_TARGET),os2)
     114ifeq ($(KBUILD_TARGET),os2)
    115115 ifndef USE_OS2_TOOLKIT_HEADERS
    116116  TEMPLATE_XPCOM_DEFS.os2         += OS2EMX_PLAIN_CHAR
    … …  
    165165
    166166TEMPLATE_XPCOMBLDPROG_DEFS                      = $(TEMPLATE_BLDPROG_DEFS)                      $(TEMPLATE_XPCOMEXE_DEFS)
    167 TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET)      = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET))      $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET))
    168 TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET_ARCH))
     167TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET)      = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET))      $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET))
     168TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(KBUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_TARGET_ARCH))
    169169TEMPLATE_XPCOMBLDPROG_CXXFLAGS          = -ansi -Wall -Wno-non-virtual-dtor
    170 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CXXFLAGS.$(BUILD_TARGET_ARCH))
     170TEMPLATE_XPCOMBLDPROG_CXXFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH))
    171171TEMPLATE_XPCOMBLDPROG_CXXFLAGS.release  = -O
    172172TEMPLATE_XPCOMBLDPROG_CXXFLAGS.profile  = -O
    … …  
    174174TEMPLATE_XPCOMBLDPROG_CXXFLAGS.linux    = -pthread
    175175TEMPLATE_XPCOMBLDPROG_CFLAGS            = -pipe -ansi -Wall -Wno-unused
    176 TEMPLATE_XPCOMBLDPROG_CFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CFLAGS.$(BUILD_TARGET_ARCH))
     176TEMPLATE_XPCOMBLDPROG_CFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_CFLAGS.$(KBUILD_TARGET_ARCH))
    177177TEMPLATE_XPCOMBLDPROG_CFLAGS.release    = -O
    178178TEMPLATE_XPCOMBLDPROG_CFLAGS.profile    = -O
    … …  
    185185                                          $(VBOX_PATH_SDK)/include/xpcom/xpcom \
    186186                                          $(VBOX_PATH_SDK)/include/xpcom/ipcd
    187 TEMPLATE_XPCOMBLDPROG_INCS.$(BUILD_TARGET)         = $(TEMPLATE_XPCOMEXE_INCS.$(BUILD_TARGET))
    188 TEMPLATE_XPCOMBLDPROG_INCS.$(BUILD_TARGET_ARCH)    = $(TEMPLATE_XPCOMEXE_INCS.$(BUILD_TARGET_ARCH))
    189 TEMPLATE_XPCOMBLDPROG_LIBPATH.$(BUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LIBPATH.$(BUILD_TARGET))
    190 TEMPLATE_XPCOMBLDPROG_LIBPATH.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LIBPATH.$(BUILD_TARGET_ARCH))
    191 TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(BUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(BUILD_TARGET))
    192 TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(BUILD_TARGET_ARCH))
     187TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET)         = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET))
     188TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET_ARCH)    = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET_ARCH))
     189TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET))
     190TEMPLATE_XPCOMBLDPROG_LIBPATH.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LIBPATH.$(KBUILD_TARGET_ARCH))
     191TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET)      = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET))
     192TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET_ARCH))
    193193TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
    194194
    … …  
    272272PROGRAMS += VBoxXPCOMIPCD
    273273
    274 ifeq ($(BUILD_TARGET),linux)
     274ifeq ($(KBUILD_TARGET),linux)
    275275 XPCOM_TYPELIB = $(PATH_BIN)/VBoxXPCOMBase.xpt
    276276else
    … …  
    577577        xpcom/typelib/xpt/src/xpt_xdr.c
    578578
    579 ifeq ($(BUILD_TARGET),os2)
     579ifeq ($(KBUILD_TARGET),os2)
    580580 # glib and libIDL needed by XPCOM on OS/2.
    581581 ifeq ($(VBOX_PATH_GLIB),)
    … …  
    737737        nsprpub/lib/libc/src/plgetopt.c
    738738
    739 ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # unixish
     739ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # unixish
    740740VBox-xpcom-nspr_SOURCES += \
    741741        nsprpub/pr/src/md/unix/unix.c \
    … …  
    935935VBox-xpcom-io_SOURCES.l4 = \
    936936        xpcom/io/nsLocalFileL4.cpp
    937 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),)
     937ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),)
    938938VBox-xpcom-io_SOURCES += \
    939939        xpcom/io/nsLocalFileUnix.cpp
    … …  
    11011101        $(TARGET_VBoxXPCOMGlue_s)
    11021102
    1103 ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(BUILD_TARGET)),) # gnu ld.
     1103ifeq ($(filter-out freebsd l4 linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
    11041104VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
    11051105        $(TARGET_VBox-xpcom-typelib) \
    … …  
    11491149TEMPLATE_XPCOMIPC_EXTENDS          = XPCOM
    11501150TEMPLATE_XPCOMIPC_DEFS             = $(TEMPLATE_XPCOM_DEFS) BUILD_DCONNECT="1"
    1151 ifeq ($(filter-out win os2,$(BUILD_TARGET)),)
     1151ifeq ($(filter-out win os2,$(KBUILD_TARGET)),)
    11521152 TEMPLATE_XPCOMIPC_DEFS           += IPC_DAEMON_APP_NAME=\"VBoxXPCOMIPCD.exe\"
    11531153else
    … …  
    12081208VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC
    12091209VBoxXPCOMIPCC_NAME.os2 = VBoxIPCC
    1210 ifneq ($(BUILD_TARGET),linux)
     1210ifneq ($(KBUILD_TARGET),linux)
    12111211VBoxXPCOMIPCC_INST = $(INST_BIN)components/
    12121212endif
    … …  
    12171217        ipc/ipcd/client/src/ipcModuleFactory.cpp \
    12181218        ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
    1219 ifeq ($(BUILD_TARGET),win)
     1219ifeq ($(KBUILD_TARGET),win)
    12201220VBoxXPCOMIPCC_SOURCES += \
    12211221        ipc/ipcd/client/src/ipcConnectionWin.cpp
    … …  
    12411241        ipc/ipcd/daemon/src/ipcModuleReg.cpp \
    12421242        ipc/ipcd/daemon/src/ipcCommandModule.cpp
    1243 ifeq ($(BUILD_TARGET),win)
     1243ifeq ($(KBUILD_TARGET),win)
    12441244VBoxXPCOMIPCD_SOURCES += \
    12451245        ipc/ipcd/daemon/src/ipcdWin.cpp

  • trunk/src/recompiler/Makefile.kmk

    r8757 r8758  
    3939
    4040BLDPROGS              = dyngen
    41 ifneq ($(or $(eq $(BUILD_TARGET_ARCH),amd64) , $(VBOX_TARGET_MAC_OS_X_VERSION_10_5)),)
     41ifneq ($(or $(eq $(KBUILD_TARGET_ARCH),amd64) , $(VBOX_TARGET_MAC_OS_X_VERSION_10_5)),)
    4242 SYSMODS              = VBoxREM2
    4343 REM_MOD              = VBoxREM2
    … …  
    6262# when stuffed into a shared library and windows doesn't have 64-bit gcc (yet).
    6363#
    64 ifeq ($(filter-out l4 darwin freebsd,$(BUILD_TARGET)),)
     64ifeq ($(filter-out l4 darwin freebsd,$(KBUILD_TARGET)),)
    6565 REM_USE_NOCRT := 1
    6666endif
    … …  
    8383 dyngen_TEMPLATE      = VBOXBLDPROG
    8484endif
    85 ifeq ($(BUILD_TARGET_ARCH),amd64)
     85ifeq ($(KBUILD_TARGET_ARCH),amd64)
    8686 dyngen_DEFS         += HOST_X86_64=1
    8787endif
    … …  
    122122$(REM_MOD)_SOURCES.debug = \
    123123        Sun/testmath.c
    124 ifeq ($(filter-out win os2,$(BUILD_TARGET)),)
     124ifeq ($(filter-out win os2,$(KBUILD_TARGET)),)
    125125 $(REM_MOD)_SOURCES        += target-i386/op.c
    126126 FILE_OP_OBJ                = $(PATH_$(REM_MOD)_target-i386/op.c)/op.o
    … …  
    141141 $(REM_MOD)_CFLAGS.amd64    = -O2
    142142 $(REM_MOD)_CFLAGS.debug    = -O0
    143  ifdef ($(BUILD_TARGET_ARCH),x86)
     143 ifdef ($(KBUILD_TARGET_ARCH),x86)
    144144  $(REM_MOD)_CFLAGS.release+= -fomit-frame-pointer -fno-gcse
    145145 endif
    … …  
    147147 # This doesn't fit in IPRT because it requires GAS and is LGPL.
    148148 $(REM_MOD)_SOURCES        += \
    149         Sun/e_powl-$(BUILD_TARGET_ARCH).S
     149        Sun/e_powl-$(KBUILD_TARGET_ARCH).S
    150150
    151151 ifeq ($(REM_MOD),VBoxREM)
    … …  
    154154        $(LIB_VMM) \
    155155        $(LIB_RUNTIME)
    156   ifeq ($(BUILD_TARGET),l4)
     156  ifeq ($(KBUILD_TARGET),l4)
    157157   $(REM_MOD)_LIBS          += \
    158158        $(L4_LIBDIR)/libuc.0.s.so
    … …  
    184184 $(REM_MOD)_CFLAGS.kprofile = $($(REM_MOD)_CFLAGS.release)
    185185 $(REM_MOD)_CFLAGS.l4       = -nostdinc
    186  ifeq ($(BUILD_TARGET),l4)
     186 ifeq ($(KBUILD_TARGET),l4)
    187187  $(REM_MOD)_INCS          += $(VBOX_L4_GCC3_INCS) $(L4_INCDIR)
    188188 endif
    … …  
    200200 $(REM_MOD)_LDFLAGS.solaris = -mimpure-text
    201201 $(REM_MOD)_DEFS.solaris    += HOST_SOLARIS=11
    202  ifeq ($(BUILD_TARGET_ARCH),amd64)
     202 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    203203  $(REM_MOD)_LIBS           = $(FILE_TOOL_GCC3_LIBGCC)
    204204 else # x86
    … …  
    282282#
    283283VBoxREMImp_TEMPLATE         = VBOXR3
    284 ifeq ($(BUILD_TARGET),darwin)
     284ifeq ($(KBUILD_TARGET),darwin)
    285285VBoxREMImp_INST             = $(INST_LIB)
    286286endif
    287287VBoxREMImp_SOURCES.win      = VBoxREM.def
    288288VBoxREMImp_SOURCES.os2      = $(PATH_TARGET)/VBoxREMOS2.def
    289 ifeq ($(filter win os2,$(BUILD_TARGET)),)
     289ifeq ($(filter win os2,$(KBUILD_TARGET)),)
    290290VBoxREMImp_SOURCES          = $(PATH_TARGET)/VBoxREMImp.c
    291291VBoxREMImp_CLEAN            = $(PATH_TARGET)/VBoxREMImp.c
    292292endif
    293 ifneq ($(filter-out darwin os2 win,$(BUILD_TARGET)),)
     293ifneq ($(filter-out darwin os2 win,$(KBUILD_TARGET)),)
    294294VBoxREMImp_SONAME           = VBoxREM$(SUFF_DLL)
    295295endif
    … …  
    338338#
    339339ifndef VBOX_RECOMPILER_OP_GCC
    340  ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),darwin.x86)
     340 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
    341341  VBOX_RECOMPILER_OP_GCC ?= $(notdir $(firstword $(which i386-elf-gcc-3.4 i386-elf-gcc-3.4.6 i386-elf-gcc-3.4.3 i386-elf-gcc) i386-elf-gcc)) # (port install i386-gcc-elf)
    342342  VBOX_RECOMPILER_OP_GCC_OK := yes
    … …  
    357357        -S -s \
    358358        $(filter-out -g -O0, \
    359                 $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(BUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(BUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(BUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
    360                 $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(BUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(BUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     359                $($(REM_MOD)_CFLAGS) $($(REM_MOD)_CFLAGS.$(BUILD_TYPE)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
     360                $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
    361361                ) \
    362362        $(addprefix -I, \
    363                 $($(REM_MOD)_CINCS.$(BUILD_TARGET_ARCH)) $($(REM_MOD)_CINCS.$(BUILD_TARGET)) $($(REM_MOD)_CINCS) $(CINCS) \
    364                 $($(REM_MOD)_INCS.$(BUILD_TARGET_ARCH))  $($(REM_MOD)_INCS.$(BUILD_TARGET))  $($(REM_MOD)_INCS) $(INCS) \
     363                $($(REM_MOD)_CINCS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CINCS.$(KBUILD_TARGET)) $($(REM_MOD)_CINCS) $(CINCS) \
     364                $($(REM_MOD)_INCS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_INCS.$(KBUILD_TARGET))  $($(REM_MOD)_INCS) $(INCS) \
    365365                ) \
    366366        $(addprefix -D, \
    367                 $($(REM_MOD)_CDEFS.$(BUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(BUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(BUILD_TARGET)) $(CDEFS.$(BUILD_TARGET_ARCH)) $(CDEFS.$(BUILD_TYPE)) $(CDEFS) \
    368                 $($(REM_MOD)_DEFS.$(BUILD_TARGET_ARCH))  $($(REM_MOD)_DEFS.$(BUILD_TARGET))  $($(REM_MOD)_DEFS)  $(DEFS.$(BUILD_TARGET))  $(DEFS.$(BUILD_TARGET_ARCH))  $(DEFS.$(BUILD_TYPE))  $(DEFS) \
     367                $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$(BUILD_TYPE)) $(CDEFS) \
     368                $($(REM_MOD)_DEFS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_DEFS.$(KBUILD_TARGET))  $($(REM_MOD)_DEFS)  $(DEFS.$(KBUILD_TARGET))  $(DEFS.$(KBUILD_TARGET_ARCH))  $(DEFS.$(BUILD_TYPE))  $(DEFS) \
    369369                ) \
    370370        -Wp,-MD,$(PATH_$(REM_MOD))/op.S.dep \
    … …  
    379379
    380380# Drop incompatible options when using the cross-compiler on darwin.
    381 ifeq ($(BUILD_TARGET),darwin)
     381ifeq ($(KBUILD_TARGET),darwin)
    382382 ifeq ($(filter-out i386-elf-gcc%, $(VBOX_RECOMPILER_OP_GCC)),)
    383383  COMPILE_OP_CMDS := $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS))
    384384 endif
    385 else if1of ($(BUILD_TARGET),linux)
     385else if1of ($(KBUILD_TARGET),linux)
    386386 ifneq ($(TOOL_$(VBOX_GCC_TOOL)_CC),$(VBOX_RECOMPILER_OP_GCC))
    387387  VBOX_RECOMPILER_OP_CHECK_CC_GCC = $(shell \
    … …  
    401401$(PATH_$(REM_MOD))/op.S: \
    402402                target-i386/op.c \
    403                 Sun/staged-op-elf-$(BUILD_TARGET_ARCH).S \
     403                Sun/staged-op-elf-$(KBUILD_TARGET_ARCH).S \
    404404                Sun/op-validate.sed \
    405405                Sun/op-darwin.sed \
    … …  
    421421        else \
    422422                $(ECHO_EXT) "Using staged op.S [gcc v$${major_ver}.$${minor_ver}.$${bugfix_ver}]" && \
    423                 $(CP_EXT) -f Sun/staged-op-elf-$(BUILD_TARGET_ARCH).S [email protected]; \
     423                $(CP_EXT) -f Sun/staged-op-elf-$(KBUILD_TARGET_ARCH).S [email protected]; \
    424424        fi
    425425else
    426         $(CP) Sun/staged-op-elf-$(BUILD_TARGET_ARCH).S [email protected]
     426        $(CP) Sun/staged-op-elf-$(KBUILD_TARGET_ARCH).S [email protected]
    427427endif
    428428        $(SED) -f Sun/op-validate.sed [email protected]
    429 ifeq ($(BUILD_TARGET),darwin)
     429ifeq ($(KBUILD_TARGET),darwin)
    430430        $(SED) -f Sun/op-darwin.sed [email protected] > [email protected]
    431431        $(SED) -e 's/^\(.*\)$$/#define \1 _\1/' Sun/op-undefined.lst > [email protected]
    … …  
    442442DYNGEN = $(PATH_dyngen)/dyngen$(HOSTSUFF_EXE)
    443443DYNGEN_EXEC = $(DYNGEN)
    444 ifneq ($(KBUILD_HOST),$(BUILD_TARGET)) # hack for crosscompiling.
    445  ifeq ($(BUILD_TARGET),win)
     444ifneq ($(KBUILD_HOST),$(KBUILD_TARGET)) # hack for crosscompiling.
     445 ifeq ($(KBUILD_TARGET),win)
    446446  DYNGEN       = $(PATH_dyngen)/dyngen.exe
    447447  DYNGEN_EXEC := $(EXEC_X86_WIN32) $(DYNGEN_EXEC)

  • trunk/tools/CommonFetch.kmk

    r8265 r8758  
    11# $Id$
    22## @file
    3 # Common Fetch. 
     3# Common Fetch.
    44# Included by both Makefile.kmk and Makefile-ose.kmk.
    55#
    … …  
    3636# OS/2 stuff.
    3737#
    38 ifeq ($(BUILD_TARGET),os2)
     38ifeq ($(KBUILD_TARGET),os2)
    3939FETCHES += os2.x86.glibidl.20070521
    4040os2.x86.glibidl.20070521_TEMPLATE = VBOXFETCH
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette