Changeset 71322 in vbox for trunk

Timestamp:

Mar 14, 2018 2:04:51 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Cleanup/rework Makefile first of all: Header.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (8 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2017 Oracle Corporation
+# Copyright (C) 2006-2018 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+
 #
 # Globals.
 #
-VBOX_VIRTUALBOX4_SRC := $(PATH_SUB_CURRENT)
-VBOX_VIRTUALBOX4_OUT_DIR := $(PATH_TARGET)/VirtualBox/misc
-
-# Show the update notifier dialog during startup. If this setting is disabled
-# the user can still update using the menu if desired.
-ifndef VBOX_OSE
-VBOX_WITH_UPDATE_REQUEST := 1
-endif
-
-#
-# The targets.
+VBOX_VIRTUALBOX_SRC := $(PATH_SUB_CURRENT)
+VBOX_VIRTUALBOX_OUT_DIR := $(PATH_TARGET)/VirtualBox/misc
+
+
+#
+# Targets.
 #
 ifdef VBOX_WITH_HARDENING
@@ -41 +37 @@
 PROGRAMS += VirtualBox
 endif
-
 INSTALLS += VirtualBox.nls
 
@@ -87 +82 @@
 IMAGES         :=
 # FORMS and TRANSLATIONS are reset further down.
+
+
+#
+# Perform initial new version check on startup.
+# If this setting is disabled the user can still check using the menu.
+#
+ifndef VBOX_OSE
+VBOX_WITH_UPDATE_REQUEST := 1
+endif
 
 
@@ -979 +983 @@
 VirtualBox_SOURCES             += VirtualBox2_x4.qrc
 VirtualBox2_x4.qrc_RCCFLAGS  = -name BASIC2_X4
-VirtualBox_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
-$(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
+VirtualBox_SOURCES += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
+$(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
  VirtualBox_SOURCES += VirtualBoxShaders.qrc
@@ -1022 +1026 @@
 ): \
                 $(VBOX_XIDL_FILE) \
-                $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl \
+                $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl \
                 $(VBOX_FILESPLIT) \
                 | $$(dir $$@)
@@ -1028 +1032 @@
         $(QUIET)$(RM) -f -- "$@" "$(PATH_TARGET)/VirtualBoxComWrapperFiles.dep"
         $(QUIET)$(VBOX_XSLTPROC) -o $@ \
-                $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl $<
+                $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl $<
         $(QUIET)$(VBOX_FILESPLIT) $@ $(VirtualBox_0_OUTDIR)/include \
                 $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep VirtualBox_VBOX_COMWRAPPERS
@@ -1040 +1044 @@
 # Generate qrc file with branded icons.
 #
-VirtualBox_BLDDIRS       += $(VBOX_VIRTUALBOX4_OUT_DIR)
-VirtualBox_CLEAN         += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
-$(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc: \
-                $(VBOX_VIRTUALBOX4_SRC)/VirtualBoxBrand.qrc \
+VirtualBox_BLDDIRS       += $(VBOX_VIRTUALBOX_OUT_DIR)
+VirtualBox_CLEAN         += $(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc
+$(VBOX_VIRTUALBOX_OUT_DIR)/VirtualBoxBrand.qrc: \
+                $(VBOX_VIRTUALBOX_SRC)/VirtualBoxBrand.qrc \
                 $(PATH_ROOT)/Config.kmk \
                 | $$(dir $$@)