Changeset 98416 in vbox for trunk/src/VBox/Additions/os2/VBoxSF

Timestamp:

Feb 1, 2023 4:25:17 PM (2 years ago)

Author:

vboxsync

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

155660

Message:

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

File:

• trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk (modified) (7 diffs)

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

@@ -32 +32 @@
  VBOX_USE_WATCOM_FOR_OS2  = 1
  KBUILD_TARGET      = os2
-  BUILD_TARGET      = os2
+ BUILD_TARGET       = os2
  KBUILD_TARGET_ARCH = x86
-  BUILD_TARGET_ARCH = x86
+ BUILD_TARGET_ARCH  = x86
 endif
 
@@ -65 +65 @@
 TOOL_VBoxNasmDot_COMPILE_AS_DEPORD =
 define TOOL_VBoxNasmDot_COMPILE_AS_CMDS
-ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
+ ifdef TOOL_VBoxNasmDot_USE_KSUBMIT
         $(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
                 $(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
@@ -72 +72 @@
                -MD "$(dep)" -MP\
                 $(abspath $(source))
-else
+ else
         $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasmDot_AS)\
                 $(flags) $(qaddprefix sh,-i, $(qaddsuffix ,/,$(incs))) $(qaddprefix sh,-D, $(defs))\
@@ -79 +79 @@
                -MD "$(dep)" -MP\
                 $(abspath $(source))
-endif
+ endif
         $(QUIET)"$(dotseg_1_TARGET)" "$(obj)"
 endef
@@ -97 +97 @@
 TEMPLATE_VBoxR0DrvIFS_EXTENDS = VBoxGuestR0Drv
 ifdef VBOX_USE_WATCOM_FOR_OS2
-TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
+ TEMPLATE_VBoxR0DrvIFS_LDFLAGS = $(subst physdevice,dll, $(TEMPLATE_VBoxGuestR0Drv_LDFLAGS))
 endif
 TEMPLATE_VBoxR0DrvIFS_SYSSUFF = .ifs
@@ -114 +114 @@
         $(PATH_ROOT)/src/VBox/Runtime/include
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSF_LDFLAGS      := \
-        OPTION MODNAME='VBoxSF' \
-        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-            TYPE DATA PRELOAD DYNAMIC
-#       OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
-# Data exports:
-VBoxSF_LDFLAGS += \
-        EXPORT 'FS_ATTRIBUTE' \
-        EXPORT 'FS_NAME' \
-        EXPORT 'FS_MPSAFEFLAGS2' \
-        EXPORT 'FS32_ATTRIBUTE'
-# 16-bit entry points.
-VBoxSF_LDFLAGS += \
-        EXPORT 'FS_ALLOCATEPAGESPACE' \
-        EXPORT 'FS_ATTACH' \
-        EXPORT 'FS_CANCELLOCKREQUEST' \
-        EXPORT 'FS_CANCELLOCKREQUESTL' \
-        EXPORT 'FS_CHDIR' \
-        EXPORT 'FS_CHGFILEPTR' \
-        EXPORT 'FS_CLOSE' \
-        EXPORT 'FS_COMMIT' \
-        EXPORT 'FS_COPY' \
-        EXPORT 'FS_DELETE' \
-        EXPORT 'FS_DOPAGEIO' \
-        EXPORT 'FS_EXIT' \
-        EXPORT 'FS_FILEATTRIBUTE' \
-        EXPORT 'FS_FILEINFO' \
-        EXPORT 'FS_FILEIO' \
-        EXPORT 'FS_FILELOCKS' \
-        EXPORT 'FS_FILELOCKSL' \
-        EXPORT 'FS_FINDCLOSE' \
-        EXPORT 'FS_FINDFIRST' \
-        EXPORT 'FS_FINDFROMNAME' \
-        EXPORT 'FS_FINDNEXT' \
-        EXPORT 'FS_FINDNOTIFYCLOSE' \
-        EXPORT 'FS_FINDNOTIFYFIRST' \
-        EXPORT 'FS_FINDNOTIFYNEXT' \
-        EXPORT 'FS_FLUSHBUF' \
-        EXPORT 'FS_FSCTL' \
-        EXPORT 'FS_FSINFO' \
-        EXPORT 'FS_INIT' \
-        EXPORT 'FS_IOCTL' \
-        EXPORT 'FS_MKDIR' \
-        EXPORT 'FS_MOUNT' \
-        EXPORT 'FS_MOVE' \
-        EXPORT 'FS_NEWSIZE' \
-        EXPORT 'FS_NEWSIZEL' \
-        EXPORT 'FS_NMPIPE' \
-        EXPORT 'FS_OPENCREATE' \
-        EXPORT 'FS_OPENPAGEFILE' \
-        EXPORT 'FS_PATHINFO' \
-        EXPORT 'FS_PROCESSNAME' \
-        EXPORT 'FS_READ' \
-        EXPORT 'FS_RMDIR' \
-        EXPORT 'FS_SETSWAP' \
-        EXPORT 'FS_SHUTDOWN' \
-        EXPORT 'FS_VERIFYUNCNAME' \
-        EXPORT 'FS_WRITE'
-# 32-bit entry points.
-VBoxSF_LDFLAGS += \
-        EXPORT 'FS32_CHGFILEPTRL' \
-        EXPORT 'FS32_READ' \
-        EXPORT 'FS32_READFILEATCACHE' \
-        EXPORT 'FS32_RETURNFILECACHE' \
-        EXPORT 'FS32_WRITE'
-else
-VBoxSF_LDFLAGS      := $(addprefix -Zlinker , \
-        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
-            TYPE DATA PRELOAD DYNAMIC)
-#VBoxSF_LDFLAGS      += -s -t -v
+ VBoxSF_LDFLAGS     := \
+        OPTION MODNAME='VBoxSF' \
+        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+        TYPE DATA PRELOAD DYNAMIC
+ #      OPTION DESCRIPTION "'VirtualBox Guest Additions Shared Folder FSD for OS/2.'" - quoting issues
+ # Data exports:
+ VBoxSF_LDFLAGS += \
+        EXPORT 'FS_ATTRIBUTE' \
+        EXPORT 'FS_NAME' \
+        EXPORT 'FS_MPSAFEFLAGS2' \
+        EXPORT 'FS32_ATTRIBUTE'
+ # 16-bit entry points.
+ VBoxSF_LDFLAGS += \
+        EXPORT 'FS_ALLOCATEPAGESPACE' \
+        EXPORT 'FS_ATTACH' \
+        EXPORT 'FS_CANCELLOCKREQUEST' \
+        EXPORT 'FS_CANCELLOCKREQUESTL' \
+        EXPORT 'FS_CHDIR' \
+        EXPORT 'FS_CHGFILEPTR' \
+        EXPORT 'FS_CLOSE' \
+        EXPORT 'FS_COMMIT' \
+        EXPORT 'FS_COPY' \
+        EXPORT 'FS_DELETE' \
+        EXPORT 'FS_DOPAGEIO' \
+        EXPORT 'FS_EXIT' \
+        EXPORT 'FS_FILEATTRIBUTE' \
+        EXPORT 'FS_FILEINFO' \
+        EXPORT 'FS_FILEIO' \
+        EXPORT 'FS_FILELOCKS' \
+        EXPORT 'FS_FILELOCKSL' \
+        EXPORT 'FS_FINDCLOSE' \
+        EXPORT 'FS_FINDFIRST' \
+        EXPORT 'FS_FINDFROMNAME' \
+        EXPORT 'FS_FINDNEXT' \
+        EXPORT 'FS_FINDNOTIFYCLOSE' \
+        EXPORT 'FS_FINDNOTIFYFIRST' \
+        EXPORT 'FS_FINDNOTIFYNEXT' \
+        EXPORT 'FS_FLUSHBUF' \
+        EXPORT 'FS_FSCTL' \
+        EXPORT 'FS_FSINFO' \
+        EXPORT 'FS_INIT' \
+        EXPORT 'FS_IOCTL' \
+        EXPORT 'FS_MKDIR' \
+        EXPORT 'FS_MOUNT' \
+        EXPORT 'FS_MOVE' \
+        EXPORT 'FS_NEWSIZE' \
+        EXPORT 'FS_NEWSIZEL' \
+        EXPORT 'FS_NMPIPE' \
+        EXPORT 'FS_OPENCREATE' \
+        EXPORT 'FS_OPENPAGEFILE' \
+        EXPORT 'FS_PATHINFO' \
+        EXPORT 'FS_PROCESSNAME' \
+        EXPORT 'FS_READ' \
+        EXPORT 'FS_RMDIR' \
+        EXPORT 'FS_SETSWAP' \
+        EXPORT 'FS_SHUTDOWN' \
+        EXPORT 'FS_VERIFYUNCNAME' \
+        EXPORT 'FS_WRITE'
+ # 32-bit entry points.
+ VBoxSF_LDFLAGS += \
+        EXPORT 'FS32_CHGFILEPTRL' \
+        EXPORT 'FS32_READ' \
+        EXPORT 'FS32_READFILEATCACHE' \
+        EXPORT 'FS32_RETURNFILECACHE' \
+        EXPORT 'FS32_WRITE'
+else
+ VBoxSF_LDFLAGS     := $(addprefix -Zlinker , \
+        SEG TYPE CODE PRELOAD DYNAMIC SHARED NONPERMANENT, \
+        TYPE DATA PRELOAD DYNAMIC)
+ #VBoxSF_LDFLAGS      += -s -t -v
 endif
 
@@ -215 +215 @@
 PROGRAMS += VBoxSFUtil
 ifdef VBOX_USE_WATCOM_FOR_OS2
-VBoxSFUtil_TEMPLATE = DUMMY
-VBoxSFUtil_TOOL     = OPENWATCOM
-VBoxSFUtil_ASTOOL   = NASM
-VBoxSFUtil_ASFLAGS  = -f obj -DASM_FORMAT_OMF
-VBoxSFUtil_INCS     = $(PATH_TOOL_OPENWATCOM)/h/os2
-VBoxSFUtil_LDFLAGS  = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
-VBoxSFUtil_DEFS     = $(DEFS) IN_RING3
-else
-VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
+ VBoxSFUtil_TEMPLATE = DUMMY
+ VBoxSFUtil_TOOL    = OPENWATCOM
+ VBoxSFUtil_ASTOOL  = NASM
+ VBoxSFUtil_ASFLAGS = -f obj -DASM_FORMAT_OMF
+ VBoxSFUtil_INCS    = $(PATH_TOOL_OPENWATCOM)/h/os2
+ VBoxSFUtil_LDFLAGS = -bcl=os2v2 #"IMPORT DosGlobalInfo doscalls.217"
+ VBoxSFUtil_DEFS    = $(DEFS) IN_RING3
+else
+ VBoxSFUtil_TEMPLATE = VBoxGuestR3Exe
 endif
 VBoxSFUtil_SOURCES  = \