Changeset 98444 in vbox for trunk/include

Timestamp:

Feb 2, 2023 1:05:19 PM (2 years ago)

Author:

vboxsync

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

155692

Message:

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

File:

• trunk/include/Makefile.kmk (modified) (8 diffs)

trunk/include/Makefile.kmk

@@ -107 +107 @@
         VBox/VBoxGuestLibSharedFolders.h \
         VBox/VBoxGuestLibSharedFoldersInline.h \
-       iprt/linux/version.h
+        iprt/linux/version.h
 
 # GCC only headers.
@@ -121 +121 @@
         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/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)) \
         \
@@ -145 +145 @@
         iprt/runtime-loader.h \
         iprt/mangling.h \
-       $(subst $(PATH_SUB_CURRENT)/,,$(wildcard $(PATH_SUB_CURRENT)/iprt/asm*watcom*.h)) \
-       iprt/asn1-generator% \
-       iprt/win/% \
-       iprt/nt/% \
-       \
+        $(subst $(PATH_SUB_CURRENT)/,,$(wildcard $(PATH_SUB_CURRENT)/iprt/asm*watcom*.h)) \
+        iprt/asn1-generator% \
+        iprt/win/% \
+        iprt/nt/% \
+        \
         $(foreach os,$(filter-out $(KBUILD_TARGET),$(KBUILD_OSES)),iprt/$(os)/% VBox/$(os)/%) \
         $(foreach arch,$(KBUILD_ARCHES),iprt/nocrt/$(arch)/%)
@@ -155 +155 @@
 # AMD64 only headers.
 ifneq ($(KBUILD_TARGET_ARCH),amd64)
-VBOX_HDRS_OMIT += \
-        VBox/vmm/cpumctx.h \
-        VBox/vmm/cpumctx-v1_6.h \
-        VBox/vmm/dbgfcorefmt.h
+ VBOX_HDRS_OMIT += \
+        VBox/vmm/cpumctx.h \
+        VBox/vmm/cpumctx-v1_6.h \
+        VBox/vmm/dbgfcorefmt.h
 endif
 # ARM only headers.
 ifn1of ($(KBUILD_TARGET_ARCH), arm32 arm64)
-VBOX_HDRS_OMIT += \
-        iprt/asm-arm.h
+ VBOX_HDRS_OMIT += \
+        iprt/asm-arm.h
 endif
 
@@ -170 +170 @@
 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 \
-)))
+        $(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.
@@ -180 +180 @@
 if "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" == ""
  ifeq ($(KBUILD_TARGET),win)
-VBOX_HDRS_ALL_R3      := $(filter-out VBox/com/VirtualBox.h VBox/com/listeners.h VBox/settings.h,$(VBOX_HDRS_ALL_R3))
+  VBOX_HDRS_ALL_R3    := $(filter-out VBox/com/VirtualBox.h VBox/com/listeners.h VBox/settings.h,$(VBOX_HDRS_ALL_R3))
  else
-VBOX_HDRS_ALL_R3      := $(filter-out VBox/com/% VBox/settings.h,$(VBOX_HDRS_ALL_R3))
+  VBOX_HDRS_ALL_R3    := $(filter-out VBox/com/% VBox/settings.h,$(VBOX_HDRS_ALL_R3))
  endif
 endif
@@ -206 +206 @@
 
 if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
-SyntaxVBoxIncludeR3_TEMPLATE = VBoxMainExe
-SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM
+ SyntaxVBoxIncludeR3_TEMPLATE = VBoxMainExe
+ SyntaxVBoxIncludeR3_DEFS = VBOX_WITH_HGCM
 else
-SyntaxVBoxIncludeR3_TEMPLATE = VBoxR3Exe
-SyntaxVBoxIncludeR3_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ SyntaxVBoxIncludeR3_TEMPLATE = VBoxR3Exe
+ SyntaxVBoxIncludeR3_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 endif
 SyntaxVBoxIncludeR3_DEFS += USING_VMM_COMMON_DEFS
@@ -229 +229 @@
 
 if1of ($(KBUILD_TARGET), darwin os2 solaris win)
-LIBRARIES += SyntaxVBoxIncludeR0Drv
-SyntaxVBoxIncludeR0Drv_TEMPLATE = VBoxR0DrvLib
-SyntaxVBoxIncludeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
-SyntaxVBoxIncludeR0Drv_DEFS = VBOX_WITH_HGCM USING_VMM_COMMON_DEFS
-SyntaxVBoxIncludeR0Drv_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
-SyntaxVBoxIncludeR0Drv_SOURCES := \
-        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_R0DRV_C)))) \
-        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_R0DRV))))
-SyntaxVBoxIncludeR0Drv_CLEAN = $(SyntaxVBoxIncludeR0Drv_SOURCES)
+ LIBRARIES += SyntaxVBoxIncludeR0Drv
+ SyntaxVBoxIncludeR0Drv_TEMPLATE = VBoxR0DrvLib
+ SyntaxVBoxIncludeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
+ SyntaxVBoxIncludeR0Drv_DEFS = VBOX_WITH_HGCM USING_VMM_COMMON_DEFS
+ SyntaxVBoxIncludeR0Drv_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
+ SyntaxVBoxIncludeR0Drv_SOURCES := \
+        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_R0DRV_C)))) \
+        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_R0DRV))))
+ SyntaxVBoxIncludeR0Drv_CLEAN = $(SyntaxVBoxIncludeR0Drv_SOURCES)
 endif
 
 ifdef VBOX_WITH_RAW_MODE
-LIBRARIES += SyntaxVBoxIncludeRC
-SyntaxVBoxIncludeRC_TEMPLATE = VBoxRc
-SyntaxVBoxIncludeRC_DEFS = VBOX_WITH_HGCM USING_VMM_COMMON_DEFS
-SyntaxVBoxIncludeRC_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
-SyntaxVBoxIncludeRC_SOURCES := \
-        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_RC_C)))) \
-        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_RC))))
-SyntaxVBoxIncludeRC_CLEAN = $(SyntaxVBoxIncludeRC_SOURCES)
+ LIBRARIES += SyntaxVBoxIncludeRC
+ SyntaxVBoxIncludeRC_TEMPLATE = VBoxRc
+ SyntaxVBoxIncludeRC_DEFS = VBOX_WITH_HGCM USING_VMM_COMMON_DEFS
+ SyntaxVBoxIncludeRC_CDEFS = IPRT_WITHOUT_NAMED_UNIONS_AND_STRUCTS
+ SyntaxVBoxIncludeRC_SOURCES := \
+        $(addprefix $(PATH_OBJ)/include/c/,  $(addsuffix .c,  $(basename $(VBOX_HDRS_ALL_RC_C)))) \
+        $(addprefix $(PATH_OBJ)/include/cpp/,$(addsuffix .cpp,$(basename $(VBOX_HDRS_ALL_RC))))
+ SyntaxVBoxIncludeRC_CLEAN = $(SyntaxVBoxIncludeRC_SOURCES)
 endif