Changeset 98416 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Feb 1, 2023 4:25:17 PM (22 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (6 diffs)
• lib/Makefile.kmk (modified) (6 diffs)
• lib/testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -72 +72 @@
  #VBoxGuest_DEFS.win     += LOG_ENABLED LOG_TO_BACKDOOR
  VBoxGuest_DEFS.win += \
-        $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
+        $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
  VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK)
  VBoxGuest_DEPS.haiku   += $(VBOX_SVN_REV_HEADER)
@@ -128 +128 @@
         win/VBoxGuest.rc
   VBoxGuest_SOURCES.win.x86 += \
-       ../../../Runtime/common/string/strcmp.asm \
-       ../../../Runtime/common/string/strchr.asm \
-       ../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
-       ../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm
+        ../../../Runtime/common/string/strcmp.asm \
+        ../../../Runtime/common/string/strchr.asm \
+        ../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
+        ../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm
   VBoxGuest_LIBS        += \
         $(VBOX_LIB_VBGL_R0BASE) \
@@ -152 +152 @@
   # The library order is crucial, so a bit of trickery is necessary.
   # A library is used to make sure that VBoxGuestA-os2.asm is first in the link. (temporary hack?)
-VBoxGuest_SOURCES        = \
+  VBoxGuest_SOURCES      = \
         VBoxGuestA-os2.asm
   ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxGuest_LIBS           = \
-        $(VBoxGuestLibOs2Hack_1_TARGET) \
-        $(VBOX_LIB_VBGL_R0BASE) \
-        $(VBOX_LIB_IPRT_GUEST_R0) \
-        $(PATH_IGCC)/lib/libend.lib
+   VBoxGuest_LIBS        = \
+        $(VBoxGuestLibOs2Hack_1_TARGET) \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0) \
+        $(PATH_IGCC)/lib/libend.lib
   else
-VBoxGuest_SOURCES       += \
-        VBoxGuest-os2.def
-#VBoxGuest_LDFLAGS        = -s -t -v
-VBoxGuest_LIBS           = \
-        $(VBoxGuestLibOs2Hack_1_TARGET) \
-        $(VBOX_LIB_VBGL_R0BASE) \
-        $(VBOX_LIB_IPRT_GUEST_R0) \
-        $(VBOX_GCC_LIBGCC) \
-        end
+   VBoxGuest_SOURCES    += \
+        VBoxGuest-os2.def
+   #VBoxGuest_LDFLAGS        = -s -t -v
+   VBoxGuest_LIBS        = \
+        $(VBoxGuestLibOs2Hack_1_TARGET) \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0) \
+        $(VBOX_GCC_LIBGCC) \
+        end
   endif
-## When debugging init with kDrvTest:
-#VBoxGuest_NAME          = VBoxGst
-
-# See above.
-LIBRARIES += VBoxGuestLibOs2Hack
-VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib
-VBoxGuestLibOs2Hack_INSTTYPE = none
-VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
-VBoxGuestLibOs2Hack_INCS = \
-        . \
-        $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
-VBoxGuestLibOs2Hack_SOURCES = \
-        VBoxGuest-os2.cpp \
-        VBoxGuest.cpp
+  ## When debugging init with kDrvTest:
+  #VBoxGuest_NAME          = VBoxGst
+
+  # See above.
+  LIBRARIES += VBoxGuestLibOs2Hack
+  VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib
+  VBoxGuestLibOs2Hack_INSTTYPE = none
+  VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)
+  VBoxGuestLibOs2Hack_INCS = \
+        . \
+        $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
+  VBoxGuestLibOs2Hack_SOURCES = \
+        VBoxGuest-os2.cpp \
+        VBoxGuest.cpp
  endif # OS/2
 
@@ -199 +199 @@
  VBoxGuest.kext_BLDDIRS  = $(VBoxGuest.kext_0_OUTDIR)/Contents/
 
-$$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \
-                $(PATH_SUB_CURRENT)/darwin/Info.plist \
-                $(VBOX_VERSION_MK) | $$(dir $$@)
+ $$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \
+                $(PATH_SUB_CURRENT)/darwin/Info.plist \
+                $(VBOX_VERSION_MK) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxGuest,$@,$<)
         $(QUIET)$(RM) -f $@
@@ -215 +215 @@
                 $<
 
-$(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest)
+ $(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest)
 endif # darwin
 
@@ -244 +244 @@
  # Build test for the Guest Additions kernel module (kmk check).
  #
-$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
+ $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
 endif # Linux
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

@@ -53 +53 @@
 ifndef VBOX_ONLY_VALIDATIONKIT
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-  LIBRARIES += \
-        VBoxGuestR3LibXFree86
- endif
+  ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+   LIBRARIES += \
+        VBoxGuestR3LibXFree86
+  endif
  endif
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
@@ -82 +82 @@
         VBoxGuestR0LibHGCM.cpp \
         VbglR0CanUsePhysPageList.cpp \
-       \
+        \
         VBoxGuestR0LibIdc.cpp \
         VBoxGuestR0LibSharedFolders.c \
@@ -140 +140 @@
         VBoxGuestR3LibStat.cpp \
         VBoxGuestR3LibTime.cpp \
-        VBoxGuestR3LibModule.cpp \
-        VBoxGuestR3LibPidFile.cpp \
-        VBoxGuestR3LibVrdp.cpp \
-        VBoxGuestR3LibMouse.cpp \
-        VBoxGuestR3LibSeamless.cpp \
-        VBoxGuestR3LibVideo.cpp
+        VBoxGuestR3LibModule.cpp \
+        VBoxGuestR3LibPidFile.cpp \
+        VBoxGuestR3LibVrdp.cpp \
+        VBoxGuestR3LibMouse.cpp \
+        VBoxGuestR3LibSeamless.cpp \
+        VBoxGuestR3LibVideo.cpp
 ifneq ($(KBUILD_TARGET),win)
  VBoxGuestR3Lib_SOURCES   += \
@@ -158 +158 @@
  VBoxGuestR3Lib_DEFS      += VBOX_WITH_SHARED_CLIPBOARD_GUEST
  VBoxGuestR3Lib_SOURCES   += \
-        VBoxGuestR3LibClipboard.cpp
+        VBoxGuestR3LibClipboard.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
- VBoxGuestR3Lib_SOURCES   += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp
+  VBoxGuestR3Lib_SOURCES  += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp
  endif
 endif
@@ -174 +174 @@
 ifdef VBOX_WITH_DRAG_AND_DROP
  VBoxGuestR3Lib_DEFS      += \
-    VBOX_WITH_DRAG_AND_DROP \
-    $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+        VBOX_WITH_DRAG_AND_DROP \
+        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
  VBoxGuestR3Lib_SOURCES   += \
         VBoxGuestR3LibDragAndDrop.cpp
@@ -229 +229 @@
         VBoxGuestR3LibRuntimeXF86.cpp
 VBoxGuestR3LibXFree86_INCS     = \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
-        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11
+        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \
+        $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \
+        $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11
 
 #

trunk/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk

@@ -39 +39 @@
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_BUILD)
 
-#
-# Testcase for the physical heap.
-#
-PROGRAMS += tstVbglR0PhysHeap-1
-tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe
-tstVbglR0PhysHeap-1_SOURCES  = \
-        tstVbglR0PhysHeap-1.cpp
+ #
+ # Testcase for the physical heap.
+ #
+ PROGRAMS += tstVbglR0PhysHeap-1
+ tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe
+ tstVbglR0PhysHeap-1_SOURCES = \
+        tstVbglR0PhysHeap-1.cpp