Changeset 8758 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

May 11, 2008 6:27:49 PM (17 years ago)

Author:

vboxsync

Message:

BUILD_TARGET* -> KBUILD_TARGET*.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (15 diffs)

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

@@ -70 +70 @@
 VBOX_DEFS_QT4       = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_QT3SUPPORT_LIB
 
-ifeq ($(BUILD_TARGET),darwin)
+ifeq ($(KBUILD_TARGET),darwin)
  VBOX_MODULE_QT4    += QtSql QtXml
  VBOX_DEFS_QT4       = QT_SQL_LIB QT_XML_LIB
@@ -109 +109 @@
     $(VBOX_INCS_QT4)
 
-ifeq ($(BUILD_TARGET),win)
+ifeq ($(KBUILD_TARGET),win)
  # drag in library configuration (we need QMAKE_PRL_DEFINES)
  ifneq ($(LIB_QT_PRL),)
@@ -170 +170 @@
         $(LIB_VMM)
 
- ifeq ($(BUILD_TARGET_ARCH),amd64)
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH = \
         $(VBOX_PATH_QT4_LIB64) $(VBOX_PATH_QT4_LIB)
@@ -178 +178 @@
  endif
 
- ifeq ($(BUILD_TARGET),linux)
+ ifeq ($(KBUILD_TARGET),linux)
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
     $(VBOX_XCURSOR_LIBS)
- else ifeq ($(BUILD_TARGET),darwin)
+ else ifeq ($(KBUILD_TARGET),darwin)
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(foreach mod, $(VBOX_MODULE_QT4), -framework $(mod)) \
         -framework Carbon -framework QuickTime -bind_at_load
   TEMPLATE_VBOXQT4GUIEXE_LIBS +=
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
- else ifeq ($(BUILD_TARGET),os2)
+ else ifeq ($(KBUILD_TARGET),os2)
   # drag in library configuration (we need QMAKE_PRL_DEFINES)
   ifneq ($(LIB_QT_PRL),)
@@ -206 +206 @@
   TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
         $(VBOX_LIBPATH_X11)
-  ifeq ($(BUILD_TARGET),freebsd)
+  ifeq ($(KBUILD_TARGET),freebsd)
    TEMPLATE_VBOXQT4GUIEXE_INCS += \
         /usr/include \
@@ -234 +234 @@
 TEMPLATE_VBOXQT4GUI_EXTENDS = VBOXQTGUIEXE
 TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS))
-ifeq ($(BUILD_TARGET),darwin)
+ifeq ($(KBUILD_TARGET),darwin)
  TEMPLATE_VBOXQT4GUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS))
 endif
-ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
- ifneq ($(BUILD_TARGET),win)
+ifeq ($(filter-out solaris.x86 %.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),)
+ ifneq ($(KBUILD_TARGET),win)
   TEMPLATE_VBOXQT4GUI_DEFS     = PIC $(TEMPLATE_VBOXQT4GUIEXE_DEFS)
   TEMPLATE_VBOXQT4GUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CFLAGS)
@@ -296 +296 @@
 #
 PROGRAMS = VirtualBox
-ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(BUILD_TARGET)),) # X11
+ifeq ($(filter-out freebsd linux openbsd netbsd solaris,$(KBUILD_TARGET)),) # X11
 DLLS = VBoxKeyboard4
 OTHERS = $(PATH_BIN)/vboxkeyboard4.tar.gz
@@ -302 +302 @@
 INSTALLS = VirtualBox.nls
 
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
  DLLS += VBoxHlp
  ifneq ($(strip $(VBOX_DLL_QT)),)
@@ -367 +367 @@
 VirtualBox_NAME     = VirtualBox4
 VirtualBox_SDKS.win = WINPSDK DXSDK
-#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(BUILD_TARGET)),) - later
-ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(BUILD_TARGET)),) # X11 + os2
+#ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(KBUILD_TARGET)),) - later
+ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2
 VirtualBox_SDKS += LIBSDL
 endif
 
-ifeq ($(BUILD_TARGET),darwin)
+ifeq ($(KBUILD_TARGET),darwin)
 # For the launch trick we need different inode numbers.
 VirtualBox_INST = $(INST_BIN)VirtualBox4 $(INST_BIN)VirtualBoxVM4
@@ -385 +385 @@
 
 ifndef VBOX_OSE
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # linux only, yea, right.
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # linux only, yea, right.
 # Note: I'm doing this right here because the GUI will _not_ run
 #       without that file which might be annoying for developers!
@@ -440 +440 @@
 # Sources containing local definitions of classes that use the Q_OBJECT macro
 VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
 VirtualBox_QT_MOCSRCS += src/VBoxGlobal.cpp
 endif
@@ -520 +520 @@
         src/VBoxVMLogViewer.cpp
 
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
 VirtualBox_SOURCES += \
         src/linux/XKeyboard-new.cpp
@@ -543 +543 @@
 endif
 
-ifneq ($(BUILD_TARGET),win)
+ifneq ($(KBUILD_TARGET),win)
 src/HappyHttp.cpp_CXXFLAGS += -fexceptions
 src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
@@ -628 +628 @@
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
 VirtualBox_LIBS.os2      += $(PATH_DLL)/VBoxHlp$(VBOX_SUFF_DLL)
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
+ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
 VirtualBox_LIBS          += $(PATH_DLL)/VBoxKeyboard4$(VBOX_SUFF_DLL)
 endif
@@ -634 +634 @@
 
 ifdef VBOX_WITH_DEBUGGER_GUI ## @todo make this dynamically loadable and ship with release builds too.
- ifeq ($(BUILD_TARGET),win)
+ ifeq ($(KBUILD_TARGET),win)
   VirtualBox_LIBS        += $(PATH_LIB)/VBoxDbg$(VBOX_SUFF_LIB)
  else