Changeset 99040 in vbox

Timestamp:

Mar 18, 2023 9:03:42 PM (21 months ago)

Author:

vboxsync

Message:

*.kmk: Applied scm with new indenting of multiline variable/function expansions in variable assignments. bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (35 diffs)
• Makefile.kmk (modified) (7 diffs)
• doc/manual/Makefile.kmk (modified) (5 diffs)
• include/Makefile.kmk (modified) (3 diffs)
• src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/linux/drm/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/os2/VBoxSF/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/solaris/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Disassembler/testcase/Makefile.kmk (modified) (3 diffs)
• src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/Makefile.kmk (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/freebsd/Makefile.kmk (modified) (4 diffs)
• src/VBox/Installer/linux/Makefile.kmk (modified) (10 diffs)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (3 diffs)
• src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/Makefile.kmk (modified) (7 diffs)
• src/VBox/Main/webservice/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (10 diffs)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/Config.kmk (modified) (7 diffs)
• src/VBox/ValidationKit/common/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/tests/api/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/java/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/python/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -264 +264 @@
 # @returns 1 if true, 0 if false.  For use with 'if'.
 VBOX_VERSION_PREREQ = $(expr $(call VBOX_FULL_VERSION_MAKE,$(VBOX_VERSION_MAJOR),$(VBOX_VERSION_MINOR),$(VBOX_VERSION_BUILD)) \
-        >= $(call VBOX_FULL_VERSION_MAKE,$1,$2,$3))
+                >= $(call VBOX_FULL_VERSION_MAKE,$1,$2,$3))
 
 
@@ -351 +351 @@
 # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
 VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT \
-        , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
+                        , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 if $(words $(VBOX_ONLY_BUILD)) > 1
  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
@@ -1402 +1402 @@
 #
 VBOX_ONLY_BUILD_NEW := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT \
-        , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
+                        , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 ifneq ($(VBOX_ONLY_BUILD),$(VBOX_ONLY_BUILD_NEW))
  $(error VBox: LocalConfig.kmk changed the VBOX_ONLY_ build status, VBOX_ONLY_* must be on the kmk command line or in the environment: $(VBOX_ONLY_BUILD) -> $(VBOX_ONLY_BUILD_NEW))
@@ -2234 +2234 @@
  if1of ($(KBUILD_HOST), win)
   VBOX_BLD_PYTHON := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/python/v*/python$(HOSTSUFF_EXE))) \
-        python-not-found.exe)
+                python-not-found.exe)
  else ifndef VBOX_WITH_PYTHON2_PREFERENCE
   VBOX_BLD_PYTHON := $(firstword \
-        $(which python3$(HOSTSUFF_EXE)) \
-        $(which python3.10$(HOSTSUFF_EXE)) \
-        $(which python3.9$(HOSTSUFF_EXE)) \
-        $(which python3.8$(HOSTSUFF_EXE)) \
-        $(which python3.7$(HOSTSUFF_EXE)) \
-        $(which python3.6$(HOSTSUFF_EXE)) \
-        $(which python3.5$(HOSTSUFF_EXE)) \
-        $(which python3.4$(HOSTSUFF_EXE)) \
-        $(which python2.7$(HOSTSUFF_EXE)) \
-        $(which python$(HOSTSUFF_EXE)) \
-        $(which python2.6$(HOSTSUFF_EXE)) \
-        python-not-found$(HOSTSUFF_EXE) )
+                $(which python3$(HOSTSUFF_EXE)) \
+                $(which python3.10$(HOSTSUFF_EXE)) \
+                $(which python3.9$(HOSTSUFF_EXE)) \
+                $(which python3.8$(HOSTSUFF_EXE)) \
+                $(which python3.7$(HOSTSUFF_EXE)) \
+                $(which python3.6$(HOSTSUFF_EXE)) \
+                $(which python3.5$(HOSTSUFF_EXE)) \
+                $(which python3.4$(HOSTSUFF_EXE)) \
+                $(which python2.7$(HOSTSUFF_EXE)) \
+                $(which python$(HOSTSUFF_EXE)) \
+                $(which python2.6$(HOSTSUFF_EXE)) \
+                python-not-found$(HOSTSUFF_EXE) )
  else
   VBOX_BLD_PYTHON := $(firstword \
-        $(which python2.7$(HOSTSUFF_EXE)) \
-        $(which python2.6$(HOSTSUFF_EXE)) \
-        $(which python$(HOSTSUFF_EXE)) \
-        $(which python3$(HOSTSUFF_EXE)) \
-        python-not-found$(HOSTSUFF_EXE) )
+                $(which python2.7$(HOSTSUFF_EXE)) \
+                $(which python2.6$(HOSTSUFF_EXE)) \
+                $(which python$(HOSTSUFF_EXE)) \
+                $(which python3$(HOSTSUFF_EXE)) \
+                python-not-found$(HOSTSUFF_EXE) )
  endif
 endif
@@ -2314 +2314 @@
 VBOX_PYLINT_FLAGS = $(if-expr $(VBOX_PYLINT_VERSION) >= 10500,--reports=n,--report=n) \
         $(if-expr $(VBOX_PYLINT_VERSION) >= 10000 \
-        ,--msg-template='{path}:{line}: <{msg_id}>({obj}:{symbol}): {msg}' \
+                ,--msg-template='{path}:{line}: <{msg_id}>({obj}:{symbol}): {msg}' \
         ,--output-format=msvs --include-ids=y) \
         --persistent=n \
@@ -2532 +2532 @@
 # The Microsoft IDL compiler (the SDK build needs this on non-Windows).
 VBOX_WIN_MIDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(qfirstfile ,$(qwildcard ,$(qaddsuffix ,/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee], \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN) \
-        $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "win.amd64",/x64,) \
-        $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1/bin/x86 \
-        $(KBUILD_DEVTOOLS)/win.x86/bin \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN) \
-        $(PATH_SDK_$(VBOX_WINPSDK)) \
-        $(PATH_SDK_WINPSDK_BIN) \
-        $(PATH_SDK_WINPSDK) \
-        )) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
+                                        $(PATH_SDK_$(VBOX_WINPSDK)_BIN) \
+                                        $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1/Bin$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "win.amd64",/x64,) \
+                                        $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1/bin/x86 \
+                                        $(KBUILD_DEVTOOLS)/win.x86/bin \
+                                        $(PATH_SDK_$(VBOX_WINPSDK)_BIN) \
+                                        $(PATH_SDK_$(VBOX_WINPSDK)) \
+                                        $(PATH_SDK_WINPSDK_BIN) \
+                                        $(PATH_SDK_WINPSDK) \
+                                        )) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
 
 # Tricks to work around midl.exe problems with spaces in the /cpp_cmd value, it
@@ -2670 +2670 @@
   ifndef VBOX_PATH_MACOSX_SDK_ROOT
    VBOX_PATH_MACOSX_SDK_ROOT := $(firstword $(wildcard \
-        $(PATH_TOOL_$(VBOX_GCC_TOOL)_SDKS) \
-        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs/. \
-        /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/. \
-        /Developer/SDKs/. \
-        /Library/Developer/CommandLineTools/SDKs/. ))
+                        $(PATH_TOOL_$(VBOX_GCC_TOOL)_SDKS) \
+                        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/SDKs/. \
+                        /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/. \
+                        /Developer/SDKs/. \
+                        /Library/Developer/CommandLineTools/SDKs/. ))
   endif
   ifndef VBOX_PATH_MACOSX_TOOLCHAIN_ROOT
    VBOX_PATH_MACOSX_TOOLCHAIN_ROOT := $(firstword $(wildcard \
-        $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN) \
-        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Library/Developer/CommandLineTools/. \
-        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Toolchains/XcodeDefault.xctoolchain/. \
-        /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/. \
-        /Library/Developer/CommandLineTools/. \
-        ) /. )
+                        $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN) \
+                        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Library/Developer/CommandLineTools/. \
+                        $(VBOX_PATH_MACOSX_DEVEL_ROOT)/Toolchains/XcodeDefault.xctoolchain/. \
+                        /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/. \
+                        /Library/Developer/CommandLineTools/. \
+                        ) /. )
   endif
  else
@@ -2715 +2715 @@
   ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
    VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
-        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk )
+                $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk )
   else
    VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk, $(VBOX_PATH_MACOSX_SDK_ROOT_DIRS))) \
-        $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk )
+                $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk )
   endif
  endif
@@ -3114 +3114 @@
   endif
   VBOX_GCC_CHECK_EX_CC_CXX = $(shell \
-        if $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) > /dev/null 2>&1; then \
-        case "`LC_ALL=C $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) 2>&1`" in \
-        "error: unknown warning option"*$(CLOSEPAR) echo "$(3)";; \
-        *$(CLOSEPAR) echo "$(2)";; \
-        esac; \
-        else echo "$(3)"; fi; )
+                if $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) > /dev/null 2>&1; then \
+                case "`LC_ALL=C $(1) $(subst -Wno-,-W,$(2)) -Werror -c -o /dev/null $(4) 2>&1`" in \
+                "error: unknown warning option"*$(CLOSEPAR) echo "$(3)";; \
+                *$(CLOSEPAR) echo "$(2)";; \
+                esac; \
+                else echo "$(3)"; fi; )
   VBOX_GCC_CHECK_EX_CC = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc   $(PATH_OUT)/DynamicConfig.c)
   VBOX_GCC_CHECK_EX_CXX = $(call VBOX_GCC_CHECK_EX_CC_CXX,$(1),$(2),$(3),-xc++ $(PATH_OUT)/DynamicConfig.cpp)
   VBOX_GCC_CHECK_EX_LD = $(shell \
-        if $(1) -Wl,$(2) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) \
-        -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-        then echo "-Wl,$(2)"; else echo "$(3)"; fi; )
+                if $(1) -Wl,$(2) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) \
+                -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+                then echo "-Wl,$(2)"; else echo "$(3)"; fi; )
 
   VBOX_GCC_CHECK_CC   = $(call VBOX_GCC_CHECK_EX_CC,  $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(TOOL_$(VBOX_GCC_TOOL)_CC),$1,$2)
@@ -3145 +3145 @@
   ifeq ($(KBUILD_TARGET),darwin)
    VBOX_CLANG_VERSION = $(shell $(1) --version | \
-        $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
+                $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
   endif
  endif
@@ -3175 +3175 @@
  # Figures the pylint version.
  VBOX_PYLINT_FIGURE_VERSION = $(shell $(1) --version 2> /dev/null \
-        | $(SED_EXT) -n -e 's/pylint-[^[:blank:]]*/pylint/' \
-        -e 's|^ *pylint *\([0-9][0-9]*\).\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
+                | $(SED_EXT) -n -e 's/pylint-[^[:blank:]]*/pylint/' \
+                -e 's|^ *pylint *\([0-9][0-9]*\).\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
 
  # Java stuff.
  ifeq ($(KBUILD_TARGET),darwin)
   VBOX_JAVA_BIN_PATH = $(firstword $(wildcard \
-        /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Commands \
-        /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
-        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 4,/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands,) \
-        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
-        ) /usr/bin)
+                        /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Commands \
+                        /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
+                        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 4,/System/Library/Frameworks/JavaVM.framework/Versions/A/Commands,) \
+                        $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
+                        ) /usr/bin)
   VBOX_JAVA     = $(VBOX_JAVA_BIN_PATH)/java
   VBOX_JAVAC    = $(VBOX_JAVA_BIN_PATH)/javac
@@ -3194 +3194 @@
   if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
    VBOX_JAVA_INC = $(firstword $(wildcard \
-        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
-        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
-        ) )
+                        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
+                        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
+                        ) )
   else
    VBOX_JAVA_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Headers
@@ -3207 +3207 @@
     # Add correct detection for you distro after the /usr/../java-6-sun line.
     VBOX_JAVA_HOME := $(firstword $(wildcard \
-        $(KBUILD_DEVTOOLS)/linux.x86/jdk1.6.0_27 \
-        /usr/lib/jvm/java-6-sun \
-        /usr/lib/jvm/java-6-openjdk \
-        /usr/lib/jvm/java-6-openjdk-i386 \
-        /usr/lib/jvm/java-6-openjdk-amd64 \
-        /usr/lib/jvm/java-7-openjdk-i386 \
-        /usr/lib/jvm/java-7-openjdk-amd64 \
-        /usr/lib/jvm/default-java \
-        /usr/lib/jvm/java \
-        /usr/lib/jvm/jre \
-        \
-        /usr/lib/jvm/sun-jdk-1.6 \
-        ) /usr/lib/jvm/java-6-sun)
+                        $(KBUILD_DEVTOOLS)/linux.x86/jdk1.6.0_27 \
+                        /usr/lib/jvm/java-6-sun \
+                        /usr/lib/jvm/java-6-openjdk \
+                        /usr/lib/jvm/java-6-openjdk-i386 \
+                        /usr/lib/jvm/java-6-openjdk-amd64 \
+                        /usr/lib/jvm/java-7-openjdk-i386 \
+                        /usr/lib/jvm/java-7-openjdk-amd64 \
+                        /usr/lib/jvm/default-java \
+                        /usr/lib/jvm/java \
+                        /usr/lib/jvm/jre \
+                        \
+                        /usr/lib/jvm/sun-jdk-1.6 \
+                        ) /usr/lib/jvm/java-6-sun)
    endif
   endif
@@ -3226 +3226 @@
    # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
    VBOX_JAVA_HOME ?= $(firstword $(abspath $(wildcard \
-        /usr/jdk/latest/include/.. \
-        /usr/jdk/instances/jdk1.8*/include/.. \
-        /usr/jdk/instances/jdk1.7*/include/.. \
-        /usr/jdk/instances/jdk1.6*/include/.. \
-        )) /usr/java)
+                                /usr/jdk/latest/include/.. \
+                                /usr/jdk/instances/jdk1.8*/include/.. \
+                                /usr/jdk/instances/jdk1.7*/include/.. \
+                                /usr/jdk/instances/jdk1.6*/include/.. \
+                                )) /usr/java)
   endif
 
@@ -3253 +3253 @@
  # The first transform the almost usless openjdk versions like "javac 9-Ubuntu" into something the 2nd expression groks.
  VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 \
-        | $(SED_EXT) -n \
-        -e 's/ \([0-9][0-9]*\)\(-[[:alpha:]][[:alpha:]]\)/ \1.0.0\2/' \
+                | $(SED_EXT) -n \
+                -e 's/ \([0-9][0-9]*\)\(-[[:alpha:]][[:alpha:]]\)/ \1.0.0\2/' \
         -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
 
@@ -4033 +4033 @@
  # Corp code signing client.
  VBOX_CCS_CLIENT_JAR := $(firstword $(rsort \
-        $(wildcard $(KBUILD_DEVTOOLS)/common/ccs/v*/Client.jar)) \
-        $(KBUILD_DEVTOOLS)/common/ccs/notfound/Client.jar )
+                        $(wildcard $(KBUILD_DEVTOOLS)/common/ccs/v*/Client.jar)) \
+                $(KBUILD_DEVTOOLS)/common/ccs/notfound/Client.jar )
  VBOX_CCS_USER       ?= virtualbox_grp
  VBOX_CCS_GLOBAL_UID ?= non-of-your-business
@@ -4066 +4066 @@
    else
     VBOX_PATH_SIGN_TOOLS := $(firstword $(rsort $(wildcard \
-        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v8.1*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
+                                $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v8.1*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
     ifeq ($(VBOX_PATH_SIGN_TOOLS),)
      VBOX_PATH_SIGN_TOOLS := $(firstword $(rsort $(wildcard \
-        $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v10*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
+                                $(addprefix $(KBUILD_DEVTOOLS)/win.x86/sdk/v10*/Bin/, x86 $(if-expr $(KBUILD_HOST_ARCH)=="amd64",x64,) ) )))
      ifeq ($(VBOX_PATH_SIGN_TOOLS),)
       VBOX_PATH_SIGN_TOOLS := $(VBOX_PATH_SELFSIGN)
@@ -4109 +4109 @@
   VBOX_CERTIFICATE_STORE_ARGS ?= /s "$(VBOX_CERTIFICATE_STORE)"
   VBOX_CERTIFICATE_FINGERPRINT_ARGS := $(if-expr "$(VBOX_CERTIFICATE_FINGERPRINT)" != "" \
-        ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_FINGERPRINT))",)
+                ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_FINGERPRINT))",)
 
   ifeq ($(VBOX_SIGNING_MODE),test)
@@ -4134 +4134 @@
   VBOX_CERTIFICATE_SHA2_STORE_ARGS ?= /s "$(VBOX_CERTIFICATE_SHA2_STORE)"
   VBOX_CERTIFICATE_SHA2_FINGERPRINT_ARGS := $(if-expr "$(VBOX_CERTIFICATE_SHA2_FINGERPRINT)" != "" \
-        ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_SHA2_FINGERPRINT))",) # Still using SHA-1 for fingerprinting, it's good enough for that!
+                ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_SHA2_FINGERPRINT))",) # Still using SHA-1 for fingerprinting, it's good enough for that!
   #VBOX_CERTIFICATE_EV_SUBJECT_NAME ?= MyEvCertificate
   VBOX_CERTIFICATE_EV_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_EV_SUBJECT_NAME)"
@@ -4141 +4141 @@
   #VBOX_CERTIFICATE_EV_FINGERPRINT ?= my ev cert fingerprint
   VBOX_CERTIFICATE_EV_FINGERPRINT_ARGS := $(if-expr "$(VBOX_CERTIFICATE_EV_FINGERPRINT)" != "" \
-        ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_EV_FINGERPRINT))",) # Still using SHA-1 for fingerprinting, it's good enough for that!
+                ,/sha1 "$(subst $(SP),,$(VBOX_CERTIFICATE_EV_FINGERPRINT))",) # Still using SHA-1 for fingerprinting, it's good enough for that!
 
   ## Sign a file (generic).
@@ -4154 +4154 @@
     VBOX_SIGN_FILE_FN     = $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-digest_algo $(if-expr "$5" == "",SHA1,SHA2)) \
         $(if-expr "$5" == "", \
-        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6) \
+                $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6) \
         $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,,-dual_sign -digest_algo SHA2))
    else ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
     ifdef VBOX_CERTIFICATE_SUBJECT_NAME
      VBOX_SIGN_FILE_FN     = $(if-expr "$5" == "",$(VBOX_SIGNTOOL_SHA1) \
-        sign /fd sha1 \
-        $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
-        $(VBOX_CERTIFICATE_STORE_ARGS) \
-        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
-        $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
-        $(VBOX_TSA_URL_ARGS) \
-        $(if $(strip $(2)),/d "$(strip $(2))",) \
-        $(3) \
-        "$(1)" \
-        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(VBOX_SIGNTOOL_SHA2) \
+                sign /fd sha1 \
+                $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
+                $(VBOX_CERTIFICATE_STORE_ARGS) \
+                $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
+                $(VBOX_CERTIFICATE_FINGERPRINT_ARGS) \
+                $(VBOX_TSA_URL_ARGS) \
+                $(if $(strip $(2)),/d "$(strip $(2))",) \
+                $(3) \
+                "$(1)" \
+                $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6))$(VBOX_SIGNTOOL_SHA2) \
         sign $(if-expr "$5" == "",/as,) /fd sha256 \
         $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
@@ -4244 +4244 @@
   # @remarks The parameters are the same as VBOX_SIGN_FILE_FN.
   VBOX_SIGN_IMAGE_WITH_EV_FN = $(call VBOX_SIGN_FILE_FN,$1,$2,$3,$4,$5)$(if-expr "$5" == "" && "$(target)" != "bldRTSignTool", \
-        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.dual" \
+                $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.dual" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(CP) -- "$1" "$1.dual" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(call VBOX_CCS_SIGN_CMD,microsoftev,$1,,-digest_algo SHA2) \
@@ -4280 +4280 @@
         "$(1)" \
         $(if-expr "$5" == "", \
-        $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.ccs" \
+                $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(RM) -f -- "$1.ccs" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(CP) -- "$1" "$1.ccs" \
         $(if-expr "$4" == "2",$$(NLTAB),$(NLTAB))$(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1.ccs,,-digest_algo SHA2) \
@@ -4358 +4358 @@
     VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
         $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
+                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
    else
     VBOX_SIGN_IMAGE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
@@ -4433 +4433 @@
         ditto -c -k --keepParent "$(1)" "$(1).zip"$(NLTAB) \
         $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(subst --entitlements=,-entitlement_file_path ,$(subst --deep,-deep,$(3))) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))$(NLTAB) \
+                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))$(NLTAB) \
         ditto -x -k "$(1).zip" "$(1)/../"$(NLTAB) \
         $(RM) -f -- "$(1).zip"
@@ -4458 +4458 @@
    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
         $(call VBOX_CCS_SIGN_CMD,binary,$(1),,$(subst --entitlements=,-entitlement_file_path ,$(3)) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
+                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime))
   else
    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
@@ -4476 +4476 @@
   if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
    VBOX_SIGN_EXTPACK_DYLIB_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),, \
-        $(call VBOX_CCS_SIGN_CMD,binary,$(out),, \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime)) )
+                $(call VBOX_CCS_SIGN_CMD,binary,$(out),, \
+                        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),-hardened_runtime)) )
   else
    VBOX_SIGN_EXTPACK_DYLIB_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),, \
-        $(VBOX_CODESIGN) \
-        --verbose=9 \
-        --force \
-        $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
-        $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
-        --file-list - \
-        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
+                $(VBOX_CODESIGN) \
+                --verbose=9 \
+                --force \
+                $(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 14,--digest-algorithm sha256,) \
+                $(if $(VBOX_WITH_MACOS_HARDENED_RUNTIME),$(if-expr $(KBUILD_HOST_VERSION_MAJOR) <= 16,--options 0x10000,--options runtime)) \
+                --file-list - \
+                $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
         $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
         $(out) )
@@ -4564 +4564 @@
     $1.kext_SOURCES += $$($1.kext_0_OUTDIR)/Contents/MacOS/$1=>MacOS/$1 \
         $(foreach extfile, $(VBOX_DARWIN_KEXT_SIGN_FILES) \
-        , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)=>_CodeSignature/$(extfile))
+                , $$($1.kext_0_OUTDIR)/Contents/_CodeSignature/$(extfile)=>_CodeSignature/$(extfile))
     $1.kext_SYMLINKS += $(foreach symfile, $(VBOX_DARWIN_KEXT_SIGN_SYMLINKS), $(symfile)=>_CodeSignature/$(symfile))
     $1.kext_CLEAN  += \
@@ -6868 +6868 @@
 TEMPLATE_VBoxR3AutoTest_INST        = $(INST_TESTCASE)
 TEMPLATE_VBoxR3AutoTest_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-        $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
+                $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
         $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
-        ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) $(SDK_VBoxLibLzmaStatic_LIBS) \
-        ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS) $(SDK_VBoxLibLzma_LIBS)) \
+                ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) $(SDK_VBoxLibLzmaStatic_LIBS) \
+                ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS) $(SDK_VBoxLibLzma_LIBS)) \
         ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LIBS.$(KBUILD_TARGET_ARCH)))
 
@@ -7337 +7337 @@
 TEMPLATE_VBoxMainComp-x86_LIBS = \
         $(subst $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB), \
-        $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86), \
-        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86), \
-        $(TEMPLATE_VBoxMainComp_LIBS))))
+                $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86), \
+                        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86), \
+                                $(TEMPLATE_VBoxMainComp_LIBS))))
 
 
@@ -7420 +7420 @@
 TEMPLATE_VBoxMainClientDll-x86_LIBS = \
         $(subst $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB), \
-        $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86), \
-        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86), \
-        $(TEMPLATE_VBoxMainClientDll_LIBS))))
+                $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86), \
+                        $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86), \
+                                $(TEMPLATE_VBoxMainClientDll_LIBS))))
 
 #
@@ -7602 +7602 @@
    VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))
    VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
-        $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
+                $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    ifdef VBOX_PATH_QT
     PATH_SDK_QT5  := $(VBOX_PATH_QT)
@@ -7952 +7952 @@
   ifndef VBOX_WITH_QT6
    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
-        -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
-        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"
+                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
+                        -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
+                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"
   else
    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
-        -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
-        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
+                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
+                        -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
+                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
   endif
  endif
@@ -8008 +8008 @@
  ifdef VBOX_WITH_NOCRT_STATIC
   TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-        $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
-        $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
+                $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
+                $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
  else
   TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-        $(VBOX_LIB_RUNTIME_STATIC) \
-        $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
-        $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
+                $(VBOX_LIB_RUNTIME_STATIC) \
+                $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
+                $(TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH)))
  endif
 endif # !VBOX_WITH_NLS
@@ -8306 +8306 @@
 else
  WIN32_MC = $(EXEC_X86_WIN32) $(firstword $(wildcard \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/MC.Exe \
-        $(PATH_SDK_WINPSDK_BIN)/MC.Exe \
-        $(PATH_SDK_WINPSDK)/Bin/MC.Exe \
-        $(PATH_SDK_WIN32SDK_BIN)/MC.Exe \
-        $(PATH_SDK_WIN64SDK_BIN)/MC.Exe \
-        $(KBUILD_DEVTOOLS)/win.x86/bin/mc.exe \
-        ) Sorry_Cannot_find_mc_in_the_PSDK)
+                        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/MC.Exe \
+                        $(PATH_SDK_WINPSDK_BIN)/MC.Exe \
+                        $(PATH_SDK_WINPSDK)/Bin/MC.Exe \
+                        $(PATH_SDK_WIN32SDK_BIN)/MC.Exe \
+                        $(PATH_SDK_WIN64SDK_BIN)/MC.Exe \
+                        $(KBUILD_DEVTOOLS)/win.x86/bin/mc.exe \
+                        ) Sorry_Cannot_find_mc_in_the_PSDK)
 endif
 

trunk/Makefile.kmk

@@ -132 +132 @@
    InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT)/), \
-        $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)) \
-        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
+                        $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)) \
+                ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
+                $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
    ifdef VBOX_WITH_32_ON_64_MAIN_API
     InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT)/), \
-        $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)) \
-        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
+                        $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)) \
+                ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
    endif
    ifeq ($(VBOX_VCC_CRT_TYPE),d)
     InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_DEBUG_CRT)/), \
-        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)))) \
-        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
-        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
+                        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)))) \
+                ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
+                $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
     ifdef VBOX_WITH_32_ON_64_MAIN_API
      InstallExternalLibs_SOURCES += \
         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_DEBUG_CRT)/), \
-        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
-        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
+                        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
+                ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
     endif
    endif
@@ -239 +239 @@
   qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
   qt5-bin_EXEC_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
-        $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod))
+                $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod))
   qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
-        $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist)
+                $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist)
   ifdef VBOX_WITH_QT_DSYMS
    qt5-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
-        $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \
-        $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod))
+                $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \
+                $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod))
   endif
   qt5-bin_EXEC_SOURCES += \
@@ -255 +255 @@
   ifdef VBOX_WITH_QT_DSYMS
    qt5-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \
-        $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
-        $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
+                $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
+                $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
    qt5-bin_SOURCES += $(foreach qtsqldrv, libqsqlite, \
-        $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
-        $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))
+                $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
+                $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))
    qt5-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \
-        $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
-        $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
+                $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
+                $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
   endif
   qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_FWRK_VER) \
-        Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_FWRK_VER)/$(qtmod) \
-        Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_FWRK_VER)/Resources)
+                Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_FWRK_VER) \
+                Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_FWRK_VER)/$(qtmod) \
+                Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_FWRK_VER)/Resources)
   qt5-bin_INSTALLER = $(INSTALL) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) $(if $(mode),-m $(mode)) $(4) -- \
         "$(1)" "$(2)" $(if-expr "$(source_type_prefix)" == "EXEC_" \
-        ,$(NLTAB)install_name_tool \
-        $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/$(VBOX_QT_FWRK_VER)/$(notdir $(2))",) \
-        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
-        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(VBOX_QT_PATH)/, \
-        -change "$(prefix)$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" \
-        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" ) ) \
-        "$(2)",)  # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
+                ,$(NLTAB)install_name_tool \
+                $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/$(VBOX_QT_FWRK_VER)/$(notdir $(2))",) \
+                $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
+                        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(VBOX_QT_PATH)/, \
+                                -change "$(prefix)$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" \
+                                "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" ) ) \
+                "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
  else # win x11
   if1of ($(KBUILD_TARGET), linux solaris)
@@ -408 +408 @@
   buildserver-docs_SOURCES = \
         $(addprefix $(PATH_TARGET)/, \
-        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
+                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
         UserManual.pdf \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
-        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
+                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
         UserManual_$(f).pdf))
   buildserver-docs_CLEANS = \
@@ -418 +418 @@
         $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip.tmp \
         $(addprefix $(PATH_TARGET)/, \
-        VirtualBox.chm UserManual.qch UserManual.qhc UserManual.pdf \
-        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
-        VirtualBox_$(f).chm \
-        UserManual_$(f).qch UserManual_$(f).qhc \
-        UserManual_$(f).pdf))
+                VirtualBox.chm UserManual.qch UserManual.qhc UserManual.pdf \
+                $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                        VirtualBox_$(f).chm \
+                        UserManual_$(f).qch UserManual_$(f).qhc \
+                        UserManual_$(f).pdf))
 
   $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| \
@@ -945 +945 @@
         $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(VBOX_CORE_DOXYFILE_INPUT_DIRS)))) ) \
         $(foreach dir, $(VBOX_CORE_DOXYFILE_INPUT_DIRS) \
-        , $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/*.m $(dir)/*.mm $(dir)/*.py $(dir)/.asm))
+                , $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/*.m $(dir)/*.mm $(dir)/*.py $(dir)/.asm))
 VBOX_CORE_DOXYFILE_INPUT := \
         $(VBOX_CORE_DOXYFILE_INPUT_FIRST) \
@@ -1114 +1114 @@
         $(if-expr "$1" == "solaris",--exclude=tools/common/openwatcom/,) \
         $(foreach os,$(filter-out $(1), darwin freebsd linux solaris os2 win), \
-        --exclude=tools/$(os)/ \
-        --exclude=tools/$(os).x86/ \
-        --exclude=tools/$(os).amd64/ \
-        --exclude=tools/$(os).arm64/ )
+                --exclude=tools/$(os)/ \
+                --exclude=tools/$(os).x86/ \
+                --exclude=tools/$(os).amd64/ \
+                --exclude=tools/$(os).arm64/ )
 
 #

trunk/doc/manual/Makefile.kmk

@@ -190 +190 @@
  ifdef VBOX_WITH_DOCS_ACCESSIBILITY
   INSTALLS += \
-        VBox-docs-accessibility
+        VBox-docs-accessibility \
         VBox-docs-accessibility-html
  endif
@@ -235 +235 @@
  BLDDIRS += \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, \
-        $(addsuffix /images, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /html-single, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /html-chunks, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /qhelp, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /qhelp/images, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /HTMLHelp, $(VBOX_MANUAL_LANGUAGES)) \
-        $(addsuffix /HTMLHelp/images, $(VBOX_MANUAL_LANGUAGES)) \
-        )
+                $(addsuffix /images, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /html-single, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /html-chunks, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /qhelp, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /qhelp/images, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /HTMLHelp, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /HTMLHelp/images, $(VBOX_MANUAL_LANGUAGES)) \
+                )
 
  # Explicit cleaning has some overlap with default cleaning rules, since this
@@ -252 +252 @@
         $(VBOX_XML_CATALOG_MANUAL) \
         $(VBOX_XML_ENTITIES) \
-        $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
-        $(VBOX_XML_XREF_TO_TEXT) \
-        $(VBOX_XML_XREF_TO_TEXT).cat \
-        $(addprefix user_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
-        $(VBOX_MANUAL_XML_REFENTRY_FILES) \
-        $(patsubst man_%,%.1,$(basename $(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-        man_VBoxHeadless.xml \
-        user_man_VBoxHeadless.xml \
-        man_vboximg-mount.xml \
-        user_man_vboximg-mount.xml \
-        isomakercmd-man.xml \
-        user_isomakercmd-man.xml \
-        $(VBOX_MANUAL_LATEX_FILES_TARGET) \
-        $(VBOX_MANUAL_PNG_FILES_$(lang)) \
-        $(notdir $(VBOX_MANUAL_TEX_UNICODE_FILES)) \
-        $(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
-        $(addprefix qhelp/,   $(VBOX_MANUAL_PNG_FILES_$(lang))) \
-        html-single/UserManual.html \
-        $(addprefix qhelp/, UserManual.qhp UserManual.qhcp $(VBOX_QHELP_OUTPUT_FILES)) \
-        $(addprefix HTMLHelp/,    index.html go01.html) \
-        $(addprefix qhelp/,       index.html go01.html) \
-        $(addprefix html-chunks/, index.html go01.html) \
-        $(foreach n,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 \
-        ,html-chunks/ch$(n).html \
-        html-chunks/re$(n).html \
-        HTMLHelp/ch$(n).html \
-        HTMLHelp/re$(n).html \
-        $(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,HTMLHelp/ch$(n)s$(d2)$(d1).html)) \
-        qhelp/ch$(n).html \
-        qhelp/re$(n).html \
-        $(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,qhelp/ch$(n)s$(d2)$(d1).html)) ) \
-        $(foreach n,a b c \
-        ,html-chunks/ap$(n).html \
-        HTMLHelp/ap$(n).html \
-        $(foreach s,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20,HTMLHelp/ap$(n)s$(s).html) \
-        qhelp/ap$(n).html \
-        $(foreach s,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20,qhelp/ap$(n)s$(s).html) ) \
-        $(foreach n,01 02 03 04 05 \
-        ,html-chunks/pr$(n).html \
-        HTMLHelp/pr$(n).html \
-        $(foreach s,01 02 03 04 05 06 07 08,HTMLHelp/pr$(n)s$(s).html) \
-        qhelp/pr$(n).html \
-        $(foreach s,01 02 03 04 05 06 07 08,qhelp/pr$(n)s$(s).html) ) \
-        HTMLHelp/toc.hhc \
-        HTMLHelp/htmlhelp.hhp \
-        qhelp/toc.hhc \
-        qhelp/htmlhelp.hhp \
-        UserManual.pdf \
-        VirtualBox.chm \
-        $(VBOX_QHELP_OUTPUT_FILES) \
-        ChangeLog.html \
-        validatemanual.run \
-        validateaccessibility.run \
-        validatesdkref.run \
-        )) \
+        $(foreach lang, $(VBOX_MANUAL_LANGUAGES) \
+                ,$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
+                        $(VBOX_XML_XREF_TO_TEXT) \
+                        $(VBOX_XML_XREF_TO_TEXT).cat \
+                        $(addprefix user_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+                        $(VBOX_MANUAL_XML_REFENTRY_FILES) \
+                        $(patsubst man_%,%.1,$(basename $(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+                        man_VBoxHeadless.xml \
+                        user_man_VBoxHeadless.xml \
+                        man_vboximg-mount.xml \
+                        user_man_vboximg-mount.xml \
+                        isomakercmd-man.xml \
+                        user_isomakercmd-man.xml \
+                        $(VBOX_MANUAL_LATEX_FILES_TARGET) \
+                        $(VBOX_MANUAL_PNG_FILES_$(lang)) \
+                        $(notdir $(VBOX_MANUAL_TEX_UNICODE_FILES)) \
+                        $(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
+                        $(addprefix qhelp/,   $(VBOX_MANUAL_PNG_FILES_$(lang))) \
+                        html-single/UserManual.html \
+                        $(addprefix qhelp/, UserManual.qhp UserManual.qhcp $(VBOX_QHELP_OUTPUT_FILES)) \
+                        $(addprefix HTMLHelp/,    index.html go01.html) \
+                        $(addprefix qhelp/,       index.html go01.html) \
+                        $(addprefix html-chunks/, index.html go01.html) \
+                        $(foreach n,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 \
+                                ,html-chunks/ch$(n).html \
+                                html-chunks/re$(n).html \
+                                HTMLHelp/ch$(n).html \
+                                HTMLHelp/re$(n).html \
+                                $(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,HTMLHelp/ch$(n)s$(d2)$(d1).html)) \
+                                qhelp/ch$(n).html \
+                                qhelp/re$(n).html \
+                                $(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,qhelp/ch$(n)s$(d2)$(d1).html)) ) \
+                        $(foreach n,a b c \
+                                ,html-chunks/ap$(n).html \
+                                HTMLHelp/ap$(n).html \
+                                $(foreach s,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20,HTMLHelp/ap$(n)s$(s).html) \
+                                qhelp/ap$(n).html \
+                                $(foreach s,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20,qhelp/ap$(n)s$(s).html) ) \
+                        $(foreach n,01 02 03 04 05 \
+                                ,html-chunks/pr$(n).html \
+                                HTMLHelp/pr$(n).html \
+                                $(foreach s,01 02 03 04 05 06 07 08,HTMLHelp/pr$(n)s$(s).html) \
+                                qhelp/pr$(n).html \
+                                $(foreach s,01 02 03 04 05 06 07 08,qhelp/pr$(n)s$(s).html) ) \
+                        HTMLHelp/toc.hhc \
+                        HTMLHelp/htmlhelp.hhp \
+                        qhelp/toc.hhc \
+                        qhelp/htmlhelp.hhp \
+                        UserManual.pdf \
+                        VirtualBox.chm \
+                        $(VBOX_QHELP_OUTPUT_FILES) \
+                        ChangeLog.html \
+                        validatemanual.run \
+                        validateaccessibility.run \
+                        validatesdkref.run \
+                        ) \
+                ) \
         $(VBOX_PATH_MANUAL_OUTBASE)/titlepage-htmlhelp.xsl \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
@@ -315 +317 @@
         \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/, \
-        $(VBOX_SDKREF_LATEX_FILES_TARGET) \
-        SDKRef.pdf \
-        ) \
+                $(VBOX_SDKREF_LATEX_FILES_TARGET) \
+                SDKRef.pdf \
+                ) \
         $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf \
         \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/, \
-        $(VBOX_ACCESSIBILITY_LATEX_FILES_TARGET) \
-        html-single/Accessibility.html \
-        Accessibility.pdf \
-        ) \
+                $(VBOX_ACCESSIBILITY_LATEX_FILES_TARGET) \
+                html-single/Accessibility.html \
+                Accessibility.pdf \
+                ) \
         $(PATH_STAGE_BIN)/Accessibility.html \
         $(PATH_STAGE_BIN)/Accessibility.pdf \
@@ -673 +675 @@
 
  VBOX_USER_MANUAL_STAGED_DITA_FILES  := $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/, \
-        $(notdir $(wildcard $(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/*dita)))
+                $(notdir $(wildcard $(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/*dita)))
  VBOX_USER_MANUAL_STAGED_IMAGE_FILES := $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/images/, \
-        $(notdir $(wildcard $(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/images/*)))
+                $(notdir $(wildcard $(VBOX_PATH_MANUAL_SRC)/en_US/dita/topics/images/*)))
 
  $(VBOX_USER_MANUAL_STAGED_DITA_FILES) \

trunk/include/Makefile.kmk

@@ -123 +123 @@
         VBox/VBoxGL2D.h \
         $(if-expr "$(KBUILD_TARGET)" != "linux", \
-        VBox/GuestHost/SharedClipboard-x11.h \
-        ,) \
+                VBox/GuestHost/SharedClipboard-x11.h \
+                ,) \
         $(if-expr "$(KBUILD_TARGET)" != "solaris", \
-        VBox/usblib-solaris.h \
-        ,) \
+                VBox/usblib-solaris.h \
+                ,) \
         VBox/VDEPlug.h \
         VBox/VDEPlugSymDefs.h \
         VBox/VBoxNetCmn-win.h \
         $(if-expr "$(KBUILD_TARGET)" != "win", \
-        VBox/com/microatl.h \
-        VBox/GuestHost/SharedClipboard-win.h \
-        VBox/usblib-win.h \
-        VBox/VBoxDrvCfg-win.h \
-        VBox/VBoxNetCfg-win.h \
-        iprt/sanitized/intrin.h \
-        ,$(VBOX_HDRS_GCC_ONLY)) \
+                VBox/com/microatl.h \
+                VBox/GuestHost/SharedClipboard-win.h \
+                VBox/usblib-win.h \
+                VBox/VBoxDrvCfg-win.h \
+                VBox/VBoxNetCfg-win.h \
+                iprt/sanitized/intrin.h \
+                ,$(VBOX_HDRS_GCC_ONLY)) \
         \
         VBox/dbus-calls.h \
@@ -177 +177 @@
 # We omit a few headers which have platform specific issues or are templates.
 VBOX_HDRS_ALL := $(filter-out $(VBOX_HDRS_OMIT), \
-        $(subst $(PATH_SUB_CURRENT)/,,$(wildcard \
-        $(PATH_SUB_CURRENT)/VBox/*.h \
-        $(PATH_SUB_CURRENT)/VBox/*/*.h \
-        $(PATH_SUB_CURRENT)/iprt/*.h \
-        $(PATH_SUB_CURRENT)/iprt/*/*.h \
-        )))
+                $(subst $(PATH_SUB_CURRENT)/,,$(wildcard \
+                                $(PATH_SUB_CURRENT)/VBox/*.h \
+                                $(PATH_SUB_CURRENT)/VBox/*/*.h \
+                                $(PATH_SUB_CURRENT)/iprt/*.h \
+                                $(PATH_SUB_CURRENT)/iprt/*/*.h \
+                                )))
 
 # ring-3, ring-0 and raw-mode context specific exclusions.
@@ -199 +199 @@
 VBOX_HDRS_ALL_R0DRV_C := $(filter-out $(VBOX_HDRS_CPP_FEATURES), $(VBOX_HDRS_ALL_R0DRV))
 VBOX_HDRS_ALL_RC      := $(filter-out \
-        VBox/VBoxGuestLib.h \
-        VBox/vmm/gvm.h \
-        iprt/thread.h \
-        iprt/mem.h \
-        iprt/memsafer.h \
-        iprt/alloc.h \
-        iprt/vector.h \
-        $(VBOX_HDRS_R3_CPP) \
-        $(VBOX_HDRS_R3_ONLY) \
-        $(VBOX_HDRS_R0DRV_ONLY) \
-        , $(VBOX_HDRS_ALL))
+                VBox/VBoxGuestLib.h \
+                VBox/vmm/gvm.h \
+                iprt/thread.h \
+                iprt/mem.h \
+                iprt/memsafer.h \
+                iprt/alloc.h \
+                iprt/vector.h \
+                $(VBOX_HDRS_R3_CPP) \
+                $(VBOX_HDRS_R3_ONLY) \
+                $(VBOX_HDRS_R0DRV_ONLY) \
+                , $(VBOX_HDRS_ALL))
 VBOX_HDRS_ALL_RC_C := $(filter-out $(VBOX_HDRS_CPP_FEATURES), $(VBOX_HDRS_ALL_RC))
 #$(error $(subst $(SP),$(NLTAB),$(strip $(sort $(VBOX_HDRS_ALL_RC_C)))))

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -253 +253 @@
 
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += $(addprefix $(PATH_STAGE_BIN)/additions/, \
-        $(VBOX_GA_CERT_ROOT_SHA1) \
-        $(VBOX_GA_CERT_ROOT_SHA1_TS) \
-        $(VBOX_GA_CERT_ROOT_SHA2) \
-        $(VBOX_GA_CERT_ROOT_SHA2_TS) \
-        $(VBOX_GA_CERT_ROOT_SHA2_R3) \
-        $(VBOX_GA_CERT_ROOT_SHA2_R3_TS))
+                $(VBOX_GA_CERT_ROOT_SHA1) \
+                $(VBOX_GA_CERT_ROOT_SHA1_TS) \
+                $(VBOX_GA_CERT_ROOT_SHA2) \
+                $(VBOX_GA_CERT_ROOT_SHA2_TS) \
+                $(VBOX_GA_CERT_ROOT_SHA2_R3) \
+                $(VBOX_GA_CERT_ROOT_SHA2_R3_TS))
 
 VB_WIN_ADD_NSIS_ENV := \
@@ -289 +289 @@
         -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
         $(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \
-        ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
+                ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
 
 $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \

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

@@ -44 +44 @@
 vboxvideo-src_INSTALLER = $(RM_EXT) -f -- "$2" && \
         $(if $(filter %.c %.h,$2),$(SED) -f $(PATH_ROOT)/src/VBox/Additions/linux/drm/indent.sed \
-        --output "$2" "$1",$(CP_EXT) "$1" "$2") && \
+                --output "$2" "$1",$(CP_EXT) "$1" "$2") && \
         $(CHMOD_EXT) "$(if $(mode),$(mode),0644)" "$2"
 

trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk

@@ -181 +181 @@
 else
  VBoxSF_LDFLAGS     := $(addprefix -Zlinker , \
-        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-        TYPE DATA PRELOAD DYNAMIC)
+                SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+                TYPE DATA PRELOAD DYNAMIC)
  #VBoxSF_LDFLAGS      += -s -t -v
 endif

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

@@ -150 +150 @@
         $(SOLARIS_ADDINST_OUT_DIR) \
         $(addprefix $(SOLARIS_ADDINST_OUT_DIR)/, \
-        opt \
-        opt/VirtualBoxAdditions \
-        opt/VirtualBoxAdditions/$(SOLARIS_ADDDIR_NAME_32) \
-        opt/VirtualBoxAdditions/$(SOLARIS_ADDDIR_NAME_64) \
-        usr \
-        usr/bin \
-        usr/sbin \
-        usr/lib \
-        usr/lib/amd64 \
-        usr/kernel \
-        usr/kernel/drv \
-        usr/kernel/drv/amd64 \
-        var \
-        var/svc \
-        var/svc/manifest \
-        var/svc/manifest/application \
-        var/svc/manifest/application/virtualbox \
-        )
+                opt \
+                opt/VirtualBoxAdditions \
+                opt/VirtualBoxAdditions/$(SOLARIS_ADDDIR_NAME_32) \
+                opt/VirtualBoxAdditions/$(SOLARIS_ADDDIR_NAME_64) \
+                usr \
+                usr/bin \
+                usr/sbin \
+                usr/lib \
+                usr/lib/amd64 \
+                usr/kernel \
+                usr/kernel/drv \
+                usr/kernel/drv/amd64 \
+                var \
+                var/svc \
+                var/svc/manifest \
+                var/svc/manifest/application \
+                var/svc/manifest/application/virtualbox \
+                )
 
 SOLARIS_ADD_STRIP_BINS = \

trunk/src/VBox/Devices/Makefile.kmk

@@ -1198 +1198 @@
         $(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
         $(if $(VBOX_WITH_PXE_ROM), \
-        $(if $(VBOX_WITH_INTEL_PXE), \
-        $(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB), \
-        $(PATH_STAGE_LIB)/iPxeBiosBin$(VBOX_SUFF_LIB)),) \
+                $(if $(VBOX_WITH_INTEL_PXE), \
+                        $(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB), \
+                        $(PATH_STAGE_LIB)/iPxeBiosBin$(VBOX_SUFF_LIB)),) \
         $(LIB_RUNTIME)
  VBoxDD2_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD2.dylib

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

@@ -110 +110 @@
  VBOX_DISAS_TESTS_BIN = $(VBOX_DISAS_TESTS_BUILD) $(VBOX_DISAS_TESTS_INVALID)
  VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \
-        $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin) \
-        $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin) \
-        $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin))
+                $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin) \
+                $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin) \
+                $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin))
 
  $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-16.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@)
@@ -129 +129 @@
  # Generate the rules for the 'build' tests.
  VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm) \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm) \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm))
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm) \
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm) \
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm))
 
  $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)
@@ -147 +147 @@
 
  VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin) \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin) \
-        $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin))
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin) \
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin) \
+                $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin))
 
  $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -291 +291 @@
         $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceMain.$(3)=>$(1)/VBoxDTraceMain.$(3) \
         $(if $(intersects $1, solaris.x86 solaris.amd64),, \
-        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceCmd.$(3)=>$(1)/VBoxDTraceCmd.$(3) \
-        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceR0.r0=>$(1)/VBoxDTraceR0.r0 \
-        )
+                $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceCmd.$(3)=>$(1)/VBoxDTraceCmd.$(3) \
+                $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/$(1)/VBoxDTraceR0.r0=>$(1)/VBoxDTraceR0.r0 \
+                )
 
  VBOX_VBOXDTRACE_FILES := \

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

@@ -138 +138 @@
   VBoxManageNls_QT_TRANSLATIONS = $(addsuffix .ts,$(addprefix $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_,$(VBOX_APPROVED_VBOXMANAGE_LANGUAGES)))
   VBoxManageNls_VBOX_ALL_NLS_SOURCES = $(wildcard \
-        $(VBOX_PATH_VBOXMANAGE_SRC)/*.h \
-        $(VBOX_PATH_VBOXMANAGE_SRC)/*.cpp )
+                $(VBOX_PATH_VBOXMANAGE_SRC)/*.h \
+                $(VBOX_PATH_VBOXMANAGE_SRC)/*.cpp )
 
   updatenls:: makeallnls $(VBOX_PATH_VBOXMANAGE_SRC)/nls/VBoxManageNls_en.ts
@@ -379 +379 @@
  VBoxManage_SOURCES += \
         $(foreach lang, $(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES) \
-        , $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(lang).cpp)
+                , $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_$(lang).cpp)
 
  VBoxManage_CLEAN += \
         $(foreach lang,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES), \
-        $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
-        $(VBOX_XML_XREF_TO_TEXT) \
-        $(VBOX_XML_XREF_TO_TEXT).cat \
-        )) \
+                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
+                        $(VBOX_XML_XREF_TO_TEXT) \
+                        $(VBOX_XML_XREF_TO_TEXT).cat \
+                        )) \
         $(addsuffix .cpp,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
         $(addsuffix .cpp.ts,$(addprefix $(VBoxManage_0_OUTDIR)/VBoxManageBuiltInHelp_,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))) \
         $(foreach file, $(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
-        , $(addsuffix /$(file),$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))))
+                , $(addsuffix /$(file),$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES))))
 
  # Preprocess the xml files, applying remarks.

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

@@ -431 +431 @@
 VirtualBoxVM_LDFLAGS.darwin = \
         $(if $(VBOX_WITH_HARDENING) \
-        ,-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBoxVM.dylib \
-        ,-rpath @executable_path/../../../../MacOS \
-        -rpath @executable_path/../../../../Frameworks) \
+                ,-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VirtualBoxVM.dylib \
+                ,-rpath @executable_path/../../../../MacOS \
+                -rpath @executable_path/../../../../Frameworks) \
         -framework AppKit -framework Carbon -framework IOKit
 
@@ -2068 +2068 @@
 QTGUI_DOXYFILE_INPUT_DIRS := \
         $(addprefix $(PATH_SUB_CURRENT)/src/, \
-        converter \
-        extensions \
-        extensions/graphics \
-        extradata \
-        globals \
-        manager \
-        manager/chooser \
-        manager/details \
-        manager/tools \
-        manager \
-        manager \
-        medium \
-        net \
-        objects \
-        platform \
-        platform/darwin \
-        platform/os2 \
-        platform/win \
-        platform/x11 \
-        runtime \
-        runtime/fullscreen \
-        runtime/information \
-        runtime/guestctrl \
-        runtime/normal \
-        runtime/scale \
-        runtime/seamless \
-        selector \
-        selector/graphics \
-        selector/graphics/chooser \
-        selector/graphics/details \
-        settings \
-        settings/global \
-        settings/machine \
-        widgets \
-        widgets/graphics \
-        wizards \
-        wizards/addcloudvm \
-        wizards/clonevd \
-        wizards/clonevm \
-        wizards/exportappliance \
-        wizards/importappliance \
-        wizards/newcloudvm \
-        wizards/newvd \
-        wizards/newvm)
+                converter \
+                extensions \
+                extensions/graphics \
+                extradata \
+                globals \
+                manager \
+                manager/chooser \
+                manager/details \
+                manager/tools \
+                manager \
+                manager \
+                medium \
+                net \
+                objects \
+                platform \
+                platform/darwin \
+                platform/os2 \
+                platform/win \
+                platform/x11 \
+                runtime \
+                runtime/fullscreen \
+                runtime/information \
+                runtime/guestctrl \
+                runtime/normal \
+                runtime/scale \
+                runtime/seamless \
+                selector \
+                selector/graphics \
+                selector/graphics/chooser \
+                selector/graphics/details \
+                settings \
+                settings/global \
+                settings/machine \
+                widgets \
+                widgets/graphics \
+                wizards \
+                wizards/addcloudvm \
+                wizards/clonevd \
+                wizards/clonevm \
+                wizards/exportappliance \
+                wizards/importappliance \
+                wizards/newcloudvm \
+                wizards/newvd \
+                wizards/newvm)
 
 QTGUI_DOXYFILE_INPUT := \
         $(foreach dir, $(QTGUI_DOXYFILE_INPUT_DIRS), \
-        $(sort $(wildcard $(dir)/*.h)) \
-        $(sort $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm)))
+                $(sort $(wildcard $(dir)/*.h)) \
+                $(sort $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm)))
 
 includedep $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui.dep

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -593 +593 @@
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES) \
-        ,Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_VERSION_MAJOR) )
+                ,Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_VERSION_MAJOR) )
 endif
 ifdef VBOX_WITH_PYTHON

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -57 +57 @@
 OTHER_CLEAN   += \
         $(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/, \
-        pkg_plist \
-        LICENSE) \
+                pkg_plist \
+                LICENSE) \
         $(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*)
 
@@ -102 +102 @@
         VBoxHostChannel.so \
         $(if $(VBOX_WITH_MAIN), \
-        VBoxManage \
-        VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
-        VBoxNetAdpCtl \
-        VBoxSVC \
-        VBoxXPCOM.so \
-        VBoxXPCOMC.so \
-        VBoxXPCOMIPCD \
-        components/VBoxXPCOMIPCC.so \
-        components/VBoxSVCM.so \
-        components/VBoxC.so,) \
+                VBoxManage \
+                VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
+                VBoxNetAdpCtl \
+                VBoxSVC \
+                VBoxXPCOM.so \
+                VBoxXPCOMC.so \
+                VBoxXPCOMIPCD \
+                components/VBoxXPCOMIPCC.so \
+                components/VBoxSVCM.so \
+                components/VBoxC.so,) \
         VBoxTestOGL \
         $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
@@ -128 +128 @@
         $(if $(VBOX_OSE),,LICENSE) \
         $(if $(VBOX_WITH_MAIN), \
-        components/VBoxXPCOMBase.xpt \
-        components/VirtualBox_XPCOM.xpt) \
+                components/VBoxXPCOMBase.xpt \
+                components/VirtualBox_XPCOM.xpt) \
         vboxdrv.tar.gz
 
@@ -142 +142 @@
 VBOX_FBSD_SYMLINKS = \
         $(if $(VBOX_WITH_MAIN), \
-        VBoxManage \
-        VBoxSVC) \
+                VBoxManage \
+                VBoxSVC) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \

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

@@ -46 +46 @@
 VBOX_LNX_APP_PRIVATE    := $(if $(VBOX_PATH_APP_PRIVATE),$(VBOX_PATH_APP_PRIVATE),/opt/VirtualBox)
 VBOX_LNX_APP_DOCS       := $(if $(VBOX_PATH_PACKAGE_DOCS),$(VBOX_PATH_PACKAGE_DOCS), \
-        $(if $(VBOX_PATH_APP_DOCS),$(VBOX_PATH_APP_DOCS),/opt/VirtualBox))
+                $(if $(VBOX_PATH_APP_DOCS),$(VBOX_PATH_APP_DOCS),/opt/VirtualBox))
 VBOX_PATH_LNX_INST_SRC  := $(PATH_SUB_CURRENT)
 VBOX_LNX_INST_OUT_DIR   := $(PATH_TARGET)/Installer/linux
@@ -67 +67 @@
 OTHER_CLEAN   += \
         $(addprefix $(VBOX_LNX_INST_STAGE_DIR)/, \
-        install.sh \
-        VirtualBox.tar.bz2 \
-        LICENSE) \
+                install.sh \
+                VirtualBox.tar.bz2 \
+                LICENSE) \
         $(wildcard $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-*) \
         $(VBOX_LNX_INST_OUT_DIR)/install.sh
@@ -119 +119 @@
 ifeq ($(KBUILD_TYPE),asan)
  linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \
-        ,$(lib)=>$(notdir $(lib)) $(lib)=>testcase/$(notdir $(lib)) $(lib)=>tools/$(notdir $(lib)) )
+                ,$(lib)=>$(notdir $(lib)) $(lib)=>testcase/$(notdir $(lib)) $(lib)=>tools/$(notdir $(lib)) )
 endif
 linux-misc_CLEAN = \
@@ -170 +170 @@
         $(if $(VBOX_WITH_DRAG_AND_DROP),VBoxDragAndDropSvc.so,) \
         $(if $(VBOX_WITH_MAIN), \
-        $(if $(VBOX_WITH_FE_AUTOSTART),VBoxAutostart,) \
-        $(if $(VBOX_WITH_FE_BALLOONCTRL),VBoxBalloonCtrl,) \
-        $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport,) \
-        VBoxManage \
-        VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
-        $(if $(VBOX_WITH_LWIP_NAT),VBoxNetNAT $(if $(VBOX_WITH_HARDENING),VBoxNetNAT.so,),) \
-        VBoxNetAdpCtl \
-        $(if $(VBOX_WITH_DEVMAPPER),VBoxVolInfo,) \
-        VBoxSVC \
-        VBoxXPCOM.so \
-        VBoxXPCOMC.so \
-        VBoxXPCOMIPCD \
-        components/VBoxXPCOMIPCC.so \
-        components/VBoxSVCM.so \
-        components/VBoxC.so,) \
+                $(if $(VBOX_WITH_FE_AUTOSTART),VBoxAutostart,) \
+                $(if $(VBOX_WITH_FE_BALLOONCTRL),VBoxBalloonCtrl,) \
+                $(if $(VBOX_WITH_FE_BUGREPORT),VBoxBugReport,) \
+                VBoxManage \
+                VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
+                $(if $(VBOX_WITH_LWIP_NAT),VBoxNetNAT $(if $(VBOX_WITH_HARDENING),VBoxNetNAT.so,),) \
+                VBoxNetAdpCtl \
+                $(if $(VBOX_WITH_DEVMAPPER),VBoxVolInfo,) \
+                VBoxSVC \
+                VBoxXPCOM.so \
+                VBoxXPCOMC.so \
+                VBoxXPCOMIPCD \
+                components/VBoxXPCOMIPCC.so \
+                components/VBoxSVCM.so \
+                components/VBoxC.so,) \
         $(if $(VBOX_WITH_QTGUI),VBoxTestOGL,) \
         $(if $(VBOX_WITH_VMSVGA3D),VBoxSVGA3D.so,) \
@@ -191 +191 @@
         $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
         $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \
-        ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
-        ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
+                ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
+                ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \
         $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,)
@@ -229 +229 @@
         $(if $(VBOX_OSE),,LICENSE) \
         $(if $(VBOX_WITH_MAIN), \
-        components/VBoxXPCOMBase.xpt \
-        components/VirtualBox_XPCOM.xpt) \
+                components/VBoxXPCOMBase.xpt \
+                components/VirtualBox_XPCOM.xpt) \
         $(if $(VBOX_WITH_PYTHON),vboxshell.py,) \
         $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \
-        ExtensionPacks/VNC/ExtPack.xml \
-        ExtensionPacks/VNC/ExtPack-license.html \
-        ExtensionPacks/VNC/ExtPack-license.rtf \
-        ExtensionPacks/VNC/ExtPack-license.txt,) \
+                ExtensionPacks/VNC/ExtPack.xml \
+                ExtensionPacks/VNC/ExtPack-license.html \
+                ExtensionPacks/VNC/ExtPack-license.rtf \
+                ExtensionPacks/VNC/ExtPack-license.txt,) \
         check_module_dependencies.sh \
         postinst-common.sh \
@@ -372 +372 @@
 VBOX_MIME_ICONS = \
         $(addprefix $(PATH_ROOT)/src/VBox/Artwork/other/, \
-        $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-        $(foreach s,16 20 24 32 48 64 72 96 128 256, \
-        virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
+                $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
+                        $(foreach s,16 20 24 32 48 64 72 96 128 256, \
+                                virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
 
 VBOX_DESKTOP_ICONS = \
         $(addprefix $(PATH_ROOT)/src/VBox/Artwork/$(if $(VBOX_OSE),OSE,NonOSE)/, \
-        $(foreach s,16 20 32 40 48 64 128, \
-        virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png) \
-        virtualbox.svg=>scalable/virtualbox.svg)
+                $(foreach s,16 20 32 40 48 64 128, \
+                        virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png) \
+                virtualbox.svg=>scalable/virtualbox.svg)
 
 #
@@ -390 +390 @@
 OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(filter-out src,$(VBOX_LNX_ARCH_FILES)) src/vboxhost) \
         $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, \
-        $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
+                $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
 
 #
@@ -522 +522 @@
 # rules for creating directories in archive (the pattern rules depends on these).
 BLDDIRS += $(foreach d, \
-        archive \
-        archive/components \
-        archive/nls \
-        $(if $(VBOX_WITH_UNATTENDED),archive/unattended_templates,) \
-        $(if $(VBOX_WITH_ORACLE_QT), \
-        archive/plugins/platforms \
-        archive/plugins/platformthemes \
-        archive/plugins/sqldrivers \
-        archive/plugins/styles \
-        archive/plugins/xcbglintegrations,) \
-        $(if $(VBOX_WITH_PYTHON), \
-        archive/sdk/installer \
-        archive/sdk/installer/vboxapi \
-        archive/sdk/bindings/xpcom/python/xpcom \
-        archive/sdk/bindings/xpcom/python/xpcom/client \
-        archive/sdk/bindings/xpcom/python/xpcom/server,) \
-        $(if $(VBOX_WITH_JXPCOM), \
-        archive/sdk/bindings/xpcom/java,) \
-        $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \
-        archive/ExtensionPacks/VNC \
-        archive/ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),) \
-        archive/additions \
-        $(if-expr defined(VBOX_UNATTENDED_TEMPLATES),archive/UnattendedTemplates,) \
+                archive \
+                archive/components \
+                archive/nls \
+                $(if $(VBOX_WITH_UNATTENDED),archive/unattended_templates,) \
+                $(if $(VBOX_WITH_ORACLE_QT), \
+                        archive/plugins/platforms \
+                        archive/plugins/platformthemes \
+                        archive/plugins/sqldrivers \
+                        archive/plugins/styles \
+                        archive/plugins/xcbglintegrations,) \
+                $(if $(VBOX_WITH_PYTHON), \
+                        archive/sdk/installer \
+                        archive/sdk/installer/vboxapi \
+                        archive/sdk/bindings/xpcom/python/xpcom \
+                        archive/sdk/bindings/xpcom/python/xpcom/client \
+                        archive/sdk/bindings/xpcom/python/xpcom/server,) \
+                $(if $(VBOX_WITH_JXPCOM), \
+                        archive/sdk/bindings/xpcom/java,) \
+                $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \
+                        archive/ExtensionPacks/VNC \
+                        archive/ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),) \
+                archive/additions \
+                $(if-expr defined(VBOX_UNATTENDED_TEMPLATES),archive/UnattendedTemplates,) \
         install \
         $(if $(VBOX_WITH_DTRACE), \
-        archive/dtrace \
-        archive/dtrace/lib \
-        archive/dtrace/lib/$(KBUILD_TARGET_ARCH) \
-        archive/dtrace/testcase/ \
-        archive/dtrace/testcase/$(KBUILD_TARGET_ARCH) \
-        archive/dtrace/scripts,) \
+                archive/dtrace \
+                archive/dtrace/lib \
+                archive/dtrace/lib/$(KBUILD_TARGET_ARCH) \
+                archive/dtrace/testcase/ \
+                archive/dtrace/testcase/$(KBUILD_TARGET_ARCH) \
+                archive/dtrace/scripts,) \
         ,$(VBOX_LNX_INST_OUT_DIR)/$(d)/)
 
@@ -583 +583 @@
 # rules for creating directories in archive-dbg (the pattern rules depends on these).
 BLDDIRS += $(foreach d, \
-        $(VBOX_LNX_DBG_PATH) \
-        $(VBOX_LNX_DBG_PATH)/components \
-        ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)
+                $(VBOX_LNX_DBG_PATH) \
+                $(VBOX_LNX_DBG_PATH)/components \
+                ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)
 
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -139 +139 @@
 solaris-icons_MODE = a+r,u+w
 solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES) \
-        ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))
+                        ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
 
@@ -357 +357 @@
         $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
         $(if $(VBOX_WITH_QTGUI), \
-        VBoxKeyboard.so) \
+                VBoxKeyboard.so) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \
         components/VBoxC.so \
@@ -445 +445 @@
         UserManual.pdf \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
-        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
+                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
         UserManual_$(f).pdf)
 endif

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -226 +226 @@
         $(VBOX_WIN_INST_REPACK_DIR)/ \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/ \
-        $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ ) \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/ \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ ) \
         $(VBOX_WIN_INST_OUT_DIR)/NLS/
 
@@ -242 +242 @@
         $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
-        $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
-        $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \
-        $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep \
-        $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix \
-        $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files \
-        $(VBOX_WIN_INST_REPACK_DIR)/2-link-$(PACKAGE_NAME_LANG).cmd \
-        $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/Language_$(lang).wxl \
-        $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl ) \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \
+                $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep \
+                $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix \
+                $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files \
+                $(VBOX_WIN_INST_REPACK_DIR)/2-link-$(PACKAGE_NAME_LANG).cmd \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl ) \
         $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
@@ -283 +283 @@
  OTHER_CLEAN += \
         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-        $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixpdb \
-        $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix \
-        $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files)
+                $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep \
+                        $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixpdb \
+                        $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix \
+                        $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files)
  BLDDIRS        += $foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
         $(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/)

trunk/src/VBox/Main/Makefile.kmk

@@ -337 +337 @@
         $(if-expr defined(VBOX_ONLY_EXTPACKS) \
         , $(addprefix $(VBoxAPIWrap_0_OUTDIR)/,$(filter \
-        Cloud% \
-        DataStreamWrap.cpp \
-        %FormValueWrap.cpp \
-        %FormWrap.cpp \
-        StringArrayWrap.cpp \
-        , $(notdir $(VBOX_MAIN_APIWRAPPER_GEN_SRCS)))) \
+                        Cloud% \
+                        DataStreamWrap.cpp \
+                        %FormValueWrap.cpp \
+                        %FormWrap.cpp \
+                        StringArrayWrap.cpp \
+                        , $(notdir $(VBOX_MAIN_APIWRAPPER_GEN_SRCS)))) \
         , $(VBOX_MAIN_APIWRAPPER_GEN_SRCS))
  VBoxAPIWrap_INTERMEDIATES   = $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
@@ -655 +655 @@
         src-server/NATNetworkImpl.cpp \
         $(if $(VBOX_WITH_CLOUD_NET), \
-        src-server/CloudNetworkImpl.cpp \
-        ,) \
+                src-server/CloudNetworkImpl.cpp \
+                ,) \
         src-server/GuestDebugControlImpl.cpp \
         src-server/GuestOSTypeImpl.cpp \
@@ -665 +665 @@
         src-server/HostPower.cpp \
         $(if $(VBOX_WITH_LIBCURL), \
-        $(if $(VBOX_WITH_UPDATE_AGENT), \
-        src-server/UpdateAgentImpl.cpp,), \
-        ) \
+                $(if $(VBOX_WITH_UPDATE_AGENT), \
+                        src-server/UpdateAgentImpl.cpp,), \
+                ) \
         src-server/HostVideoInputDeviceImpl.cpp \
         src-server/HostDrivePartitionImpl.cpp \
@@ -693 +693 @@
         src-server/UefiVariableStoreImpl.cpp \
         $(if $(VBOX_WITH_UNATTENDED), \
-        src-server/UnattendedImpl.cpp \
-        src-server/UnattendedInstaller.cpp \
-        src-server/UnattendedOs2Installer.cpp \
-        src-server/UnattendedScript.cpp \
-        src-all/TextScript.cpp \
-        ,) \
+                src-server/UnattendedImpl.cpp \
+                src-server/UnattendedInstaller.cpp \
+                src-server/UnattendedOs2Installer.cpp \
+                src-server/UnattendedScript.cpp \
+                src-all/TextScript.cpp \
+                ,) \
         src-server/USBControllerImpl.cpp \
         src-server/USBDeviceFiltersImpl.cpp \
@@ -1284 +1284 @@
   VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT \
         $(filter-out VBOX_WITH_RECORDING VBOX_WITH_AUDIO_RECORDING \
-        VBOX_WITH_LIBVPX,$(VBoxC_DEFS))
+                VBOX_WITH_LIBVPX,$(VBoxC_DEFS))
   VBoxClient-x86_INCS.win = \
         $(VBoxClient-x86_0_OUTDIR) \
@@ -1553 +1553 @@
  VirtualBoxAPI_QT_TRANSLATIONS = $(addsuffix .ts,$(addprefix $(VBOX_PATH_MAIN_SRC)/nls/VirtualBoxAPI_,$(VBOX_APPROVED_MAIN_LANGUAGES)))
  VirtualBoxAPI_VBOX_ALL_NLS_SOURCES = $(wildcard \
-        $(VBOX_PATH_MAIN_SRC)/include/*.h \
-        $(VBOX_PATH_MAIN_SRC)/src-all/*.cpp \
-        $(VBOX_PATH_MAIN_SRC)/src-all/*.h \
-        $(VBOX_PATH_MAIN_SRC)/src-server/*.cpp \
-        $(VBOX_PATH_MAIN_SRC)/src-server/*.h \
-        $(VBOX_PATH_MAIN_SRC)/src-client/*.cpp \
-        $(VBOX_PATH_MAIN_SRC)/src-client/*.h )
+                $(VBOX_PATH_MAIN_SRC)/include/*.h \
+                $(VBOX_PATH_MAIN_SRC)/src-all/*.cpp \
+                $(VBOX_PATH_MAIN_SRC)/src-all/*.h \
+                $(VBOX_PATH_MAIN_SRC)/src-server/*.cpp \
+                $(VBOX_PATH_MAIN_SRC)/src-server/*.h \
+                $(VBOX_PATH_MAIN_SRC)/src-client/*.cpp \
+                $(VBOX_PATH_MAIN_SRC)/src-client/*.h )
 
  updatenls:: makeallnls $(VBOX_PATH_MAIN_SRC)/nls/VirtualBoxAPI_en.ts
@@ -1771 +1771 @@
         $(VBOX_JMSCOM_GEN)/jmscomglue.list \
         $(wildcard \
-        $(VBOX_JMSCOM_GEN)/java/*.java \
-        $(VBOX_JMSCOM_JDEST)/*.class \
-        $(VBOX_JMSCOM_JDEST)/*/*.class \
-        $(VBOX_JMSCOM_JDEST)/*/*/*.class \
-        $(VBOX_JMSCOM_JDEST)/*/*/*/*.class \
-        )
+                $(VBOX_JMSCOM_GEN)/java/*.java \
+                $(VBOX_JMSCOM_JDEST)/*.class \
+                $(VBOX_JMSCOM_JDEST)/*/*.class \
+                $(VBOX_JMSCOM_JDEST)/*/*/*.class \
+                $(VBOX_JMSCOM_JDEST)/*/*/*/*.class \
+                )
  VBoxJMscom-inst-jar_BLDDIRS += $(VBOX_JMSCOM_GEN)/java
  $(call KB_FN_DO_PASS0_ON_TARGET,VBoxJMscom-inst-jar) # Sets VBoxJMscom-inst-jar_0_OUTDIR

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

@@ -225 +225 @@
 TEMPLATE_VBoxWebR3Exe_DEFS.win += WIN32_LEAN_AND_MEAN $(TEMPLATE_VBoxR3Exe_DEFS.win) # Makes the redefinition warnings go away.
 TEMPLATE_VBoxWebR3Exe_CXXFLAGS = $(filter-out $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden), \
-        $(TEMPLATE_VBoxR3Exe_CXXFLAGS))
+                $(TEMPLATE_VBoxR3Exe_CXXFLAGS))
 ifn1of ($(KBUILD_TARGET), win)
  TEMPLATE_VBoxWebR3Exe_CXXFLAGS += $(VBOX_GCC_Wno-misleading-indentation)
@@ -465 +465 @@
         $(VBOX_JWSDOC_JDEST)/package-list \
         $(wildcard \
-        $(VBOX_JWS_GEN)/java/*/*/*.java \
-        $(VBOX_JWS_GEN)/java/*/*/*/*.java \
-        $(VBOX_JWS_JDEST)/*.class \
-        $(VBOX_JWS_JDEST)/*/*.class \
-        $(VBOX_JWS_JDEST)/*/*/*.class \
-        $(VBOX_JWS_JDEST)/*/*/*/*.class \
-        $(VBOX_JWSDOC_JDEST)/*.html \
-        $(VBOX_JWSDOC_JDEST)/*.css \
-        $(VBOX_JWSDOC_JDEST)/*/*.gif \
-        $(VBOX_JWSDOC_JDEST)/*/*/*.html \
-        $(VBOX_JWSDOC_JDEST)/*/*/*/*.html \
-        )
+                $(VBOX_JWS_GEN)/java/*/*/*.java \
+                $(VBOX_JWS_GEN)/java/*/*/*/*.java \
+                $(VBOX_JWS_JDEST)/*.class \
+                $(VBOX_JWS_JDEST)/*/*.class \
+                $(VBOX_JWS_JDEST)/*/*/*.class \
+                $(VBOX_JWS_JDEST)/*/*/*/*.class \
+                $(VBOX_JWSDOC_JDEST)/*.html \
+                $(VBOX_JWSDOC_JDEST)/*.css \
+                $(VBOX_JWSDOC_JDEST)/*/*.gif \
+                $(VBOX_JWSDOC_JDEST)/*/*/*.html \
+                $(VBOX_JWSDOC_JDEST)/*/*/*/*.html \
+                )
   VBoxJWs-inst-jar_BLDDIRS += $(VBOX_JWS_GEN)/java
   VBoxJWs-inst-jar_GENERATEDSOURCES = $(addprefix $(VBoxJWs-inst-jar_BLDDIRS)/,$(VBoxJWS_VBOX_JWSGLUEFILES))

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1804 +1804 @@
   include $($(target)_2_VBOX_NOCRT_ALIAS_KMK_FILE)
   $(target)_2_VBOX_NOCRT_ALIAS_FILES := $(foreach alias,$($(target)_2_VBOX_NOCRT_ALIASES) \
-        $($(target)_VBOX_NOCRT_ALIASES) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_type)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_trg_arch)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg_arch)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg_cpu)) \
-        $($(target)_VBOX_NOCRT_ALIASES.$(bld_type)) \
-        , $($(target)_0_OUTDIR)/genalias/$(firstword $(subst =, $(SPACE),$(alias))).o)
+                $($(target)_VBOX_NOCRT_ALIASES) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_type)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_trg_arch)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg_arch)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_trg_cpu)) \
+                $($(target)_VBOX_NOCRT_ALIASES.$(bld_type)) \
+                , $($(target)_0_OUTDIR)/genalias/$(firstword $(subst =, $(SPACE),$(alias))).o)
   $(eval $(def_unit_VBoxNoCrtAliases_double_expansion))
  endif
@@ -1837 +1837 @@
 
   RuntimeR3_SOURCES = $(filter-out \
-        r3/alloc.cpp \
-        r3/alloc-ef.cpp \
-        r3/xml.cpp \
-        common/zip/xarvfs.cpp \
-        common/misc/json.cpp \
-        generic/RTLogWriteStdErr-generic.cpp \
-        generic/RTLogWriteStdOut-generic.cpp \
-        ,$(RuntimeBaseR3_SOURCES)) \
+                r3/alloc.cpp \
+                r3/alloc-ef.cpp \
+                r3/xml.cpp \
+                common/zip/xarvfs.cpp \
+                common/misc/json.cpp \
+                generic/RTLogWriteStdErr-generic.cpp \
+                generic/RTLogWriteStdOut-generic.cpp \
+                ,$(RuntimeBaseR3_SOURCES)) \
         \
         common/err/nocrt-strerror.cpp \
@@ -2107 +2107 @@
 
   RuntimeR3_SOURCES.win = $(filter-out \
-        r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
-        ,$(RuntimeBaseR3_SOURCES.win)) \
+                r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+                ,$(RuntimeBaseR3_SOURCES.win)) \
         \
         common/compiler/vcc/atexit-vcc.cpp \
@@ -2159 +2159 @@
         strtok_s=nocrt_strtok_r _strtok_s=nocrt_strtok_r nocrt_strtok_s=nocrt_strtok_r \
         $(foreach fn, atan atan2 cos ceil exp fabs floor ldexp log lrint llrint remainder sin tan \
-        ,$(fn)l=nocrt_$(fn) _$(fn)l=nocrt_$(fn))
+                ,$(fn)l=nocrt_$(fn) _$(fn)l=nocrt_$(fn))
  endif
 endif
@@ -2176 +2176 @@
  BLDDIRS += $(IPRT_OUT_DIR)/man/
  OTHER_CLEAN += $(foreach xml,$(basename $(notdir $(IPRT_XML_REFENTRY_FILES))), \
-        $(IPRT_OUT_DIR)/man/$(xml).xml $(IPRT_OUT_DIR)/man/$(xml).h $(IPRT_OUT_DIR)/man/$(xml).h.ts)
+                $(IPRT_OUT_DIR)/man/$(xml).xml $(IPRT_OUT_DIR)/man/$(xml).h $(IPRT_OUT_DIR)/man/$(xml).h.ts)
 
 
@@ -2533 +2533 @@
 
 RuntimeBldProg_SOURCES.darwin = $(filter-out \
-        generic/cdrom-generic.cpp \
-        generic/RTFileMove-generic.cpp \
-        generic/RTProcDaemonize-generic.cpp \
-        generic/RTThreadGetAffinity-stub-generic.cpp \
-        generic/RTThreadSetAffinity-stub-generic.cpp \
-        generic/RTThreadSetAffinityToCpu-generic.cpp \
-        generic/RTTimerCreate-generic.cpp \
-        generic/mppresent-generic.cpp \
-        generic/RTSystemShutdown-generic.cpp \
-        generic/timer-generic.cpp \
-        generic/utf16locale-generic.cpp \
-        generic/RTProcIsRunningByName-generic.cpp \
-        generic/RTThreadGetNativeState-generic.cpp \
-        r3/darwin/filelock-darwin.cpp \
-        r3/darwin/systemmem-darwin.cpp \
-        r3/darwin/krnlmod-darwin.cpp \
-        r3/darwin/filelock-darwin.cpp \
-        r3/darwin/RTSystemQueryDmiString-darwin.cpp \
-        r3/darwin/RTPathUserDocuments-darwin.cpp \
-        r3/posix/RTTimeSet-posix.cpp \
-        r3/posix/serialport-posix.cpp \
-        r3/posix/localipc-posix.cpp \
-        r3/generic/allocex-r3-generic.cpp \
-        r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
-        r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
-        r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
-        , $(RuntimeBaseR3_SOURCES.darwin))
+                generic/cdrom-generic.cpp \
+                generic/RTFileMove-generic.cpp \
+                generic/RTProcDaemonize-generic.cpp \
+                generic/RTThreadGetAffinity-stub-generic.cpp \
+                generic/RTThreadSetAffinity-stub-generic.cpp \
+                generic/RTThreadSetAffinityToCpu-generic.cpp \
+                generic/RTTimerCreate-generic.cpp \
+                generic/mppresent-generic.cpp \
+                generic/RTSystemShutdown-generic.cpp \
+                generic/timer-generic.cpp \
+                generic/utf16locale-generic.cpp \
+                generic/RTProcIsRunningByName-generic.cpp \
+                generic/RTThreadGetNativeState-generic.cpp \
+                r3/darwin/filelock-darwin.cpp \
+                r3/darwin/systemmem-darwin.cpp \
+                r3/darwin/krnlmod-darwin.cpp \
+                r3/darwin/filelock-darwin.cpp \
+                r3/darwin/RTSystemQueryDmiString-darwin.cpp \
+                r3/darwin/RTPathUserDocuments-darwin.cpp \
+                r3/posix/RTTimeSet-posix.cpp \
+                r3/posix/serialport-posix.cpp \
+                r3/posix/localipc-posix.cpp \
+                r3/generic/allocex-r3-generic.cpp \
+                r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \
+                r3/generic/RTLocaleQueryNormalizedBaseLocaleName-r3-generic.cpp \
+                r3/generic/RTLocaleQueryUserCountryCode-r3-generic.cpp \
+                , $(RuntimeBaseR3_SOURCES.darwin))
 
 RuntimeBldProg_SOURCES.win = \
@@ -2630 +2630 @@
 
 RuntimeBldProg_SOURCES.amd64 = $(filter-out \
-        VBox/RTLogWriteVmm-amd64-x86.asm \
-        , $(RuntimeBaseR3_SOURCES.amd64))
+                VBox/RTLogWriteVmm-amd64-x86.asm \
+                , $(RuntimeBaseR3_SOURCES.amd64))
 
 RuntimeBldProg_SOURCES.x86 = $(filter-out \
-        VBox/RTLogWriteVmm-amd64-x86.asm \
-        , $(RuntimeBaseR3_SOURCES.x86))
+                VBox/RTLogWriteVmm-amd64-x86.asm \
+                , $(RuntimeBaseR3_SOURCES.x86))
 
 RuntimeBldProg_SOURCES.win.amd64 := \
@@ -2721 +2721 @@
 RuntimeGuestR3_DEFS                      = $(filter-out RTCRITSECT_STRICT RT_NO_GIP IN_SUP_R3 IPRT_WITH_LZMA, $(RuntimeR3_DEFS))
 RuntimeGuestR3_SOURCES                   = $(filter-out \
-        common/time/timesupref.cpp \
-        common/time/timesupA.asm \
-        common/time/timesup.cpp \
-        common/zip/xarvfs.cpp \
-        common/zip/lzmavfs.cpp \
-        r3/xml.cpp \
-        generic/RTLogWriteUser-generic.cpp \
-        , $(RuntimeR3_SOURCES)) \
+                common/time/timesupref.cpp \
+                common/time/timesupA.asm \
+                common/time/timesup.cpp \
+                common/zip/xarvfs.cpp \
+                common/zip/lzmavfs.cpp \
+                r3/xml.cpp \
+                generic/RTLogWriteUser-generic.cpp \
+                , $(RuntimeR3_SOURCES)) \
         \
         common/time/timesysalias.cpp \
@@ -2829 +2829 @@
         VBox/VBoxRTDeps.cpp \
         $(filter-out common/checksum/crc32.cpp, \
-        $(if-expr defined(VBOX_WITH_ALT_HASH_CODE), $(RuntimeBaseR3_SOURCES), \
-        $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeBaseR3_SOURCES)) ) ) \
+                $(if-expr defined(VBOX_WITH_ALT_HASH_CODE), $(RuntimeBaseR3_SOURCES), \
+                $(patsubst common/checksum/alt-%,common/checksum/openssl-%,$(RuntimeBaseR3_SOURCES)) ) ) \
         common/checksum/crc32-zlib.cpp \
         common/dbg/dbgmodghidra.cpp \
@@ -4611 +4611 @@
         $(VBOX_PATH_RUNTIME_SRC)/VBox \
         $(foreach dir, $(VBOX_PATH_RUNTIME_SRC) $(VBOX_PATH_RUNTIME_SRC)/r3 $(VBOX_PATH_RUNTIME_SRC)/r0drv, \
-        $(dir) \
-        $(dir)/darwin \
-        $(dir)/haiku \
-        $(dir)/linux \
-        $(dir)/nt \
-        $(dir)/os2 \
-        $(dir)/solaris \
-        $(dir)/win \
-        $(dir)/win32 \
-        $(dir)/win64 \
-        $(dir)/generic \
-        )
+                $(dir) \
+                $(dir)/darwin \
+                $(dir)/haiku \
+                $(dir)/linux \
+                $(dir)/nt \
+                $(dir)/os2 \
+                $(dir)/solaris \
+                $(dir)/win \
+                $(dir)/win32 \
+                $(dir)/win64 \
+                $(dir)/generic \
+                )
 
 # These must come first in order to make things look nice.

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

@@ -721 +721 @@
 MY_ASA_ASM_STUFF = \
         $(addprefix -D, \
-        $(DEFS) \
-        $(DEFS.$(KBUILD_TYPE)) \
-        $(DEFS.$(KBUILD_TARGET)) \
-        IN_RING3 $(ARCH_BITS_DEFS) \
-        $(DEFS.$(KBUILD_TARGET_ARCH)) \
-        $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
-        $(VMM_COMMON_DEFS) \
-        ) \
+                $(DEFS) \
+                $(DEFS.$(KBUILD_TYPE)) \
+                $(DEFS.$(KBUILD_TARGET)) \
+                IN_RING3 $(ARCH_BITS_DEFS) \
+                $(DEFS.$(KBUILD_TARGET_ARCH)) \
+                $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
+                $(VMM_COMMON_DEFS) \
+                ) \
         -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \
         $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(VBOX_PATH_VMM_SRC)/include $(VBOX_VMM_TESTCASE_OUT_DIR) \
-        ,-I$(inc)/)
+                ,-I$(inc)/)
 
 # 1a. make a header file which makes all the structures+members globals.

trunk/src/VBox/ValidationKit/Makefile.kmk

@@ -325 +325 @@
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_IPRT) $(VALKIT_UNITTESTS_WHITELIST_IPRT.$(os)), \
-        $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE)))
+                $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE)))
   # Unit tests which utilize parts of the Guest Additions.
   VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \
         $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_GUEST_ADDITIONS) $(VALKIT_UNITTESTS_WHITELIST_GUEST_ADDITIONS.$(os)), \
-        $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE)))
+                $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE)))
  endef
 

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -95 +95 @@
 # @param    2   The mode function.
 BS3KIT_FN_GEN_MODE_NEARSTUB = $(foreach suff, \
-        _rm \
-        _pe16 \
-        _pe16_v86 \
-        _pe32_16 \
-        _pev86 \
-        _pp16 \
-        _pp16_v86 \
-        _pp32_16 \
-        _ppv86 \
-        _pae16 \
-        _pae16_v86 \
-        _pae32_16 \
-        _paev86 \
-        _lm16 \
-        ,$(evalcall2 def_Bs3KitGenNearStubSource,$1,_$2$(suff),_$2$(suff)_far))
+                _rm \
+                _pe16 \
+                _pe16_v86 \
+                _pe32_16 \
+                _pev86 \
+                _pp16 \
+                _pp16_v86 \
+                _pp32_16 \
+                _ppv86 \
+                _pae16 \
+                _pae16_v86 \
+                _pae32_16 \
+                _paev86 \
+                _lm16 \
+                ,$(evalcall2 def_Bs3KitGenNearStubSource,$1,_$2$(suff),_$2$(suff)_far))
 
 # @param    1   The target name.
@@ -144 +144 @@
 # @param    3   The parameter size in bytes.
 BS3KIT_FN_GEN_MODE_FARSTUB = $(foreach suff, \
-        _rm \
-        _pe16 \
-        _pe16_v86 \
-        _pe32_16 \
-        _pev86 \
-        _pp16 \
-        _pp16_v86 \
-        _pp32_16 \
-        _ppv86 \
-        _pae16 \
-        _pae16_v86 \
-        _pae32_16 \
-        _paev86 \
-        _lm16 \
-        ,$(evalcall2 def_Bs3KitGenFarStubSource,$1,$2,$(suff)_far,$(suff),$3))
+                _rm \
+                _pe16 \
+                _pe16_v86 \
+                _pe32_16 \
+                _pev86 \
+                _pp16 \
+                _pp16_v86 \
+                _pp32_16 \
+                _ppv86 \
+                _pae16 \
+                _pae16_v86 \
+                _pae32_16 \
+                _paev86 \
+                _lm16 \
+                ,$(evalcall2 def_Bs3KitGenFarStubSource,$1,$2,$(suff)_far,$(suff),$3))
 
 # @param    1   The target name.
@@ -668 +668 @@
         segment BS3SYSTEM16 \
         $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \
-        clname DATA \
-        segment BS3DATA16 segaddr=0x2900 \
-        segment BS3DATA16_DATA \
-        segment DATA \
-        segment _DATA \
-        segment BS3DATA16CONST \
-        segment CONST \
-        segment BS3DATA16CONST2 \
-        segment CONST2 \
-        segment STRINGS \
-        segment BS3DATA16_END \
-        clname BSS \
-        segment BSS \
-        segment _BSS \
-        segment BS3DATA16_END \
-        clname FAR_DATA \
-        segment FAR_DATA \
-        , \
-        clname FAR_DATA \
-        segment BS3DATA16 segaddr=0x2900 \
-        segment FAR_DATA \
-        segment BS3DATA16CONST \
-        segment BS3DATA16CONST2 \
-        segment BS3DATA16_DATA \
-        segment BS3DATA16_END \
-        ) \
+                clname DATA \
+                segment BS3DATA16 segaddr=0x2900 \
+                segment BS3DATA16_DATA \
+                segment DATA \
+                segment _DATA \
+                segment BS3DATA16CONST \
+                segment CONST \
+                segment BS3DATA16CONST2 \
+                segment CONST2 \
+                segment STRINGS \
+                segment BS3DATA16_END \
+                clname BSS \
+                segment BSS \
+                segment _BSS \
+                segment BS3DATA16_END \
+                clname FAR_DATA \
+                segment FAR_DATA \
+                , \
+                clname FAR_DATA \
+                segment BS3DATA16 segaddr=0x2900 \
+                segment FAR_DATA \
+                segment BS3DATA16CONST \
+                segment BS3DATA16CONST2 \
+                segment BS3DATA16_DATA \
+                segment BS3DATA16_END \
+                ) \
         segment BS3DATA32 \
         segment BS3DATA32CONST \
@@ -733 +733 @@
         $(VBoxBs3Linker_1_TARGET)
 TEMPLATE_VBoxBS3KitImg_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY) \
-        ,,$(QUIET)$(MV_EXT) -f -- "$(out)" "$(out).tmp" \
-        $$(NLTAB)$(QUIET)$(VBoxBs3Linker_1_TARGET) -o $(out) $(bs3-bootsector_1_TARGET) $(out).tmp \
+                ,,$(QUIET)$(MV_EXT) -f -- "$(out)" "$(out).tmp" \
+                $$(NLTAB)$(QUIET)$(VBoxBs3Linker_1_TARGET) -o $(out) $(bs3-bootsector_1_TARGET) $(out).tmp \
         $$(NLTAB)$(QUIET)$(RM_EXT) -f -- "$(out).tmp") \
         $(eval .PRECIOUS: $(outbase).map) # ugly hack!
@@ -873 +873 @@
         clname DATA \
         $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \
-        segment BS3DATA16 \
-        segment BS3DATA16CONST \
-        segment CONST \
-        segment BS3DATA16CONST2 \
-        segment CONST2 \
-        , \
-        segment CONST \
-        segment CONST2 \
-        ) \
+                segment BS3DATA16 \
+                segment BS3DATA16CONST \
+                segment CONST \
+                segment BS3DATA16CONST2 \
+                segment CONST2 \
+                , \
+                segment CONST \
+                segment CONST2 \
+                ) \
         segment _DATA \
         segment XIB \
@@ -891 +891 @@
         segment STRINGS \
         $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \
-        segment BS3DATA16_DATA \
-        ,) \
+                segment BS3DATA16_DATA \
+                ,) \
         segment DATA \
         clname BSS \
@@ -903 +903 @@
         clname FAR_DATA \
         $(if-expr "$(BS3KIT_SEGNM_DATA16)" != "", \
-        segment BS3DATA16 \
-        segment BS3DATA16_DATA \
-        segment BS3DATA16CONST \
-        segment BS3DATA16CONST2 \
-        segment FAR_DATA \
-        segment BS3DATA16_END \
-        , \
-        segment FAR_DATA \
-        ) \
+                segment BS3DATA16 \
+                segment BS3DATA16_DATA \
+                segment BS3DATA16CONST \
+                segment BS3DATA16CONST2 \
+                segment FAR_DATA \
+                segment BS3DATA16_END \
+                , \
+                segment FAR_DATA \
+                ) \
         segment BS3DATA32 \
         segment BS3DATA32CONST \

trunk/src/VBox/ValidationKit/common/Makefile.kmk

@@ -69 +69 @@
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += \
         $(wildcard \
-        $(PATH_SUB_CURRENT)/*.py \
-        $(PATH_SUB_CURRENT)/*/*.py \
-        )
+                $(PATH_SUB_CURRENT)/*.py \
+                $(PATH_SUB_CURRENT)/*/*.py \
+                )
 
 $(evalcall def_vbox_validationkit_process_python_sources)

trunk/src/VBox/ValidationKit/tests/api/Makefile.kmk

@@ -64 +64 @@
 ValidationKitTestsApi_SOURCES := \
         $(wildcard \
-        $(PATH_SUB_CURRENT)/*.ova \
-        )
+                $(PATH_SUB_CURRENT)/*.ova \
+                )
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsApi_EXEC_SOURCES)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1314 +1314 @@
 INSTALLS += VBoxXPCOMBase-xpt-inst
 VBOX_XPTFILES = $(addprefix $(PATH_TARGET)/VBox-xpcom-xpt-files/, \
-        nsIConsoleListener.xpt \
-        nsIConsoleMessage.xpt \
-        nsIConsoleService.xpt \
-        nsIErrorService.xpt \
-        nsIException.xpt \
-        nsIExceptionService.xpt \
-        nsIDebug.xpt \
-        nsIInterfaceRequestor.xpt \
-        nsIMemory.xpt \
-        nsIProgrammingLanguage.xpt \
-        nsISupports.xpt \
-        nsITraceRefcnt.xpt \
-        nsIWeakReference.xpt \
-        nsrootidl.xpt \
-        nsIAtom.xpt \
-        nsIAtomService.xpt \
-        nsICollection.xpt \
-        nsIEnumerator.xpt \
-        nsIPersistentProperties2.xpt \
-        nsIPropertyBag.xpt \
-        nsIRecyclingAllocator.xpt \
-        nsIVariant.xpt \
-        nsISerializable.xpt \
-        nsIStringEnumerator.xpt \
-        nsISupportsArray.xpt \
-        nsISupportsIterators.xpt \
-        nsITimelineService.xpt \
-        nsIArray.xpt \
-        nsIObserverService.xpt \
-        nsIObserver.xpt \
-        nsIProperties.xpt \
-        nsISimpleEnumerator.xpt \
-        nsISupportsPrimitives.xpt \
-        nsIBinaryInputStream.xpt \
-        nsIBinaryOutputStream.xpt \
-        nsIByteArrayInputStream.xpt \
-        nsIFastLoadFileControl.xpt \
-        nsIFastLoadService.xpt \
-        nsIInputStreamTee.xpt \
-        nsILineInputStream.xpt \
-        nsIMultiplexInputStream.xpt \
-        nsIObjectInputStream.xpt \
-        nsIObjectOutputStream.xpt \
-        nsIPipe.xpt \
-        nsISeekableStream.xpt \
-        nsIStorageStream.xpt \
-        nsIStringStream.xpt \
-        nsIStreamBufferAccess.xpt \
-        nsIAsyncInputStream.xpt \
-        nsIAsyncOutputStream.xpt \
-        nsIDirectoryService.xpt \
-        nsIFile.xpt \
-        nsILocalFile.xpt \
-        nsIInputStream.xpt \
-        nsIOutputStream.xpt \
-        nsIScriptableInputStream.xpt \
-        nsIComponentLoader.xpt \
-        nsIComponentLoaderManager.xpt \
-        nsIComponentManagerObsolete.xpt \
-        nsINativeComponentLoader.xpt \
-        nsIClassInfo.xpt \
-        nsIComponentRegistrar.xpt \
-        nsIFactory.xpt \
-        nsIModule.xpt \
-        nsIServiceManager.xpt \
-        nsIComponentManager.xpt \
-        nsICategoryManager.xpt \
-        nsIThread.xpt \
-        nsITimer.xpt \
-        nsITimerInternal.xpt \
-        nsITimerManager.xpt \
-        nsIRunnable.xpt \
-        nsIEventTarget.xpt \
-        nsIEventQueue.xpt \
-        nsIEventQueueService.xpt \
-        nsIEnvironment.xpt \
-        nsIProcess.xpt \
-        nsIInterfaceInfo.xpt \
-        nsIInterfaceInfoManager.xpt \
-        nsIXPTLoader.xpt)
+                nsIConsoleListener.xpt \
+                nsIConsoleMessage.xpt \
+                nsIConsoleService.xpt \
+                nsIErrorService.xpt \
+                nsIException.xpt \
+                nsIExceptionService.xpt \
+                nsIDebug.xpt \
+                nsIInterfaceRequestor.xpt \
+                nsIMemory.xpt \
+                nsIProgrammingLanguage.xpt \
+                nsISupports.xpt \
+                nsITraceRefcnt.xpt \
+                nsIWeakReference.xpt \
+                nsrootidl.xpt \
+                nsIAtom.xpt \
+                nsIAtomService.xpt \
+                nsICollection.xpt \
+                nsIEnumerator.xpt \
+                nsIPersistentProperties2.xpt \
+                nsIPropertyBag.xpt \
+                nsIRecyclingAllocator.xpt \
+                nsIVariant.xpt \
+                nsISerializable.xpt \
+                nsIStringEnumerator.xpt \
+                nsISupportsArray.xpt \
+                nsISupportsIterators.xpt \
+                nsITimelineService.xpt \
+                nsIArray.xpt \
+                nsIObserverService.xpt \
+                nsIObserver.xpt \
+                nsIProperties.xpt \
+                nsISimpleEnumerator.xpt \
+                nsISupportsPrimitives.xpt \
+                nsIBinaryInputStream.xpt \
+                nsIBinaryOutputStream.xpt \
+                nsIByteArrayInputStream.xpt \
+                nsIFastLoadFileControl.xpt \
+                nsIFastLoadService.xpt \
+                nsIInputStreamTee.xpt \
+                nsILineInputStream.xpt \
+                nsIMultiplexInputStream.xpt \
+                nsIObjectInputStream.xpt \
+                nsIObjectOutputStream.xpt \
+                nsIPipe.xpt \
+                nsISeekableStream.xpt \
+                nsIStorageStream.xpt \
+                nsIStringStream.xpt \
+                nsIStreamBufferAccess.xpt \
+                nsIAsyncInputStream.xpt \
+                nsIAsyncOutputStream.xpt \
+                nsIDirectoryService.xpt \
+                nsIFile.xpt \
+                nsILocalFile.xpt \
+                nsIInputStream.xpt \
+                nsIOutputStream.xpt \
+                nsIScriptableInputStream.xpt \
+                nsIComponentLoader.xpt \
+                nsIComponentLoaderManager.xpt \
+                nsIComponentManagerObsolete.xpt \
+                nsINativeComponentLoader.xpt \
+                nsIClassInfo.xpt \
+                nsIComponentRegistrar.xpt \
+                nsIFactory.xpt \
+                nsIModule.xpt \
+                nsIServiceManager.xpt \
+                nsIComponentManager.xpt \
+                nsICategoryManager.xpt \
+                nsIThread.xpt \
+                nsITimer.xpt \
+                nsITimerInternal.xpt \
+                nsITimerManager.xpt \
+                nsIRunnable.xpt \
+                nsIEventTarget.xpt \
+                nsIEventQueue.xpt \
+                nsIEventQueueService.xpt \
+                nsIEnvironment.xpt \
+                nsIProcess.xpt \
+                nsIInterfaceInfo.xpt \
+                nsIInterfaceInfoManager.xpt \
+                nsIXPTLoader.xpt)
 
 VBoxXPCOMBase-xpt-inst_INST = $(INST_BIN)components/

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

@@ -106 +106 @@
         $(VBOX_JXPCOM_GEN)/jxpcomglue.list \
         $(wildcard \
-        $(VBOX_JXPCOM_GEN)/java/*.java \
-        $(VBOX_JXPCOM_GEN)/java/glue/*.java \
-        $(VBOX_JXPCOM_JDEST)/*.class \
-        $(VBOX_JXPCOM_JDEST)/*/*.class \
-        $(VBOX_JXPCOM_JDEST)/*/*/*.class \
-        $(VBOX_JXPCOM_JDEST)/*/*/*/*.class \
-        $(VBOX_JXPCOM_JDEST)/*/*/*/*/*.class \
-        $(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
-        )
+                $(VBOX_JXPCOM_GEN)/java/*.java \
+                $(VBOX_JXPCOM_GEN)/java/glue/*.java \
+                $(VBOX_JXPCOM_JDEST)/*.class \
+                $(VBOX_JXPCOM_JDEST)/*/*.class \
+                $(VBOX_JXPCOM_JDEST)/*/*/*.class \
+                $(VBOX_JXPCOM_JDEST)/*/*/*/*.class \
+                $(VBOX_JXPCOM_JDEST)/*/*/*/*/*.class \
+                $(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
+                )
 VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue $(VBOX_JXPCOM_GEN)/java/interfaces
 

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

@@ -719 +719 @@
   #
   VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310   34 33 \
-        ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
+                        ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
   ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
    DLLS += VBoxPython3