VirtualBox

Changeset 8758 in vbox for trunk/src/VBox/Runtime


Ignore:
Timestamp:
May 11, 2008 6:27:49 PM (17 years ago)
Author:
vboxsync
Message:

BUILD_TARGET* -> KBUILD_TARGET*.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.

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