Changeset 98410 in vbox

Timestamp:

Feb 1, 2023 4:20:10 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155654

Message:

Devices/*.kmk: Automatic scm cleanups. bugref:10348

Location:

trunk/src/VBox/Devices

Files:

• Audio/testcase/Makefile.kmk (modified) (3 diffs)
• Config.kmk (modified) (3 diffs)
• EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk (modified) (1 diff)
• EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk (modified) (3 diffs)
• EFI/Firmware/Config.kmk (modified) (3 diffs)
• EFI/Firmware/EfiModules.kmk (modified) (1 diff)
• EFI/Firmware/Makefile.kmk (modified) (6 diffs)
• Graphics/BIOS/Makefile.kmk (modified) (5 diffs)
• Input/testcase/Makefile.kmk (modified) (1 diff)
• Makefile.kmk (modified) (69 diffs)
• Network/lwip-new/Config.kmk (modified) (1 diff)
• PC/BIOS/Makefile.kmk (modified) (6 diffs)
• Samples/Makefile.kmk (modified) (1 diff)
• testcase/Makefile.kmk (modified) (3 diffs)

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

@@ -38 +38 @@
  tstAudioMixBuffer_DEFS.debug  = VBOX_WITH_EF_WRAPS
  tstAudioMixBuffer_SOURCES = \
-        tstAudioMixBuffer.cpp \
-        ../AudioMixBuffer.cpp \
-        ../AudioHlp.cpp
+        tstAudioMixBuffer.cpp \
+        ../AudioMixBuffer.cpp \
+        ../AudioHlp.cpp
  tstAudioMixBuffer_LIBS = $(LIB_RUNTIME)
 
@@ -54 +54 @@
   tstAudioClient3_LIBS = $(LIB_RUNTIME)
   tstAudioClient3_INCS = \
-        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/Include/10.0.17134.0/um \
-        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
+        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/Include/10.0.17134.0/um \
+        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
 
   # Requires manual execution / verification.
@@ -68 +68 @@
  tstAudioTestService_DEFS.debug  = VBOX_WITH_EF_WRAPS
  tstAudioTestService_SOURCES = \
-        tstAudioTestService.cpp \
-        ../AudioTestService.cpp \
-        ../AudioTestServiceProtocol.cpp \
-        ../AudioTestServiceTcp.cpp \
-        ../AudioTestServiceClient.cpp
+        tstAudioTestService.cpp \
+        ../AudioTestService.cpp \
+        ../AudioTestServiceProtocol.cpp \
+        ../AudioTestServiceTcp.cpp \
+        ../AudioTestServiceClient.cpp
  tstAudioTestService_LIBS = $(LIB_RUNTIME)
 

trunk/src/VBox/Devices/Config.kmk

@@ -77 +77 @@
 TEMPLATE_VBoxBios_CXXFLAGS     = $(TEMPLATE_VBoxBios_CFLAGS)
 TEMPLATE_VBoxBios_DEPS         = $(VBOX_VERSION_HEADER)
-TEMPLATE_VBoxBios_LDFLAGS      = system dos  \
+TEMPLATE_VBoxBios_LDFLAGS      = system dos \
         debug codeview all \
         option quiet, nofarcalls, map, verbose, statics, symfile \
@@ -83 +83 @@
 TEMPLATE_VBoxBios_LNK_DEPS = $(VBOX_BIOSSUMS) $(VBOX_PATH_DEVICES_SRC)/BiosCommonCode/biosorg_check.sed
 TEMPLATE_VBoxBios_POST_CMDS = \
-        $(QUIET)$(SED_EXT) -n -f $(VBOX_PATH_DEVICES_SRC)/BiosCommonCode/biosorg_check.sed $(outbase).map \
+        $(QUIET)$(SED_EXT) -n -f $(VBOX_PATH_DEVICES_SRC)/BiosCommonCode/biosorg_check.sed $(outbase).map \
         && $(MV_EXT) -f $(out) $(out).tmp \
         && $(VBOX_BIOSSUMS) $(out).tmp $(out) \
-        && $(RM_EXT) -f $(out).tmp \
+        && $(RM_EXT) -f $(out).tmp
 
 #
@@ -98 +98 @@
 TEMPLATE_VBoxBios32Lib_CFLAGS     = -q -wx -zu -s -oas -ms -nt=BIOS32 -nd=BIOS32 -hc
 ifeq ($(KBUILD_TARGET),darwin) # The Open Watcom version we use on darwin generate trouble for the link in -d1+ mode; -d2 doesn't work anywhere.
-TEMPLATE_VBoxBios32Lib_CFLAGS    += -d1
+ TEMPLATE_VBoxBios32Lib_CFLAGS   += -d1
 else
-TEMPLATE_VBoxBios32Lib_CFLAGS    += -d1+
+ TEMPLATE_VBoxBios32Lib_CFLAGS   += -d1+
 endif
 TEMPLATE_VBoxBios32Lib_CXXFLAGS   = $(TEMPLATE_VBoxBios32_CFLAGS)

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk

@@ -40 +40 @@
 LIBRARIES += EfiBldCommonLib
 EfiBldCommonLib_TEMPLATE = VBoxEfiBldLib
-EfiBldCommonLib_SOURCES =  \
-         BasePeCoff.c \
-         BinderFuncs.c \
-         CommonLib.c \
-         Crc32.c \
-         Decompress.c \
-         EfiCompress.c \
-         EfiUtilityMsgs.c \
-         FirmwareVolumeBuffer.c \
-         FvLib.c \
-         MemoryFile.c \
-         MyAlloc.c \
-         OsPath.c \
-         ParseGuidedSectionTools.c \
-         ParseInf.c \
-         PeCoffLoaderEx.c \
-         SimpleFileParsing.c \
-         StringFuncs.c \
-         TianoCompress.c
+EfiBldCommonLib_SOURCES = \
+        BasePeCoff.c \
+        BinderFuncs.c \
+        CommonLib.c \
+        Crc32.c \
+        Decompress.c \
+        EfiCompress.c \
+        EfiUtilityMsgs.c \
+        FirmwareVolumeBuffer.c \
+        FvLib.c \
+        MemoryFile.c \
+        MyAlloc.c \
+        OsPath.c \
+        ParseGuidedSectionTools.c \
+        ParseInf.c \
+        PeCoffLoaderEx.c \
+        SimpleFileParsing.c \
+        StringFuncs.c \
+        TianoCompress.c
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk

@@ -46 +46 @@
 #
 if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "release"
-        VfrCompile_CXXFLAGS += -noover -Od
+ VfrCompile_CXXFLAGS        += -noover -Od
 endif
 VfrCompile_INCS = \
@@ -54 +54 @@
 VfrCompile_SOURCES = \
         VfrCompiler.cpp \
-       VfrFormPkg.cpp \
+        VfrFormPkg.cpp \
         VfrError.cpp \
         VfrUtilityLib.cpp \
-       Pccts/h/AParser.cpp \
+        Pccts/h/AParser.cpp \
         Pccts/h/DLexerBase.cpp \
         Pccts/h/ATokenBuffer.cpp \
@@ -87 +87 @@
 $$(VfrCompile_0_OUTDIR)/VfrLexer.cpp \
 + $$(VfrCompile_0_OUTDIR)/VfrLexer.h: \
-        $$(dlg_1_TARGET) \
+                $$(dlg_1_TARGET) \
                 $$(VfrCompile_0_OUTDIR)/VfrParser.dlg
         $(dlg_1_TARGET) -C2 -i -CC -cl VfrLexer \

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -112 +112 @@
 TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4702 # warning C4702: unreachable code
 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4456 # antlr\gen.c(3000): warning C4456: declaration of 'f' hides previous local declaration
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4774 # antlr\main.c(1244): warning C4774: 'sprintf' : format string expected in argument 2 is not a string literal
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4703 # antlr\antlr.c(1403) : warning C4703: potentially uninitialized local pointer variable 'p' used
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4477 # dlg\dlg_p.c(874): warning C4477: 'fprintf' : format string '%x' requires an argument of type 'unsigned int', but variadic argument 1 has type '_nfa_node *'
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4313 # dlg\dlg_p.c(874): warning C4313: 'fprintf': '%x' in format string conflicts with argument 1 of type '_nfa_node *'
-TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4459 # antlr\gen.c(756): warning C4459: declaration of 'output' hides global declaration
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4456 # antlr\gen.c(3000): warning C4456: declaration of 'f' hides previous local declaration
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4774 # antlr\main.c(1244): warning C4774: 'sprintf' : format string expected in argument 2 is not a string literal
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4703 # antlr\antlr.c(1403) : warning C4703: potentially uninitialized local pointer variable 'p' used
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4477 # dlg\dlg_p.c(874): warning C4477: 'fprintf' : format string '%x' requires an argument of type 'unsigned int', but variadic argument 1 has type '_nfa_node *'
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4313 # dlg\dlg_p.c(874): warning C4313: 'fprintf': '%x' in format string conflicts with argument 1 of type '_nfa_node *'
+ TEMPLATE_VBoxEfiBldProg_CFLAGS.win += -wd4459 # antlr\gen.c(756): warning C4459: declaration of 'output' hides global declaration
 endif
 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win  = $(TEMPLATE_VBoxBldProg_CXXFLAGS.win)
@@ -132 +132 @@
 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4702 # warning C4702: unreachable code
 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
-TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5204 # Pccts\h\ATokenStream.h(49): warning C5204: 'ANTLRTokenStream': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
-TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4774 # Pccts\h\AParser.cpp(653): warning C4774: 'sprintf' : format string expected in argument 2 is not a string literal
-TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4703 # VfrCompile\VfrFormPkg.cpp(1344) : warning C4703: potentially uninitialized local pointer variable 'pNodeBeforeAdjust' used
-TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5033 # DLexer.h(68): warning C5033: 'register' is no longer a supported storage class (in c++17 or later mode)
+ TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5204 # Pccts\h\ATokenStream.h(49): warning C5204: 'ANTLRTokenStream': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly
+ TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4774 # Pccts\h\AParser.cpp(653): warning C4774: 'sprintf' : format string expected in argument 2 is not a string literal
+ TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4703 # VfrCompile\VfrFormPkg.cpp(1344) : warning C4703: potentially uninitialized local pointer variable 'pNodeBeforeAdjust' used
+ TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5033 # DLexer.h(68): warning C5033: 'register' is no longer a supported storage class (in c++17 or later mode)
 endif
 
@@ -153 +153 @@
         $(VBOX_PATH_STAGE_EFI_BLDPROGS)/EfiBldCommonLib$(VBOX_SUFF_LIB) \
         $(TEMPLATE_VBoxBldProg_LIBS)
-ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/
+ifn1of ($(KBUILD_HOST), win) # This stuff isn't up to our standard at all! :/
  TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \
         -Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \
-        -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \
-        -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label
+        -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \
+        -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label
  TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \
         -Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \
-        -Wno-unused-label
+        -Wno-unused-label
 endif
 

trunk/src/VBox/Devices/EFI/Firmware/EfiModules.kmk

@@ -36 +36 @@
 
 ifndef VBOX_EFI_FIRMWARE_EFI_MODULES_KMK_INCLUDED
-VBOX_EFI_FIRMWARE_EFI_MODULES_KMK_INCLUDED = 1
+ VBOX_EFI_FIRMWARE_EFI_MODULES_KMK_INCLUDED = 1
 
-#
-# The name of the subdirectory which the .pdb, .efi and other output files ends
-# up in, apparently.  In the generated makefiles, DEBUG_DIR points to them.
-#
-if1of ($(VBOX_EFI_TOOL_CHAIN), VS2017) ## @todo figure why/how this happens.
-VBOX_EFI_DEBUG_DIR = OUTPUT
-else
-VBOX_EFI_DEBUG_DIR = DEBUG
-endif
+ #
+ # The name of the subdirectory which the .pdb, .efi and other output files ends
+ # up in, apparently.  In the generated makefiles, DEBUG_DIR points to them.
+ #
+ if1of ($(VBOX_EFI_TOOL_CHAIN), VS2017) ## @todo figure why/how this happens.
+  VBOX_EFI_DEBUG_DIR = OUTPUT
+ else
+  VBOX_EFI_DEBUG_DIR = DEBUG
+ endif
 
-#
-# List of modules that ends up producing .efi, .debug and .pdb files.
-#
-VBOX_EFI_MODULES = \
-        FatPkg/EnhancedFatDxe/Fat/$(VBOX_EFI_DEBUG_DIR)/Fat \
-        MdeModulePkg/Application/UiApp/UiApp/$(VBOX_EFI_DEBUG_DIR)/UiApp \
-        MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru/$(VBOX_EFI_DEBUG_DIR)/AtaAtapiPassThruDxe \
-        MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe/$(VBOX_EFI_DEBUG_DIR)/AtaBusDxe \
-        MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe/$(VBOX_EFI_DEBUG_DIR)/Ps2KeyboardDxe \
-        MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe/$(VBOX_EFI_DEBUG_DIR)/EhciDxe \
-        MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe/$(VBOX_EFI_DEBUG_DIR)/NvmExpressDxe \
-        MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe/$(VBOX_EFI_DEBUG_DIR)/PciBusDxe \
-        MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe/$(VBOX_EFI_DEBUG_DIR)/PciHostBridgeDxe \
-        MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe/$(VBOX_EFI_DEBUG_DIR)/PciSioSerialDxe \
-        MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe/$(VBOX_EFI_DEBUG_DIR)/UhciDxe \
-        MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe/$(VBOX_EFI_DEBUG_DIR)/XhciDxe \
-        MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe/$(VBOX_EFI_DEBUG_DIR)/ScsiBus \
-        MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe/$(VBOX_EFI_DEBUG_DIR)/ScsiDisk \
-        MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe/$(VBOX_EFI_DEBUG_DIR)/UsbBusDxe \
-        MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe/$(VBOX_EFI_DEBUG_DIR)/UsbKbDxe \
-        MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe/$(VBOX_EFI_DEBUG_DIR)/UsbMassStorageDxe \
-        MdeModulePkg/Core/Dxe/DxeMain/$(VBOX_EFI_DEBUG_DIR)/DxeCore \
-        MdeModulePkg/Core/DxeIplPeim/DxeIpl/$(VBOX_EFI_DEBUG_DIR)/DxeIpl \
-        MdeModulePkg/Core/Pei/PeiMain/$(VBOX_EFI_DEBUG_DIR)/PeiCore \
-        MdeModulePkg/Core/RuntimeDxe/RuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/RuntimeDxe \
-        MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/AcpiPlatform \
-        MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe/$(VBOX_EFI_DEBUG_DIR)/AcpiTableDxe \
-        MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe/$(VBOX_EFI_DEBUG_DIR)/BootGraphicsResourceTableDxe \
-        MdeModulePkg/Universal/BdsDxe/BdsDxe/$(VBOX_EFI_DEBUG_DIR)/BdsDxe \
-        MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/CapsuleRuntimeDxe \
-        MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/ConPlatformDxe \
-        MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe/$(VBOX_EFI_DEBUG_DIR)/ConSplitterDxe \
-        MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe/$(VBOX_EFI_DEBUG_DIR)/GraphicsConsoleDxe \
-        MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe/$(VBOX_EFI_DEBUG_DIR)/TerminalDxe \
-        MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe/$(VBOX_EFI_DEBUG_DIR)/DevicePathDxe \
-        MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe/$(VBOX_EFI_DEBUG_DIR)/DisplayEngine \
-        MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe/$(VBOX_EFI_DEBUG_DIR)/DiskIoDxe \
-        MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe/$(VBOX_EFI_DEBUG_DIR)/PartitionDxe \
-        MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe/$(VBOX_EFI_DEBUG_DIR)/RamDiskDxe \
-        MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe/$(VBOX_EFI_DEBUG_DIR)/UdfDxe \
-        MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe/$(VBOX_EFI_DEBUG_DIR)/EnglishDxe \
-        MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe/$(VBOX_EFI_DEBUG_DIR)/DriverHealthManagerDxe \
-        MdeModulePkg/Universal/EbcDxe/EbcDxe/$(VBOX_EFI_DEBUG_DIR)/EbcDxe \
-        MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe/$(VBOX_EFI_DEBUG_DIR)/FaultTolerantWriteDxe \
-        MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe/$(VBOX_EFI_DEBUG_DIR)/HiiDatabase \
-        MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe/$(VBOX_EFI_DEBUG_DIR)/NullMemoryTestDxe \
-        MdeModulePkg/Universal/Metronome/Metronome/$(VBOX_EFI_DEBUG_DIR)/Metronome \
-        MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/MonotonicCounterRuntimeDxe \
-        MdeModulePkg/Universal/PCD/Dxe/Pcd/$(VBOX_EFI_DEBUG_DIR)/PcdDxe \
-        MdeModulePkg/Universal/PCD/Pei/Pcd/$(VBOX_EFI_DEBUG_DIR)/PcdPeim \
-        MdeModulePkg/Universal/PrintDxe/PrintDxe/$(VBOX_EFI_DEBUG_DIR)/PrintDxe \
-        MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei/$(VBOX_EFI_DEBUG_DIR)/ReportStatusCodeRouterPei \
-        MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/ReportStatusCodeRouterRuntimeDxe \
-        MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/ResetSystemRuntimeDxe \
-        MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe/$(VBOX_EFI_DEBUG_DIR)/SecurityStubDxe \
-        MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe/$(VBOX_EFI_DEBUG_DIR)/SetupBrowser \
-        MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe/$(VBOX_EFI_DEBUG_DIR)/SmbiosDxe \
-        MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei/$(VBOX_EFI_DEBUG_DIR)/StatusCodeHandlerPei \
-        MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/StatusCodeHandlerRuntimeDxe \
-        MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/VariableRuntimeDxe \
-        MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer/$(VBOX_EFI_DEBUG_DIR)/WatchdogTimer \
-        NetworkPkg/ArpDxe/ArpDxe/$(VBOX_EFI_DEBUG_DIR)/ArpDxe \
-        NetworkPkg/Dhcp4Dxe/Dhcp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Dhcp4Dxe \
-        NetworkPkg/DpcDxe/DpcDxe/$(VBOX_EFI_DEBUG_DIR)/DpcDxe \
-        NetworkPkg/Ip4Dxe/Ip4Dxe/$(VBOX_EFI_DEBUG_DIR)/Ip4Dxe \
-        NetworkPkg/MnpDxe/MnpDxe/$(VBOX_EFI_DEBUG_DIR)/MnpDxe \
-        NetworkPkg/Mtftp4Dxe/Mtftp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Mtftp4Dxe \
-        NetworkPkg/SnpDxe/SnpDxe/$(VBOX_EFI_DEBUG_DIR)/SnpDxe \
-        NetworkPkg/TcpDxe/TcpDxe/$(VBOX_EFI_DEBUG_DIR)/TcpDxe \
-        NetworkPkg/Udp4Dxe/Udp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Udp4Dxe \
-        NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe/$(VBOX_EFI_DEBUG_DIR)/UefiPxeBcDxe \
-        NetworkPkg/VlanConfigDxe/VlanConfigDxe/$(VBOX_EFI_DEBUG_DIR)/VlanConfigDxe \
-        OvmfPkg/8254TimerDxe/8254Timer/$(VBOX_EFI_DEBUG_DIR)/Timer \
-        OvmfPkg/8259InterruptControllerDxe/8259/$(VBOX_EFI_DEBUG_DIR)/Legacy8259 \
-        OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb/$(VBOX_EFI_DEBUG_DIR)/EmuVariableFvbRuntimeDxe \
-        OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport/$(VBOX_EFI_DEBUG_DIR)/IncompatiblePciDeviceSupportDxe \
-        OvmfPkg/IoMmuDxe/IoMmuDxe/$(VBOX_EFI_DEBUG_DIR)/IoMmuDxe \
-        OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit/$(VBOX_EFI_DEBUG_DIR)/PciHotPlugInitDxe \
-        OvmfPkg/PlatformDxe/Platform/$(VBOX_EFI_DEBUG_DIR)/PlatformDxe \
-        OvmfPkg/PlatformPei/PlatformPei/$(VBOX_EFI_DEBUG_DIR)/PlatformPei \
-        OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/FvbServicesRuntimeDxe \
-        OvmfPkg/SataControllerDxe/SataControllerDxe/$(VBOX_EFI_DEBUG_DIR)/SataController \
-        OvmfPkg/Sec/SecMain/$(VBOX_EFI_DEBUG_DIR)/SecMain \
-        OvmfPkg/SioBusDxe/SioBusDxe/$(VBOX_EFI_DEBUG_DIR)/SioBusDxe \
-        OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/SmbiosPlatformDxe \
-        OvmfPkg/Virtio10Dxe/Virtio10/$(VBOX_EFI_DEBUG_DIR)/Virtio10 \
-        OvmfPkg/VirtioNetDxe/VirtioNet/$(VBOX_EFI_DEBUG_DIR)/VirtioNetDxe \
-        OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe/$(VBOX_EFI_DEBUG_DIR)/VirtioPciDeviceDxe \
-        OvmfPkg/VirtioScsiDxe/VirtioScsi/$(VBOX_EFI_DEBUG_DIR)/VirtioScsiDxe \
-        PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/PcRtc \
-        ShellPkg/Application/Shell/Shell/$(VBOX_EFI_DEBUG_DIR)/Shell \
-        ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand/$(VBOX_EFI_DEBUG_DIR)/tftpDynamicCommand \
-        UefiCpuPkg/CpuDxe/CpuDxe/$(VBOX_EFI_DEBUG_DIR)/CpuDxe \
-        UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe/$(VBOX_EFI_DEBUG_DIR)/CpuIo2Dxe \
-        UefiCpuPkg/CpuMpPei/CpuMpPei/$(VBOX_EFI_DEBUG_DIR)/CpuMpPei \
-        UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei/$(VBOX_EFI_DEBUG_DIR)/S3Resume2Pei \
-        VBoxPkg/Logo/LogoDxe/$(VBOX_EFI_DEBUG_DIR)/LogoDxe \
-        VBoxPkg/VBoxAppleSim/VBoxAppleSim/$(VBOX_EFI_DEBUG_DIR)/VBoxAppleSim \
-        VBoxPkg/VBoxFsDxe/VBoxHfs/$(VBOX_EFI_DEBUG_DIR)/VBoxHfs \
-        VBoxPkg/VBoxSysTables/VBoxSysTables/$(VBOX_EFI_DEBUG_DIR)/VBoxSysTables \
-        VBoxPkg/VBoxVgaDxe/VBoxVgaDxe/$(VBOX_EFI_DEBUG_DIR)/VBoxVgaDxe \
-        VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe/$(VBOX_EFI_DEBUG_DIR)/VBoxVgaMiniPortDxe
+ #
+ # List of modules that ends up producing .efi, .debug and .pdb files.
+ #
+ VBOX_EFI_MODULES = \
+        FatPkg/EnhancedFatDxe/Fat/$(VBOX_EFI_DEBUG_DIR)/Fat \
+        MdeModulePkg/Application/UiApp/UiApp/$(VBOX_EFI_DEBUG_DIR)/UiApp \
+        MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru/$(VBOX_EFI_DEBUG_DIR)/AtaAtapiPassThruDxe \
+        MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe/$(VBOX_EFI_DEBUG_DIR)/AtaBusDxe \
+        MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe/$(VBOX_EFI_DEBUG_DIR)/Ps2KeyboardDxe \
+        MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe/$(VBOX_EFI_DEBUG_DIR)/EhciDxe \
+        MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe/$(VBOX_EFI_DEBUG_DIR)/NvmExpressDxe \
+        MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe/$(VBOX_EFI_DEBUG_DIR)/PciBusDxe \
+        MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe/$(VBOX_EFI_DEBUG_DIR)/PciHostBridgeDxe \
+        MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe/$(VBOX_EFI_DEBUG_DIR)/PciSioSerialDxe \
+        MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe/$(VBOX_EFI_DEBUG_DIR)/UhciDxe \
+        MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe/$(VBOX_EFI_DEBUG_DIR)/XhciDxe \
+        MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe/$(VBOX_EFI_DEBUG_DIR)/ScsiBus \
+        MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe/$(VBOX_EFI_DEBUG_DIR)/ScsiDisk \
+        MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe/$(VBOX_EFI_DEBUG_DIR)/UsbBusDxe \
+        MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe/$(VBOX_EFI_DEBUG_DIR)/UsbKbDxe \
+        MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe/$(VBOX_EFI_DEBUG_DIR)/UsbMassStorageDxe \
+        MdeModulePkg/Core/Dxe/DxeMain/$(VBOX_EFI_DEBUG_DIR)/DxeCore \
+        MdeModulePkg/Core/DxeIplPeim/DxeIpl/$(VBOX_EFI_DEBUG_DIR)/DxeIpl \
+        MdeModulePkg/Core/Pei/PeiMain/$(VBOX_EFI_DEBUG_DIR)/PeiCore \
+        MdeModulePkg/Core/RuntimeDxe/RuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/RuntimeDxe \
+        MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/AcpiPlatform \
+        MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe/$(VBOX_EFI_DEBUG_DIR)/AcpiTableDxe \
+        MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe/$(VBOX_EFI_DEBUG_DIR)/BootGraphicsResourceTableDxe \
+        MdeModulePkg/Universal/BdsDxe/BdsDxe/$(VBOX_EFI_DEBUG_DIR)/BdsDxe \
+        MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/CapsuleRuntimeDxe \
+        MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/ConPlatformDxe \
+        MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe/$(VBOX_EFI_DEBUG_DIR)/ConSplitterDxe \
+        MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe/$(VBOX_EFI_DEBUG_DIR)/GraphicsConsoleDxe \
+        MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe/$(VBOX_EFI_DEBUG_DIR)/TerminalDxe \
+        MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe/$(VBOX_EFI_DEBUG_DIR)/DevicePathDxe \
+        MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe/$(VBOX_EFI_DEBUG_DIR)/DisplayEngine \
+        MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe/$(VBOX_EFI_DEBUG_DIR)/DiskIoDxe \
+        MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe/$(VBOX_EFI_DEBUG_DIR)/PartitionDxe \
+        MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe/$(VBOX_EFI_DEBUG_DIR)/RamDiskDxe \
+        MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe/$(VBOX_EFI_DEBUG_DIR)/UdfDxe \
+        MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe/$(VBOX_EFI_DEBUG_DIR)/EnglishDxe \
+        MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe/$(VBOX_EFI_DEBUG_DIR)/DriverHealthManagerDxe \
+        MdeModulePkg/Universal/EbcDxe/EbcDxe/$(VBOX_EFI_DEBUG_DIR)/EbcDxe \
+        MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe/$(VBOX_EFI_DEBUG_DIR)/FaultTolerantWriteDxe \
+        MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe/$(VBOX_EFI_DEBUG_DIR)/HiiDatabase \
+        MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe/$(VBOX_EFI_DEBUG_DIR)/NullMemoryTestDxe \
+        MdeModulePkg/Universal/Metronome/Metronome/$(VBOX_EFI_DEBUG_DIR)/Metronome \
+        MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/MonotonicCounterRuntimeDxe \
+        MdeModulePkg/Universal/PCD/Dxe/Pcd/$(VBOX_EFI_DEBUG_DIR)/PcdDxe \
+        MdeModulePkg/Universal/PCD/Pei/Pcd/$(VBOX_EFI_DEBUG_DIR)/PcdPeim \
+        MdeModulePkg/Universal/PrintDxe/PrintDxe/$(VBOX_EFI_DEBUG_DIR)/PrintDxe \
+        MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei/$(VBOX_EFI_DEBUG_DIR)/ReportStatusCodeRouterPei \
+        MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/ReportStatusCodeRouterRuntimeDxe \
+        MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/ResetSystemRuntimeDxe \
+        MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe/$(VBOX_EFI_DEBUG_DIR)/SecurityStubDxe \
+        MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe/$(VBOX_EFI_DEBUG_DIR)/SetupBrowser \
+        MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe/$(VBOX_EFI_DEBUG_DIR)/SmbiosDxe \
+        MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei/$(VBOX_EFI_DEBUG_DIR)/StatusCodeHandlerPei \
+        MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/StatusCodeHandlerRuntimeDxe \
+        MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/VariableRuntimeDxe \
+        MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer/$(VBOX_EFI_DEBUG_DIR)/WatchdogTimer \
+        NetworkPkg/ArpDxe/ArpDxe/$(VBOX_EFI_DEBUG_DIR)/ArpDxe \
+        NetworkPkg/Dhcp4Dxe/Dhcp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Dhcp4Dxe \
+        NetworkPkg/DpcDxe/DpcDxe/$(VBOX_EFI_DEBUG_DIR)/DpcDxe \
+        NetworkPkg/Ip4Dxe/Ip4Dxe/$(VBOX_EFI_DEBUG_DIR)/Ip4Dxe \
+        NetworkPkg/MnpDxe/MnpDxe/$(VBOX_EFI_DEBUG_DIR)/MnpDxe \
+        NetworkPkg/Mtftp4Dxe/Mtftp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Mtftp4Dxe \
+        NetworkPkg/SnpDxe/SnpDxe/$(VBOX_EFI_DEBUG_DIR)/SnpDxe \
+        NetworkPkg/TcpDxe/TcpDxe/$(VBOX_EFI_DEBUG_DIR)/TcpDxe \
+        NetworkPkg/Udp4Dxe/Udp4Dxe/$(VBOX_EFI_DEBUG_DIR)/Udp4Dxe \
+        NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe/$(VBOX_EFI_DEBUG_DIR)/UefiPxeBcDxe \
+        NetworkPkg/VlanConfigDxe/VlanConfigDxe/$(VBOX_EFI_DEBUG_DIR)/VlanConfigDxe \
+        OvmfPkg/8254TimerDxe/8254Timer/$(VBOX_EFI_DEBUG_DIR)/Timer \
+        OvmfPkg/8259InterruptControllerDxe/8259/$(VBOX_EFI_DEBUG_DIR)/Legacy8259 \
+        OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb/$(VBOX_EFI_DEBUG_DIR)/EmuVariableFvbRuntimeDxe \
+        OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport/$(VBOX_EFI_DEBUG_DIR)/IncompatiblePciDeviceSupportDxe \
+        OvmfPkg/IoMmuDxe/IoMmuDxe/$(VBOX_EFI_DEBUG_DIR)/IoMmuDxe \
+        OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit/$(VBOX_EFI_DEBUG_DIR)/PciHotPlugInitDxe \
+        OvmfPkg/PlatformDxe/Platform/$(VBOX_EFI_DEBUG_DIR)/PlatformDxe \
+        OvmfPkg/PlatformPei/PlatformPei/$(VBOX_EFI_DEBUG_DIR)/PlatformPei \
+        OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/FvbServicesRuntimeDxe \
+        OvmfPkg/SataControllerDxe/SataControllerDxe/$(VBOX_EFI_DEBUG_DIR)/SataController \
+        OvmfPkg/Sec/SecMain/$(VBOX_EFI_DEBUG_DIR)/SecMain \
+        OvmfPkg/SioBusDxe/SioBusDxe/$(VBOX_EFI_DEBUG_DIR)/SioBusDxe \
+        OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe/$(VBOX_EFI_DEBUG_DIR)/SmbiosPlatformDxe \
+        OvmfPkg/Virtio10Dxe/Virtio10/$(VBOX_EFI_DEBUG_DIR)/Virtio10 \
+        OvmfPkg/VirtioNetDxe/VirtioNet/$(VBOX_EFI_DEBUG_DIR)/VirtioNetDxe \
+        OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe/$(VBOX_EFI_DEBUG_DIR)/VirtioPciDeviceDxe \
+        OvmfPkg/VirtioScsiDxe/VirtioScsi/$(VBOX_EFI_DEBUG_DIR)/VirtioScsiDxe \
+        PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe/$(VBOX_EFI_DEBUG_DIR)/PcRtc \
+        ShellPkg/Application/Shell/Shell/$(VBOX_EFI_DEBUG_DIR)/Shell \
+        ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand/$(VBOX_EFI_DEBUG_DIR)/tftpDynamicCommand \
+        UefiCpuPkg/CpuDxe/CpuDxe/$(VBOX_EFI_DEBUG_DIR)/CpuDxe \
+        UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe/$(VBOX_EFI_DEBUG_DIR)/CpuIo2Dxe \
+        UefiCpuPkg/CpuMpPei/CpuMpPei/$(VBOX_EFI_DEBUG_DIR)/CpuMpPei \
+        UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei/$(VBOX_EFI_DEBUG_DIR)/S3Resume2Pei \
+        VBoxPkg/Logo/LogoDxe/$(VBOX_EFI_DEBUG_DIR)/LogoDxe \
+        VBoxPkg/VBoxAppleSim/VBoxAppleSim/$(VBOX_EFI_DEBUG_DIR)/VBoxAppleSim \
+        VBoxPkg/VBoxFsDxe/VBoxHfs/$(VBOX_EFI_DEBUG_DIR)/VBoxHfs \
+        VBoxPkg/VBoxSysTables/VBoxSysTables/$(VBOX_EFI_DEBUG_DIR)/VBoxSysTables \
+        VBoxPkg/VBoxVgaDxe/VBoxVgaDxe/$(VBOX_EFI_DEBUG_DIR)/VBoxVgaDxe \
+        VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe/$(VBOX_EFI_DEBUG_DIR)/VBoxVgaMiniPortDxe
 
-# Version of VBOX_EFI_MODULES without directories. (Using $(value ) to avoid
-# expanding all the build target macros and then immediately discarding them.)
-VBOX_EFI_MODULES_FLAT = $(notdir $(value VBOX_EFI_MODULES))
+ # Version of VBOX_EFI_MODULES without directories. (Using $(value ) to avoid
+ # expanding all the build target macros and then immediately discarding them.)
+ VBOX_EFI_MODULES_FLAT = $(notdir $(value VBOX_EFI_MODULES))
 
 endif

trunk/src/VBox/Devices/EFI/Firmware/Makefile.kmk

@@ -76 +76 @@
 if1of ($(KBUILD_HOST), win os2)
  VBoxEfiBldPythonWrappers_EXEC_SOURCES = \
-        $(foreach PyWrap,$(VBOX_EFI_PYTHON_WRAPPERS),$(VBoxEfiBldPythonWrappers_0_OUTDIR)/$(PyWrap).cmd)
+        $(foreach PyWrap,$(VBOX_EFI_PYTHON_WRAPPERS),$(VBoxEfiBldPythonWrappers_0_OUTDIR)/$(PyWrap).cmd)
 else
  VBoxEfiBldPythonWrappers_EXEC_SOURCES = \
-        $(addprefix $(VBoxEfiBldPythonWrappers_0_OUTDIR)/,$(VBOX_EFI_PYTHON_WRAPPERS))
+        $(addprefix $(VBoxEfiBldPythonWrappers_0_OUTDIR)/,$(VBOX_EFI_PYTHON_WRAPPERS))
 endif
 VBoxEfiBldPythonWrappers_CLEAN = $(VBoxEfiBldPythonWrappers_EXEC_SOURCES)
@@ -184 +184 @@
 VBOX_EFI_DEPENDENCIES = \
         $(VBOX_PATH_EFI_FIRMWARE)/../DevEFI.h \
-       $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c \
-       $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf \
-       $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/VBoxPkg.dec \
-       \
-       $(VBOX_PATH_EFI_FIRMWARE)/OvmfPkg/OvmfPkg.dec \
+        $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c \
+        $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf \
+        $(VBOX_PATH_EFI_FIRMWARE)/VBoxPkg/VBoxPkg.dec \
+        \
+        $(VBOX_PATH_EFI_FIRMWARE)/OvmfPkg/OvmfPkg.dec
 
 #
@@ -196 +196 @@
 #
 if1of ($(KBUILD_HOST), win)
- VBOX_EFI_REDIRECT_E_EQUAL:=$(EQUAL)
+ VBOX_EFI_REDIRECT_E_EQUAL := $(EQUAL)
  VBOX_EFI_BUILD_CMD = $(REDIRECT) \
-        -E 'PATH=$(VBOX_PATH_STAGE_EFI_BLDPROGS)$(VBOX_SEP)$(PATH);' \
-        -E 'INCLUDE=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(VBOX_SEP)$(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)$(INCLUDE);' \
-        -E 'COMSPEC=$(firstword $(windir) $(SystemRoot) C:\windows)\system32\cmd.exe' \
-        -E 'MAKEFLAGS='
-else
- VBOX_EFI_REDIRECT_E_EQUAL:=
-VBOX_EFI_BUILD_CMD = $(REDIRECT) \
-        -E "PATH=$(VBOX_PATH_STAGE_EFI_BLDPROGS)$(VBOX_SEP)$(PATH)" \
-        -E     "C_INCLUDE_PATH=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(C_INCLUDE_PATH)" \
-        -E "CPLUS_INCLUDE_PATH=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(C_INCLUDE_PATH)"
+        -E 'PATH=$(VBOX_PATH_STAGE_EFI_BLDPROGS)$(VBOX_SEP)$(PATH);' \
+        -E 'INCLUDE=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(VBOX_SEP)$(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)$(INCLUDE);' \
+        -E 'COMSPEC=$(firstword $(windir) $(SystemRoot) C:\windows)\system32\cmd.exe' \
+        -E 'MAKEFLAGS='
+else
+ VBOX_EFI_REDIRECT_E_EQUAL :=
+ VBOX_EFI_BUILD_CMD = $(REDIRECT) \
+        -E "PATH=$(VBOX_PATH_STAGE_EFI_BLDPROGS)$(VBOX_SEP)$(PATH)" \
+        -E     "C_INCLUDE_PATH=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(C_INCLUDE_PATH)" \
+        -E "CPLUS_INCLUDE_PATH=$(PATH_ROOT)/include$(VBOX_SEP)$(PATH_OUT)$(VBOX_SEP)$(C_INCLUDE_PATH)"
 endif
 VBOX_EFI_BUILD_CMD += \
@@ -266 +266 @@
 $(VBoxEfiFirmware_0_OUTDIR)/x86/Conf/tools_def.txt \
 $(VBoxEfiFirmware_0_OUTDIR)/amd64/Conf/tools_def.txt: \
-               $(VBOX_PATH_EFI_FIRMWARE)/vbox-tools_def.txt \
+                $(VBOX_PATH_EFI_FIRMWARE)/vbox-tools_def.txt \
                 $(MAKEFILE) | $$(dir $$@)
         $(RM) -f -- "$@"
@@ -291 +291 @@
 $(VBoxEfiFirmware_0_OUTDIR)/x86/Conf/build_rule.txt \
 $(VBoxEfiFirmware_0_OUTDIR)/amd64/Conf/build_rule.txt: \
-               $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Conf/build_rule.template \
+                $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Conf/build_rule.template \
                 $(MAKEFILE) | $$(dir $$@)
         $(RM) -f -- "$@"
@@ -362 +362 @@
 # Some aliases.
 #
-build-efi-x86:   $$(filter %VBoxEFI32.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
+build-efi-x86: $$(filter %VBoxEFI32.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
 build-efi-amd64: $$(filter %VBoxEFI64.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
 

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -49 +49 @@
         output raw offset=0xC0000 \
         order \
-         clname CODE  \
-          segment VGAROM segaddr=0xC000 \
-          segment _TEXT  segaddr=0xC000 offset=0x9F0 \
-          segment VBE32  segaddr=0xC000 offset=0x4640 \
-         clname DATA \
-          segment _DATA  segaddr=0xC000 offset=0x4780 \
+        clname CODE \
+        segment VGAROM segaddr=0xC000 \
+        segment _TEXT  segaddr=0xC000 offset=0x9F0 \
+        segment VBE32  segaddr=0xC000 offset=0x4640 \
+        clname DATA \
+        segment _DATA  segaddr=0xC000 offset=0x4780
 
  MISCBINS += VBoxVgaBios286
@@ -73 +73 @@
                 $$$$(VBoxVgaBios$(1)_1_TARGET) \
                 $$(VBOX_MAKE_ALTERNATIVE_SOURCE) \
-                $$(VBOX_VBOXCMP)
+                $$(VBOX_VBOXCMP)
   if1of ($$(KBUILD_TYPE), release)
         $$(VBOX_MAKE_ALTERNATIVE_SOURCE) \
@@ -105 +105 @@
 
  update-vgabios-source: \
-        $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative386.asm \
-        $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative286.asm \
-        $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative8086.asm
+                $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative386.asm \
+                $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative286.asm \
+                $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative8086.asm
 
 endif # VBOX_WITH_OPEN_WATCOM
@@ -133 +133 @@
 
   $$$$(VgaBiosBin_0_OUTDIR)/VgaBiosBin$(1).c + $$$$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom: \
-                $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).asm \
-                $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).md5sum \
-                $$(VBOX_BIN2C) | $$$$(dir $$$$@)
+                $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).asm \
+                $$(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative$(1).md5sum \
+                $$(VBOX_BIN2C) | $$$$(dir $$$$@)
         $$(call MSG_TOOL,bin2c,VgaBiosBin,$$<,$$@)
         $$(QUIET)$$(TOOL_YASM_AS) -f bin -o $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom $$<
@@ -172 +172 @@
 VgaDefBiosLogo_CLEAN     = $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogo.c
 ifndef VBOX_OSE
-VgaDefBiosLogo_SOURCES  += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
-VgaDefBiosLogo_CLEAN    += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
+ VgaDefBiosLogo_SOURCES += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
+ VgaDefBiosLogo_CLEAN   += $(VgaDefBiosLogo_0_OUTDIR)/VgaDefBiosLogoNY.c
 endif
 

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

@@ -35 +35 @@
 tstUsbMouse_DEFS     = VBOX_WITH_VUSB
 tstUsbMouse_INCS     = \
-        ../../build
+        ../../build
 tstUsbMouse_LIBS     = $(LIB_VMM) $(LIB_REM)
 tstUsbMouse_SOURCES  = \
-        tstUsbMouse.cpp \
-        ../UsbMouse.cpp
+        tstUsbMouse.cpp \
+        ../UsbMouse.cpp
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Devices/Makefile.kmk

@@ -112 +112 @@
  ifdef VBOX_WITH_VSCSI_SSC
   VBoxDDU_SOURCES        += Storage/VSCSI/VSCSILunSsc.cpp
-  VBoxDDU_DEFS            += VBOX_WITH_VSCSI_SSC
+  VBoxDDU_DEFS            += VBOX_WITH_VSCSI_SSC
  endif
  VBoxDDU_LIBS             = \
@@ -120 +120 @@
         geom
  VBoxDDU_LIBS.solaris    += \
-    efi
+        efi
  if defined(VBOX_WITH_USB) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
   VBoxDDU_SDKS.win       += VBoxWinNewDevLib
   VBoxDDU_LIBS           += \
-        $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)
   VBoxDDU_LIBS.win       += \
-        $(PATH_STAGE_LIB)/VBoxDrvCfgDll$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBoxDrvCfgDll$(VBOX_SUFF_LIB)
  endif
  VBoxDDU_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDDU.dylib
@@ -180 +180 @@
  VBoxDD_SOURCES          = \
         build/VBoxDD.cpp \
-        \
+        \
         Input/DevPS2.cpp \
         Input/DevPS2K.cpp \
@@ -192 +192 @@
         $(if $(VBOX_WITH_IOMMU_AMD),Bus/DevIommuAmd.cpp,) \
         $(if $(VBOX_WITH_IOMMU_INTEL),Bus/DevIommuIntel.cpp,) \
-        EFI/DevSmc.cpp \
-        EFI/DevFlash.cpp \
-        EFI/FlashCore.cpp \
+        EFI/DevSmc.cpp \
+        EFI/DevFlash.cpp \
+        EFI/FlashCore.cpp \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -207 +207 @@
         PC/DevQemuFwCfg.cpp \
         PC/DevLpc.cpp \
-        GIMDev/GIMDev.cpp \
-        GIMDev/DrvUDP.cpp \
+        GIMDev/GIMDev.cpp \
+        GIMDev/DrvUDP.cpp \
         VMMDev/VMMDev.cpp \
         $(if $(VBOX_WITH_HGCM),VMMDev/VMMDevHGCM.cpp,) \
         VMMDev/VMMDevTesting.cpp \
         Network/DevPCNet.cpp \
-        Network/DevDP8390.cpp \
-        Network/Dev3C501.cpp \
+        Network/DevDP8390.cpp \
+        Network/Dev3C501.cpp \
         PC/DevDMA.cpp \
         PC/DevHPET.cpp \
@@ -220 +220 @@
         Storage/DevFdc.cpp \
         Parallel/DevParallel.cpp \
-        \
+        \
         Input/DrvKeyboardQueue.cpp \
         Input/DrvMouseQueue.cpp \
@@ -312 +312 @@
   VBoxDD_DEFS           += VBOX_WITH_HGSMI
   VBoxDD_SOURCES        += \
-        Graphics/DevVGA_VBVA.cpp \
-        Graphics/HGSMI/HGSMIHost.cpp
+        Graphics/DevVGA_VBVA.cpp \
+        Graphics/HGSMI/HGSMIHost.cpp
   VBoxDD_LIBS           += \
-        $(PATH_STAGE_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
  endif
 
@@ -321 +321 @@
   VBoxDD_DEFS           += VBOX_WITH_WDDM
   VBoxDD_SOURCES        += \
-        Graphics/HGSMI/SHGSMIHost.cpp
+        Graphics/HGSMI/SHGSMIHost.cpp
  endif
 
@@ -333 +333 @@
  ifdef VBOX_WITH_VMSVGA3D
   if1of ($(KBUILD_TARGET), linux win)
-# Dynamically load 3D library (opengl32, libGL).
-# This is a temporary solution. In future the 3D backend will be in a separate library.
-VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
+   # Dynamically load 3D library (opengl32, libGL).
+   # This is a temporary solution. In future the 3D backend will be in a separate library.
+   VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
   endif
   VBoxDD_DEFS           += VBOX_WITH_VMSVGA3D
@@ -347 +347 @@
    VBoxDD_DEFS          += VMSVGA3D_DX
    VBoxDD_SOURCES       += \
-       Graphics/DevVGA-SVGA3d-dx.cpp \
-       Graphics/DevVGA-SVGA3d-dx-savedstate.cpp \
-       Graphics/DevVGA-SVGA3d-dx-shader.cpp
+        Graphics/DevVGA-SVGA3d-dx.cpp \
+        Graphics/DevVGA-SVGA3d-dx-savedstate.cpp \
+        Graphics/DevVGA-SVGA3d-dx-shader.cpp
    if "$(KBUILD_TARGET)" == "win" || defined(VBOX_WITH_DXVK)
     VBoxDD_SDKS.linux   += VBoxDxVk
@@ -355 +355 @@
     VBoxDD_DEFS         += VMSVGA3D_DX_BACKEND
     VBoxDD_SOURCES      += \
-       Graphics/DevVGA-SVGA3d-dx-dx11.cpp
+        Graphics/DevVGA-SVGA3d-dx-dx11.cpp
    endif
   endif
   VBoxDD_SOURCES       += \
-       Graphics/svgadump/svga_dump.c
-  if  "$(KBUILD_TARGET)" == "win" && !defined(VBOX_WITH_VMSVGA3D_USE_OPENGL)
-    VBoxDD_DEFS          += VMSVGA3D_DIRECT3D
-    VBoxDD_SOURCES       += \
-        Graphics/DevVGA-SVGA3d-win.cpp \
-        Graphics/DevVGA-SVGA3d-win-d3d9.cpp
-    VBoxDD_LIBS.win      += d3d9.lib $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
-    VBoxDD_LDFLAGS.win   += /DELAYLOAD:d3d9.dll
+        Graphics/svgadump/svga_dump.c
+  if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_WITH_VMSVGA3D_USE_OPENGL)
+   VBoxDD_DEFS           += VMSVGA3D_DIRECT3D
+   VBoxDD_SOURCES        += \
+        Graphics/DevVGA-SVGA3d-win.cpp \
+        Graphics/DevVGA-SVGA3d-win-d3d9.cpp
+   VBoxDD_LIBS.win       += d3d9.lib $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
+   VBoxDD_LDFLAGS.win    += /DELAYLOAD:d3d9.dll
   else
    VBoxDD_DEFS          += VMSVGA3D_OPENGL
@@ -386 +386 @@
 
    ifdef VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD
-   VBoxDD_DEFS          += VMSVGA3D_DYNAMIC_LOAD
-   VBoxDD_SOURCES       += \
-        Graphics/DevVGA-SVGA3d-glLdr.cpp
+    VBoxDD_DEFS         += VMSVGA3D_DYNAMIC_LOAD
+    VBoxDD_SOURCES      += \
+        Graphics/DevVGA-SVGA3d-glLdr.cpp
    else
-   VBoxDD_LIBS.linux    += X11 GL
-   VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
+    VBoxDD_LIBS.linux   += X11 GL
+    VBoxDD_LIBS.win     += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    endif
    VBoxDD_LDFLAGS.darwin += -framework OpenGL
@@ -415 +415 @@
   VBoxDD_DEFS           += VBOX_WITH_VDMA
   VBoxDD_SOURCES        += \
-        Graphics/DevVGA_VDMA.cpp
+        Graphics/DevVGA_VDMA.cpp
  endif
 
@@ -432 +432 @@
   VBoxDD_DEFS.darwin    += VUSB_HAVE_USBPROXY_DEVICE
   VBoxDD_SOURCES.darwin += \
-        USB/USBProxyDevice.cpp \
-        USB/darwin/USBProxyDevice-darwin.cpp
-#  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.9) # Hack, shouldn't be needed
-#   USB/darwin/USBProxyDevice-darwin.cpp_SDKS = MACOSX1010
-#  endif
+        USB/USBProxyDevice.cpp \
+        USB/darwin/USBProxyDevice-darwin.cpp
+  #  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.9)       # Hack, shouldn't be needed
+  #   USB/darwin/USBProxyDevice-darwin.cpp_SDKS = MACOSX1010
+  #  endif
 
   VBoxDD_DEFS.linux     += \
-        VUSB_HAVE_USBPROXY_DEVICE \
-        $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
-        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
+        VUSB_HAVE_USBPROXY_DEVICE \
+        $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
   VBoxDD_SOURCES.linux  += \
-        USB/USBProxyDevice.cpp \
-        USB/linux/USBProxyDevice-linux.cpp
+        USB/USBProxyDevice.cpp \
+        USB/linux/USBProxyDevice-linux.cpp
 
   VBoxDD_DEFS.os2       += VUSB_HAVE_USBPROXY_DEVICE
   VBoxDD_INCS.os2       += $(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/os2
   VBoxDD_SOURCES.os2    += \
-        USB/USBProxyDevice.cpp \
-        USB/os2/USBProxyDevice-os2.cpp
+        USB/USBProxyDevice.cpp \
+        USB/os2/USBProxyDevice-os2.cpp
 
   VBoxDD_DEFS.win       += VUSB_HAVE_USBPROXY_DEVICE
   VBoxDD_SOURCES.win    += \
-        USB/USBProxyDevice.cpp \
-        USB/win/USBProxyDevice-win.cpp
+        USB/USBProxyDevice.cpp \
+        USB/win/USBProxyDevice-win.cpp
 
   VBoxDD_DEFS.solaris   += VUSB_HAVE_USBPROXY_DEVICE
-  VBoxDD_SOURCES.solaris+= \
-        USB/USBProxyDevice.cpp \
-        USB/solaris/USBProxyDevice-solaris.cpp
+  VBoxDD_SOURCES.solaris += \
+        USB/USBProxyDevice.cpp \
+        USB/solaris/USBProxyDevice-solaris.cpp
 
   VBoxDD_DEFS.freebsd   += VUSB_HAVE_USBPROXY_DEVICE
-  VBoxDD_SOURCES.freebsd+= \
-        USB/USBProxyDevice.cpp \
-        USB/freebsd/USBProxyDevice-freebsd.cpp
+  VBoxDD_SOURCES.freebsd += \
+        USB/USBProxyDevice.cpp \
+        USB/freebsd/USBProxyDevice-freebsd.cpp
 
   ifdef VBOX_WITH_SCSI
@@ -475 +475 @@
    VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
    VBoxDD_SOURCES       += \
-        USB/DevEHCI.cpp
+        USB/DevEHCI.cpp
   endif
 
@@ -481 +481 @@
    VBoxDD_DEFS          += VBOX_WITH_XHCI_IMPL
    VBoxDD_SOURCES       += \
-        USB/DevXHCI.cpp
+        USB/DevXHCI.cpp
   endif
 
@@ -488 +488 @@
     VBoxDD_DEFS          += VBOX_WITH_USB_VIDEO_IMPL
     VBoxDD_SOURCES       += \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcam.cpp \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcamDesc.cpp \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/jpggen.cpp \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/DrvHostWebcam.cpp \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/JPEGEnc.cpp
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcam.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/UsbWebcamDesc.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/jpggen.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/DrvHostWebcam.cpp \
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/JPEGEnc.cpp
     $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/JPEGEnc.cpp_INCS = \
-        $(VBOX_JPEG_INCS)
+        $(VBOX_JPEG_INCS)
     VBoxDD_SOURCES.linux += \
-        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/HostWebcam-v4l2.cpp
+        $(PATH_ROOT)/src/VBox/ExtPacks/Puel/UsbWebcam/DrvHostWebcam/HostWebcam-v4l2.cpp
     VBoxDD_LIBS += \
-        $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBox-libjpeg$(VBOX_SUFF_LIB)
    endif
   endif
@@ -507 +507 @@
   VBoxDD_DEFS           += VBOX_WITH_VUSB
   VBoxDD_SOURCES        += \
-        USB/DevOHCI.cpp \
-        USB/DrvVUSBRootHub.cpp \
-        USB/VUSBDevice.cpp \
-        USB/VUSBSniffer.cpp \
-        USB/VUSBSnifferPcapNg.cpp \
-        USB/VUSBSnifferUsbMon.cpp \
-        USB/VUSBSnifferVmx.cpp \
-        USB/VUSBUrb.cpp \
-        USB/VUSBUrbPool.cpp \
-        USB/VUSBUrbTrace.cpp
+        USB/DevOHCI.cpp \
+        USB/DrvVUSBRootHub.cpp \
+        USB/VUSBDevice.cpp \
+        USB/VUSBSniffer.cpp \
+        USB/VUSBSnifferPcapNg.cpp \
+        USB/VUSBSnifferUsbMon.cpp \
+        USB/VUSBSnifferVmx.cpp \
+        USB/VUSBUrb.cpp \
+        USB/VUSBUrbPool.cpp \
+        USB/VUSBUrbTrace.cpp
  endif
 
@@ -537 +537 @@
   VBoxDD_DEFS           += VBOX_WITH_E1000
   VBoxDD_SOURCES        += \
-        Network/DevE1000.cpp \
-        Network/DevE1000Phy.cpp \
-        Network/DevEEPROM.cpp
+        Network/DevE1000.cpp \
+        Network/DevE1000Phy.cpp \
+        Network/DevEEPROM.cpp
  endif
 
@@ -546 +546 @@
   VBoxDD_SOURCES        += \
         VirtIO/VirtioCore.cpp \
-        Network/DevVirtioNet.cpp
+        Network/DevVirtioNet.cpp
  endif
 
@@ -566 +566 @@
   VBoxDD_DEFS           += VBOX_WITH_NETSHAPER
   VBoxDD_SOURCES        += \
-        Network/DrvNetShaper.cpp
+        Network/DrvNetShaper.cpp
  endif
 
@@ -572 +572 @@
   VBoxDD_DEFS.darwin    += VBOX_WITH_VMNET
   VBoxDD_SOURCES.darwin += \
-        Network/DrvVMNet.m
+        Network/DrvVMNet.m
   VBoxDD_LDFLAGS.darwin += -framework vmnet
  endif
@@ -580 +580 @@
   VBoxDD_DEFS           += VBOX_WITH_CLOUD_NET
   VBoxDD_SOURCES        += \
-        Network/DrvCloudTunnel.cpp
+        Network/DrvCloudTunnel.cpp
 
   VBoxDD_SOURCES       += \
@@ -596 +596 @@
   VBoxDD_DEFS           += VBOX_WITH_AHCI IN_AHCI_R3
   VBoxDD_SOURCES        += \
-        Storage/DevAHCI.cpp
+        Storage/DevAHCI.cpp
  endif
 
@@ -602 +602 @@
   VBoxDD_DEFS           += VBOX_WITH_BUSLOGIC
   VBoxDD_SOURCES        += \
-        Storage/DevBusLogic.cpp
+        Storage/DevBusLogic.cpp
  endif
 
@@ -608 +608 @@
   VBoxDD_DEFS           += VBOX_WITH_LSILOGIC
   VBoxDD_SOURCES        += \
-        Storage/DevLsiLogicSCSI.cpp
+        Storage/DevLsiLogicSCSI.cpp
  endif
 
@@ -614 +614 @@
   VBoxDD_DEFS          += VBOX_WITH_NVME_IMPL
   VBoxDD_SOURCES       += \
-        Storage/DevNVMe.cpp
+        Storage/DevNVMe.cpp
  endif
 
@@ -627 +627 @@
   VBoxDD_SOURCES        += \
         Security/DevTpm.cpp \
-    Security/DrvTpmEmu.cpp
+        Security/DrvTpmEmu.cpp
 
   VBoxDD_SOURCES.linux += \
@@ -678 +678 @@
   VBoxDD_DEFS           += VBOX_WITH_PCI_PASSTHROUGH_IMPL
   VBoxDD_SOURCES        += \
-        Bus/DevPciRaw.cpp \
-        Bus/DrvPciRaw.cpp
+        Bus/DevPciRaw.cpp \
+        Bus/DrvPciRaw.cpp
  endif
 
@@ -694 +694 @@
  VBoxDD_DEFS += $(VBOX_AUDIO_DEFS)
  VBoxDD_SOURCES         += \
-        Audio/DevIchAc97.cpp \
-        Audio/DevSB16.cpp \
-        Audio/DevHda.cpp \
-        Audio/DevHdaCodec.cpp \
-        Audio/DevHdaStream.cpp \
-        Audio/AudioHlp.cpp \
-        Audio/AudioMixBuffer.cpp \
-        Audio/AudioMixer.cpp \
-        Audio/DrvAudio.cpp \
-        Audio/DrvHostAudioNull.cpp
+        Audio/DevIchAc97.cpp \
+        Audio/DevSB16.cpp \
+        Audio/DevHda.cpp \
+        Audio/DevHdaCodec.cpp \
+        Audio/DevHdaStream.cpp \
+        Audio/AudioHlp.cpp \
+        Audio/AudioMixBuffer.cpp \
+        Audio/AudioMixer.cpp \
+        Audio/DrvAudio.cpp \
+        Audio/DrvHostAudioNull.cpp
 
  if defined(VBOX_WITH_AUDIO_DEBUG) || defined(VBOX_WITH_AUDIO_VALIDATIONKIT)
   VBoxDD_SOURCES += \
-        Audio/AudioTest.cpp \
-        Audio/AudioTestService.cpp \
-        Audio/AudioTestServiceTcp.cpp \
-        Audio/AudioTestServiceProtocol.cpp
+        Audio/AudioTest.cpp \
+        Audio/AudioTestService.cpp \
+        Audio/AudioTestServiceTcp.cpp \
+        Audio/AudioTestServiceProtocol.cpp
  endif
 
@@ -716 +716 @@
   VBoxDD_DEFS    += VBOX_WITH_AUDIO_DEBUG
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioDebug.cpp
+        Audio/DrvHostAudioDebug.cpp
  endif
 
@@ -722 +722 @@
   VBoxDD_DEFS    += VBOX_WITH_AUDIO_VALIDATIONKIT
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioValidationKit.cpp
+        Audio/DrvHostAudioValidationKit.cpp
  endif
 
  ifeq ($(KBUILD_TARGET),darwin)
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioCoreAudio.cpp \
-        Audio/DrvHostAudioCoreAudioAuth.mm
+        Audio/DrvHostAudioCoreAudio.cpp \
+        Audio/DrvHostAudioCoreAudioAuth.mm
  endif
 
  ifeq ($(KBUILD_TARGET),win)
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioDSound.cpp \
-        Audio/DrvHostAudioWasApi.cpp
+        Audio/DrvHostAudioDSound.cpp \
+        Audio/DrvHostAudioWasApi.cpp
   ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
    VBoxDD_DEFS    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
    VBoxDD_SOURCES += \
-        Audio/DrvHostAudioDSoundMMNotifClient.cpp
+        Audio/DrvHostAudioDSoundMMNotifClient.cpp
   endif
  endif
@@ -745 +745 @@
   VBoxDD_DEFS    += VBOX_WITH_AUDIO_OSS
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioOss.cpp
+        Audio/DrvHostAudioOss.cpp
  endif
 
@@ -751 +751 @@
   VBoxDD_DEFS    += VBOX_WITH_AUDIO_ALSA
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioAlsa.cpp \
-        Audio/DrvHostAudioAlsaStubs.cpp
+        Audio/DrvHostAudioAlsa.cpp \
+        Audio/DrvHostAudioAlsaStubs.cpp
  endif
 
@@ -758 +758 @@
   VBoxDD_DEFS    += VBOX_WITH_AUDIO_PULSE
   VBoxDD_SOURCES += \
-        Audio/DrvHostAudioPulseAudio.cpp \
-        Audio/DrvHostAudioPulseAudioStubs.cpp
+        Audio/DrvHostAudioPulseAudio.cpp \
+        Audio/DrvHostAudioPulseAudioStubs.cpp
  endif
 
@@ -766 +766 @@
         Network/DrvNAT.cpp \
         Network/slirp/bootp.c \
-        Network/slirp/debug.c \
+        Network/slirp/debug.c \
         Network/slirp/ip_icmp.c \
         Network/slirp/ip_input.c \
@@ -780 +780 @@
         Network/slirp/tcp_timer.c \
         Network/slirp/udp.c \
-        Network/slirp/hostres.c \
+        Network/slirp/hostres.c \
         Network/slirp/dnsproxy/hash.c \
         Network/slirp/tftp.c \
         Network/slirp/dnsproxy/dnsproxy.c
 
- ifeq ($(KBUILD_TARGET), win)
+ ifeq ($(KBUILD_TARGET),win)
   VBOX_SLIRP_SOURCES += Network/slirp/ip_icmpwin.c
  else ifneq ($(KBUILD_TARGET),darwin)
   # helper for debugging unprivileged
-#  Network/slirp/ip_icmp.c_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
-#  VBOX_SLIRP_SOURCES += ../NetworkServices/NAT/getrawsock.c
- endif
-
- ifneq ($(KBUILD_TARGET), win)
-  VBOX_SLIRP_SOURCES +=         Network/slirp/resolv_conf_parser.c
+  #  Network/slirp/ip_icmp.c_DEFS += VBOX_RAWSOCK_DEBUG_HELPER
+  #  VBOX_SLIRP_SOURCES += ../NetworkServices/NAT/getrawsock.c
+ endif
+
+ ifneq ($(KBUILD_TARGET),win)
+  VBOX_SLIRP_SOURCES += Network/slirp/resolv_conf_parser.c
  endif
 
@@ -814 +814 @@
  # Enable VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER here for a while, then move to
  # $(file)_DEFS or clean the code disabled with this definition.
- VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER=1
+ VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER = 1
 
  # dump memory related operations.
@@ -821 +821 @@
  VBoxDD_SOURCES += $(VBOX_SLIRP_SOURCES)
  define def_vbox_slirp_cflags
-   $(file)_DEFS += \
-       $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \
-       $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,)        \
-       $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,)      \
-       $(if $(VBOX_WITH_NAT_SEND2HOME),VBOX_WITH_NAT_SEND2HOME,)        \
-       $(if $(VBOX_WITH_HIDDEN_TCPTEMPLATE),VBOX_WITH_HIDDEN_TCPTEMPLATE,)      \
-       $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
+  $(file)_DEFS  += \
+        $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \
+        $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,) \
+        $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,) \
+        $(if $(VBOX_WITH_NAT_SEND2HOME),VBOX_WITH_NAT_SEND2HOME,) \
+        $(if $(VBOX_WITH_HIDDEN_TCPTEMPLATE),VBOX_WITH_HIDDEN_TCPTEMPLATE,) \
+        $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
   $(file)_INCS += \
-        $(1)/slirp/bsd/sys \
-        $(1)/slirp/bsd/sys/sys \
-        $(1)/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/include \
-        $(1)/slirp/bsd/netinet \
-        $(1)/slirp \
-        $(1)/slirp/libalias
+        $(1)/slirp/bsd/sys \
+        $(1)/slirp/bsd/sys/sys \
+        $(1)/slirp/bsd/$(VBOX_SLIRP_BSD_ARCH)/include \
+        $(1)/slirp/bsd/netinet \
+        $(1)/slirp \
+        $(1)/slirp/libalias
   ifeq ($(KBUILD_TARGET),win)
    $(file)_CFLAGS = -wd4018
@@ -846 +846 @@
  VBoxDD_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES)
  define def_vbox_slirp_alias_cflags
-   $(file)_DEFS += VBOX_SLIRP_ALIAS \
-       $(if $(VBOX_WITH_DEBUG_LIBALIAS),VBOX_WITH_DEBUG_LIBALIAS,)
-   $(file)_INCS += \
-        $(1)/slirp/libalias \
-        $(1)/slirp \
-        $(1)/slirp/dnsproxy
-   ifneq ($(KBUILD_TARGET),win)
-    $(file)_CFLAGS += -Wno-shadow
-   endif
+  $(file)_DEFS  += VBOX_SLIRP_ALIAS \
+        $(if $(VBOX_WITH_DEBUG_LIBALIAS),VBOX_WITH_DEBUG_LIBALIAS,)
+  $(file)_INCS  += \
+        $(1)/slirp/libalias \
+        $(1)/slirp \
+        $(1)/slirp/dnsproxy
+  ifneq ($(KBUILD_TARGET),win)
+   $(file)_CFLAGS  += -Wno-shadow
+  endif
  endef
  $(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
@@ -887 +887 @@
  VBoxDD_DEFS.win += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDD_SOURCES.win += \
-        Parallel/DrvHostParallel.cpp
+        Parallel/DrvHostParallel.cpp
 
  ifdef VBOX_WITH_VIRTUALKD
   VBoxDD_DEFS.win     += VBOX_WITH_VIRTUALKD
   VBoxDD_SOURCES.win  += \
-        Misc/DevVirtualKD.cpp
+        Misc/DevVirtualKD.cpp
  endif
 
@@ -909 +909 @@
  ifeq ($(KBUILD_TARGET),win)
   VBoxDD_LIBS           += \
-        $(LIB_DDU) \
-        $(PATH_STAGE_LIB)/VBoxDD2.lib
+        $(LIB_DDU) \
+        $(PATH_STAGE_LIB)/VBoxDD2.lib
  else
   VBoxDD_LIBS           += \
-        $(VBoxDDU_1_STAGE_TARGET) \
-        $(VBoxDD2_1_STAGE_TARGET)
+        $(VBoxDDU_1_STAGE_TARGET) \
+        $(VBoxDD2_1_STAGE_TARGET)
  endif
 
@@ -945 +945 @@
   # VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
   VBoxDD_CLEAN       += \
-        $(VBoxDD_0_OUTDIR)/vboxaml.hex \
-        $(VBoxDD_0_OUTDIR)/vboxaml.aml \
-        $(VBoxDD_0_OUTDIR)/vboxaml.aml.tmp \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml.tmp \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.tmp \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.pre \
-        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.hex,) \
-        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.aml,) \
-        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.aml.tmp,)
+        $(VBoxDD_0_OUTDIR)/vboxaml.hex \
+        $(VBoxDD_0_OUTDIR)/vboxaml.aml \
+        $(VBoxDD_0_OUTDIR)/vboxaml.aml.tmp \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml.tmp \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.tmp \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.pre \
+        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.hex,) \
+        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.aml,) \
+        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.aml.tmp,)
   PC/ACPI/VBoxAcpi.cpp_DEPS = \
-        $(VBoxDD_0_OUTDIR)/vboxaml.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex \
-        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.hex,)
+        $(VBoxDD_0_OUTDIR)/vboxaml.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex \
+        $(if $(VBOX_WITH_TPM),$(VBoxDD_0_OUTDIR)/vboxssdt_tpm.hex,)
 
   $$(VBoxDD_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
@@ -1076 +1076 @@
   VBoxDDRC_DEFS         += $(VBOX_AUDIO_DEFS)
   VBoxDDRC_SOURCES      += \
-        Audio/DevHda.cpp \
-        Audio/DevIchAc97.cpp
+        Audio/DevHda.cpp \
+        Audio/DevIchAc97.cpp
 
   VBoxDDRC_DEFS         += \
-        $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
-        $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
-        $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
+        $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
+        $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
+        $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
 
   ifdef VBOX_WITH_E1000
    VBoxDDRC_DEFS        += VBOX_WITH_E1000
    VBoxDDRC_SOURCES     += \
-        Network/DevE1000.cpp \
-        Network/DevE1000Phy.cpp
+        Network/DevE1000.cpp \
+        Network/DevE1000Phy.cpp
   endif
 
@@ -1094 +1094 @@
    VBoxDDRC_DEFS        += VBOX_WITH_VIRTIO
    VBoxDDRC_SOURCES     += \
-        VirtIO/VirtioCore.cpp \
-        Network/DevVirtioNet.cpp
+        VirtIO/VirtioCore.cpp \
+        Network/DevVirtioNet.cpp
   endif
 
@@ -1113 +1113 @@
    VBoxDDRC_DEFS         += VBOX_WITH_VMSVGA
    VBoxDDRC_SOURCES      += \
-        Graphics/DevVGA-SVGA.cpp
+        Graphics/DevVGA-SVGA.cpp
   endif
   ifdef VBOX_WITH_VMSVGA3D
@@ -1122 +1122 @@
    VBoxDDRC_DEFS        += VBOX_WITH_VUSB
    VBoxDDRC_SOURCES     += \
-        USB/DevOHCI.cpp
+        USB/DevOHCI.cpp
   endif
 
@@ -1130 +1130 @@
     VBoxDDRC_DEFS       += VBOX_WITH_EHCI_IMPL
     VBoxDDRC_SOURCES    += \
-        USB/DevEHCI.cpp
+        USB/DevEHCI.cpp
    endif
    if defined(VBOX_WITH_XHCI_IMPL)
     VBoxDDRC_DEFS       += VBOX_WITH_XHCI_IMPL
     VBoxDDRC_SOURCES    += \
-        USB/DevXHCI.cpp
+        USB/DevXHCI.cpp
    endif
   endif
@@ -1144 +1144 @@
 
   ifdef VBOX_WITH_AHCI
-  VBoxDDRC_DEFS         += VBOX_WITH_AHCI IN_AHCI_GC
-  VBoxDDRC_SOURCES      += \
-        Storage/DevAHCI.cpp
+   VBoxDDRC_DEFS        += VBOX_WITH_AHCI IN_AHCI_GC
+   VBoxDDRC_SOURCES     += \
+        Storage/DevAHCI.cpp
   endif
 
   ifdef VBOX_WITH_BUSLOGIC
-  VBoxDDRC_DEFS         += VBOX_WITH_BUSLOGIC
-  VBoxDDRC_SOURCES      += \
-        Storage/DevBusLogic.cpp
+   VBoxDDRC_DEFS        += VBOX_WITH_BUSLOGIC
+   VBoxDDRC_SOURCES     += \
+        Storage/DevBusLogic.cpp
   endif
 
   ifdef VBOX_WITH_LSILOGIC
-  VBoxDDRC_DEFS         += VBOX_WITH_LSILOGIC
-  VBoxDDRC_SOURCES      += \
-        Storage/DevLsiLogicSCSI.cpp
+   VBoxDDRC_DEFS        += VBOX_WITH_LSILOGIC
+   VBoxDDRC_SOURCES     += \
+        Storage/DevLsiLogicSCSI.cpp
   endif
 
@@ -1168 +1168 @@
 
   if1of ($(VBOX_LDR_FMT32), pe lx)
-  VBoxDDRC_LIBS           = \
-        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+   VBoxDDRC_LIBS          = \
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
   endif
   $(call VBOX_SET_VER_INFO_RC,VBoxDDRC,VirtualBox VMM Devices and Drivers$(COMMA) raw-mode) # last!
@@ -1181 +1181 @@
  VBoxDD2_TEMPLATE        = VBoxR3DllWarnNoPic
  VBoxDD2_DEFS            = \
-        IN_VBOXDD2 \
-        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
+        IN_VBOXDD2 \
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
  VBoxDD2_INCS           := \
-        build \
+        build \
         $(PATH_SUB_CURRENT)
  VBoxDD2_SOURCES         = \
@@ -1191 +1191 @@
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
         $(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_PXE_ROM), \
+        $(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
@@ -1243 +1243 @@
  VBoxDDR0_INCS           = build $(VBOX_GRAPHICS_INCS)
  VBoxDDR0_INCS          += $(VBOX_PATH_VMSVGA_DEVICE_INC)
- VBoxDDR0_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ VBoxDDR0_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  VBoxDDR0_SOURCES        = \
         build/VBoxDDR0.cpp \
@@ -1254 +1254 @@
         EFI/DevSmc.cpp \
         EFI/DevFlash.cpp \
-        EFI/FlashCore.cpp \
+        EFI/FlashCore.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -1268 +1268 @@
         Storage/DevATA.cpp \
         Network/DevPCNet.cpp \
-        Network/DevDP8390.cpp \
-        Network/Dev3C501.cpp \
+        Network/DevDP8390.cpp \
+        Network/Dev3C501.cpp \
         Serial/DevSerial.cpp \
         Serial/DevOxPcie958.cpp \
@@ -1278 +1278 @@
         VMMDev/VMMDevTesting.cpp \
         Network/DrvDedicatedNic.cpp \
-        $(if-expr 0,Network/DrvIntNet.cpp,) # no ring-0 driver support at the moment
+        $(if-expr 0,Network/DrvIntNet.cpp,)  # no ring-0 driver support at the moment
 
  ifdef VBOX_WITH_DTRACE_R0
@@ -1288 +1288 @@
 
  VBoxDDR0_DEFS          += \
-        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
-        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
-        $(if $(VBOX_WITH_VDMA),VBOX_WITH_VDMA,) \
-        $(if $(VBOXWDDM_WITH_VBVA),VBOXWDDM_WITH_VBVA,) \
-        $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
-        $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
-        $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
+        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
+        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
+        $(if $(VBOX_WITH_VDMA),VBOX_WITH_VDMA,) \
+        $(if $(VBOXWDDM_WITH_VBVA),VBOXWDDM_WITH_VBVA,) \
+        $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
+        $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
+        $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
 
  VBoxDDR0_DEFS += $(VBOX_AUDIO_DEFS)
@@ -1305 +1305 @@
   VBoxDDR0_DEFS         += VBOX_WITH_E1000
   VBoxDDR0_SOURCES      += \
-        Network/DevE1000.cpp \
-        Network/DevE1000Phy.cpp
+        Network/DevE1000.cpp \
+        Network/DevE1000Phy.cpp
  endif
 
@@ -1319 +1319 @@
   VBoxDDR0_DEFS         += VBOX_WITH_NETSHAPER
   VBoxDDR0_SOURCES      += \
-        Network/DrvNetShaper.cpp
+        Network/DrvNetShaper.cpp
  endif
 
@@ -1325 +1325 @@
   VBoxDDR0_DEFS         += VBOX_WITH_VMSVGA
   VBoxDDR0_SOURCES      += \
-        Graphics/DevVGA-SVGA.cpp
+        Graphics/DevVGA-SVGA.cpp
  endif
  ifdef VBOX_WITH_VMSVGA3D
@@ -1334 +1334 @@
   VBoxDDR0_DEFS         += VBOX_WITH_VUSB
   VBoxDDR0_SOURCES      += \
-        USB/DevOHCI.cpp
+        USB/DevOHCI.cpp
  endif
  ifdef VBOX_WITH_USB
- VBoxDDR0_DEFS          += VBOX_WITH_USB
+  VBoxDDR0_DEFS         += VBOX_WITH_USB
   if defined(VBOX_WITH_EHCI_IMPL)
    VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
    VBoxDDR0_SOURCES     += \
-        USB/DevEHCI.cpp
+        USB/DevEHCI.cpp
   endif
   if defined(VBOX_WITH_XHCI_IMPL)
    VBoxDDR0_DEFS        += VBOX_WITH_XHCI_IMPL
    VBoxDDR0_SOURCES     += \
-        USB/DevXHCI.cpp
+        USB/DevXHCI.cpp
   endif
  endif
@@ -1357 +1357 @@
  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
   VBoxDDR0_SOURCES      += \
-        Bus/DevPciRaw.cpp
+        Bus/DevPciRaw.cpp
  endif
 
  ifdef VBOX_WITH_AHCI
- VBoxDDR0_DEFS          += VBOX_WITH_AHCI IN_AHCI_R0
- VBoxDDR0_SOURCES       += \
-        Storage/DevAHCI.cpp
+  VBoxDDR0_DEFS         += VBOX_WITH_AHCI IN_AHCI_R0
+  VBoxDDR0_SOURCES      += \
+        Storage/DevAHCI.cpp
  endif
 
  ifdef VBOX_WITH_BUSLOGIC
- VBoxDDR0_DEFS          += VBOX_WITH_BUSLOGIC
- VBoxDDR0_SOURCES       += \
-        Storage/DevBusLogic.cpp
+  VBoxDDR0_DEFS         += VBOX_WITH_BUSLOGIC
+  VBoxDDR0_SOURCES      += \
+        Storage/DevBusLogic.cpp
  endif
 
  ifdef VBOX_WITH_LSILOGIC
- VBoxDDR0_DEFS          += VBOX_WITH_LSILOGIC
- VBoxDDR0_SOURCES       += \
-        Storage/DevLsiLogicSCSI.cpp
+  VBoxDDR0_DEFS         += VBOX_WITH_LSILOGIC
+  VBoxDDR0_SOURCES      += \
+        Storage/DevLsiLogicSCSI.cpp
  endif
 
@@ -1404 +1404 @@
 
  if1of ($(VBOX_LDR_FMT), pe lx)
- VBoxDDR0_LIBS           = \
-        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
+  VBoxDDR0_LIBS          = \
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
  endif
  VBoxDDR0_LIBS          += \
@@ -1417 +1417 @@
   vbox_vboxddr0-src_INST = bin/src/vbox_vboxddr0/
   vbox_vboxddr0-src_SYMLINKS = \
-        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
-        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
+        SUPWrapperMod-linux.c=>../common/SUPWrapperMod-linux.c \
+        Makefile-wrapper.gmk=>../common/Makefile-wrapper.gmk
   vbox_vboxddr0-src_SOURCES = \
         $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/Makefile-vbox_vboxddr0.gmk=>Makefile \
-       $(VBoxDDR0_0_OUTDIR)/VBoxDDR0.r0=>VBoxDDR0.r0 \
+        $(VBoxDDR0_0_OUTDIR)/VBoxDDR0.r0=>VBoxDDR0.r0 \
         $(VBoxDDR0_0_OUTDIR)/VBoxDDR0.debug=>VBoxDDR0.debug
  endif
@@ -1430 +1430 @@
  ServicesR0_TEMPLATE  = VBoxR0
  ServicesR0_DEFS      = VBOX_IN_VMM IN_INTNET_R0 IN_RT_R0 $(VMM_COMMON_DEFS) \
-        $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
-        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,)
+        $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
+        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,)
  ServicesR0_SOURCES   = \
-        Network/SrvIntNetR0.cpp \
+        Network/SrvIntNetR0.cpp
 #        $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/SrvPciRawR0.cpp,)
  Network/SrvIntNetR0.cpp_CXXFLAGS := $(if-expr $(KBUILD_TARGET) == "win",,$(VBOX_GCC_Wno-array_bounds))
@@ -1446 +1446 @@
   tstIntNetR0_DEFS        = IN_INTNET_R0
   tstIntNetR0_SOURCES     = \
-        Network/testcase/tstIntNetR0.cpp
+        Network/testcase/tstIntNetR0.cpp
   ifneq ($(KBUILD_TARGET),win)
    Network/testcase/tstIntNetR0.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
@@ -1475 +1475 @@
   endif
   tstIntNet-1_SOURCES     = \
-        Network/testcase/tstIntNet-1.cpp \
-        Network/Pcap.cpp
+        Network/testcase/tstIntNet-1.cpp \
+        Network/Pcap.cpp
  endif
 
@@ -1516 +1516 @@
   tstDevice_DEFS        += IN_SUP_R3
   tstDevice_SOURCES     = \
-        testcase/tstDevice.cpp \
-        testcase/tstDeviceR0.cpp \
-        testcase/tstDeviceCfg.cpp \
-        testcase/tstDevicePdmDevHlp.cpp \
-        testcase/tstDevicePdmDevHlpR0.cpp \
-        testcase/tstDevicePdmThread.cpp \
-        testcase/tstDeviceSsmFuzz.cpp \
-        testcase/tstDeviceSsmLoadDbg.cpp \
-        testcase/tstDeviceIoFuzz.cpp
+        testcase/tstDevice.cpp \
+        testcase/tstDeviceR0.cpp \
+        testcase/tstDeviceCfg.cpp \
+        testcase/tstDevicePdmDevHlp.cpp \
+        testcase/tstDevicePdmDevHlpR0.cpp \
+        testcase/tstDevicePdmThread.cpp \
+        testcase/tstDeviceSsmFuzz.cpp \
+        testcase/tstDeviceSsmLoadDbg.cpp \
+        testcase/tstDeviceIoFuzz.cpp
  endif
 
@@ -1658 +1658 @@
         VBOX_WINE_WITH_IPRT
  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
- VBoxSVGA3D_DEFS        += \
-        WINE_UNICODE_API= \
-        DLLDIR="" \
-        BINDIR="" \
-        LIB_TO_BINDIR="" \
-        LIB_TO_DLLDIR="" \
-        BIN_TO_DLLDIR="" \
-        LIB_TO_DATADIR="" \
-        BIN_TO_DATADIR=""
+  VBoxSVGA3D_DEFS       += \
+        WINE_UNICODE_API= \
+        DLLDIR="" \
+        BINDIR="" \
+        LIB_TO_BINDIR="" \
+        LIB_TO_DLLDIR="" \
+        BIN_TO_DLLDIR="" \
+        LIB_TO_DATADIR="" \
+        BIN_TO_DATADIR=""
  else
- VBoxSVGA3D_DEFS        += \
-        WINE_UNICODE_API="" \
-        DLLDIR=\"\" \
-        BINDIR=\"\" \
-        LIB_TO_BINDIR=\"\" \
-        LIB_TO_DLLDIR=\"\" \
-        BIN_TO_DLLDIR=\"\" \
-        LIB_TO_DATADIR=\"\" \
-        BIN_TO_DATADIR=\"\"
+  VBoxSVGA3D_DEFS       += \
+        WINE_UNICODE_API="" \
+        DLLDIR=\"\" \
+        BINDIR=\"\" \
+        LIB_TO_BINDIR=\"\" \
+        LIB_TO_DLLDIR=\"\" \
+        BIN_TO_DLLDIR=\"\" \
+        LIB_TO_DATADIR=\"\" \
+        BIN_TO_DATADIR=\"\"
  endif
  if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)

trunk/src/VBox/Devices/Network/lwip-new/Config.kmk

@@ -29 +29 @@
 
 LWIP_INCS += \
-    src/include \
-    src/include/ipv4 \
-    src/include/ipv6 \
-    vbox/include \
-    vbox
+        src/include \
+        src/include/ipv4 \
+        src/include/ipv6 \
+        vbox/include \
+        vbox
 
 LWIP_SOURCES += \
-    src/api/api_lib.c \
-    src/api/api_msg.c \
-    src/api/err.c \
-    src/api/netbuf.c \
-    src/api/netdb.c \
-    src/api/netifapi.c \
-    src/api/sockets.c \
-    src/api/tcpip.c \
-    src/core/def.c \
-    src/core/dhcp.c \
-    src/core/dns.c \
-    src/core/inet_chksum.c \
-    src/core/init.c \
-    src/core/ipv4/autoip.c \
-    src/core/ipv4/icmp.c \
-    src/core/ipv4/igmp.c \
-    src/core/ipv4/ip4.c \
-    src/core/ipv4/ip4_addr.c \
-    src/core/ipv4/ip_frag.c \
-    src/core/ipv6/dhcp6.c \
-    src/core/ipv6/ethip6.c \
-    src/core/ipv6/icmp6.c \
-    src/core/ipv6/inet6.c \
-    src/core/ipv6/ip6.c \
-    src/core/ipv6/ip6_addr.c \
-    src/core/ipv6/ip6_frag.c \
-    src/core/ipv6/mld6.c \
-    src/core/ipv6/nd6.c \
-    src/core/mem.c \
-    src/core/memp.c \
-    src/core/netif.c \
-    src/core/pbuf.c \
-    src/core/raw.c \
-    src/core/stats.c \
-    src/core/sys.c \
-    src/core/tcp.c \
-    src/core/tcp_in.c \
-    src/core/tcp_out.c \
-    src/core/timers.c \
-    src/core/udp.c \
-    src/netif/etharp.c \
-    vbox/sys_arch.c \
-    vbox/VBoxLwipCore.cpp
+        src/api/api_lib.c \
+        src/api/api_msg.c \
+        src/api/err.c \
+        src/api/netbuf.c \
+        src/api/netdb.c \
+        src/api/netifapi.c \
+        src/api/sockets.c \
+        src/api/tcpip.c \
+        src/core/def.c \
+        src/core/dhcp.c \
+        src/core/dns.c \
+        src/core/inet_chksum.c \
+        src/core/init.c \
+        src/core/ipv4/autoip.c \
+        src/core/ipv4/icmp.c \
+        src/core/ipv4/igmp.c \
+        src/core/ipv4/ip4.c \
+        src/core/ipv4/ip4_addr.c \
+        src/core/ipv4/ip_frag.c \
+        src/core/ipv6/dhcp6.c \
+        src/core/ipv6/ethip6.c \
+        src/core/ipv6/icmp6.c \
+        src/core/ipv6/inet6.c \
+        src/core/ipv6/ip6.c \
+        src/core/ipv6/ip6_addr.c \
+        src/core/ipv6/ip6_frag.c \
+        src/core/ipv6/mld6.c \
+        src/core/ipv6/nd6.c \
+        src/core/mem.c \
+        src/core/memp.c \
+        src/core/netif.c \
+        src/core/pbuf.c \
+        src/core/raw.c \
+        src/core/stats.c \
+        src/core/sys.c \
+        src/core/tcp.c \
+        src/core/tcp_in.c \
+        src/core/tcp_out.c \
+        src/core/timers.c \
+        src/core/udp.c \
+        src/netif/etharp.c \
+        vbox/sys_arch.c \
+        vbox/VBoxLwipCore.cpp
 
 # LWIP_SOURCES += \

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -45 +45 @@
         VBOX_WITH_AHCI \
         VBOX_WITH_VIRTIO_SCSI \
-        VBOX_BIOS_CPU=80386
+        VBOX_BIOS_CPU=80386
  #VBoxPcBios386_DEFS.debug = DEBUG_ATA DEBUG_POST DEBUG_INT13
  VBoxPcBios386_LDFLAGS = \
         output raw offset=0xF0000 \
         order \
-         clname DATA segaddr=0xF000 \
-          segment _DATA \
-         clname CODE \
-          segment _TEXT   segaddr=0xF000 offset=0x1600 \
-          segment BIOS32  segaddr=0xF000 offset=0xDA00 \
-          segment BIOSSEG segaddr=0xF000 offset=0xE000
+        clname DATA segaddr=0xF000 \
+        segment _DATA \
+        clname CODE \
+        segment _TEXT   segaddr=0xF000 offset=0x1600 \
+        segment BIOS32  segaddr=0xF000 offset=0xDA00 \
+        segment BIOSSEG segaddr=0xF000 offset=0xE000
  VBoxPcBios386_SOURCES = \
         post.c \
@@ -100 +100 @@
  VBoxPcBios32_TEMPLATE = VBoxBios32Lib
  VBoxPcBios32_SOURCES = \
-       pci32.c
+        pci32.c
 
  ../../BiosCommonCode/DoUInt32Div.c_CFLAGS = -mc # asm.h and uint32.h both require far data pointers by default.
@@ -110 +110 @@
  VBoxPcBios286_SOURCES = $(VBoxPcBios386_SOURCES) \
         ../../BiosCommonCode/DoUInt32Div.c \
-       ../../BiosCommonCode/ASMBitLastSetU16.asm
+        ../../BiosCommonCode/ASMBitLastSetU16.asm
 
  MISCBINS += VBoxPcBios8086
@@ -118 +118 @@
  VBoxPcBios8086_SOURCES = $(VBoxPcBios386_SOURCES) \
         ../../BiosCommonCode/DoUInt32Div.c \
-       ../../BiosCommonCode/ASMBitLastSetU16.asm
+        ../../BiosCommonCode/ASMBitLastSetU16.asm
 
 
@@ -156 +156 @@
 
  update-pcbios-source: \
-        $(PATH_SUB_CURRENT)/VBoxBiosAlternative386.asm \
-        $(PATH_SUB_CURRENT)/VBoxBiosAlternative286.asm \
-        $(PATH_SUB_CURRENT)/VBoxBiosAlternative8086.asm
+                $(PATH_SUB_CURRENT)/VBoxBiosAlternative386.asm \
+                $(PATH_SUB_CURRENT)/VBoxBiosAlternative286.asm \
+                $(PATH_SUB_CURRENT)/VBoxBiosAlternative8086.asm
 
 endif # VBOX_WITH_OPEN_WATCOM
@@ -182 +182 @@
 
   $$$$(PcBiosBin_0_OUTDIR)/PcBiosBin$(1).c + $$$$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom: \
-                $$(PATH_SUB_CURRENT)/VBoxBiosAlternative$(1).asm \
-                $$(PATH_SUB_CURRENT)/VBoxBiosAlternative$(1).md5sum \
-                $$(VBOX_BIN2C) | $$$$(dir $$$$@)
+                $$(PATH_SUB_CURRENT)/VBoxBiosAlternative$(1).asm \
+                $$(PATH_SUB_CURRENT)/VBoxBiosAlternative$(1).md5sum \
+                $$(VBOX_BIN2C) | $$$$(dir $$$$@)
         $$(call MSG_TOOL,bin2c,PcBiosBin,$$<,$$@)
         $$(QUIET)$$(TOOL_YASM_AS) -f bin -o $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $$<

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

@@ -69 +69 @@
  endif
  VBoxPlaygroundDevice_INCS += \
-        $(VBOX_XPCOM_INCS)
+        $(VBOX_XPCOM_INCS)
  VBoxPlaygroundDevice_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
  VBoxPlaygroundDevice_LIBS += \
-        $(LIB_XPCOM)
+        $(LIB_XPCOM)
 else  # COM
  VBoxPlaygroundDevice_INCS += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include
+        $(VBOX_PATH_SDK)/bindings/mscom/include
  VBoxPlaygroundDevice_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 endif # COM
 

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

@@ -70 +70 @@
  ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
   OTHERS += \
-        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+        $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
  endif
 endif
@@ -127 +127 @@
  tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h
 endif
- tstDeviceStructSize_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
+tstDeviceStructSize_INCS      += $(VBOX_PATH_VMM_DEVICES_SRC)
 
 #
@@ -138 +138 @@
 
 ifdef VBOX_WITH_RAW_MODE
-# 1&2. Manually dump selected structures and members.
-$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h: $$(tstDeviceStructSizeRC_1_STAGE_TARGET) | $$(dir $$@)
+ # 1&2. Manually dump selected structures and members.
+ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h: $$(tstDeviceStructSizeRC_1_STAGE_TARGET) | $$(dir $$@)
         $(call MSG_GENERATE,,$@)
         $(QUIET)$(REDIRECT) -wo $@ -- $^