VirtualBox

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r98196 r98416  
    3131# Use header files from our tree for randr and xinerama. and don't link but rather dlopen libXrand
    3232# This is mostly because the GA build boxes can have a very old xrandr lib, so instead of linking we dlopen.
    33 VBOX_WITH_DISTRO_XRAND_XINERAMA=
     33VBOX_WITH_DISTRO_XRAND_XINERAMA =
    3434
    3535# We don't yet have a seamless mode compilation flag, so define it here unconditionally.
    36 VBOX_WITH_SEAMLESS:=1
     36VBOX_WITH_SEAMLESS := 1
    3737
    3838#
     
    7373endif
    7474VBoxDRMClient_SOURCES = \
    75     display-drm.cpp \
    76     display-ipc.cpp \
    77     logging.cpp
     75        display-drm.cpp \
     76        display-ipc.cpp \
     77        logging.cpp
    7878
    7979
     
    105105  VBoxClient_DEFS += VBOX_DND_WITH_XTEST
    106106  VBoxClient_LIBS += \
    107         Xtst
     107        Xtst
    108108 endif
    109109endif
     
    114114ifeq ($(KBUILD_TARGET),linux)
    115115 VBoxClient_LDFLAGS.amd64 += \
    116         -Wl,--wrap=memcpy
     116        -Wl,--wrap=memcpy
    117117endif
    118118
     
    120120 VBoxClient_DEFS    += VBOX_WITH_GUEST_PROPS
    121121 VBoxClient_SOURCES += \
    122         hostversion.cpp
     122        hostversion.cpp
    123123 VBoxDRMClient_DEFS += VBOX_WITH_GUEST_PROPS
    124124endif
     
    126126ifdef VBOX_WITH_DRAG_AND_DROP
    127127 VBoxClient_DEFS     += \
    128         VBOX_WITH_DRAG_AND_DROP \
    129         $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
     128        VBOX_WITH_DRAG_AND_DROP \
     129        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
    130130 VBoxClient_SOURCES  += \
    131         draganddrop.cpp
     131        draganddrop.cpp
    132132 VBoxClient_LIBS     += \
    133         $(VBOX_LIB_VBGL_R3) \
    134         $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
     133        $(VBOX_LIB_VBGL_R3) \
     134        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
    135135endif
    136136
     
    138138 VBoxClient_DEFS    += VBOX_WITH_SEAMLESS
    139139 VBoxClient_SOURCES += \
    140         seamless.cpp \
    141         seamless-x11.cpp
     140        seamless.cpp \
     141        seamless-x11.cpp
    142142endif
    143143
     
    154154        display-helper-generic.cpp
    155155
    156 ### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk
     156 ### include $(PATH_SUB_CURRENT)/helpers/Makefile.kmk
    157157endif
    158158
     
    160160 VBoxClient_DEFS     += VBOX_WITH_SHARED_CLIPBOARD
    161161 VBoxClient_SOURCES  += \
    162         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
    163         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
    164         clipboard.cpp
     162        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
     163        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
     164        clipboard.cpp
    165165 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    166166  VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS VBOX_WITH_SHARED_CLIPBOARD_GUEST
    167167  VBoxClient_SOURCES += \
    168         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
    169         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
     168        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
     169        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
    170170  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
    171171   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS_HTTP
    172172   VBoxClient_SOURCES += \
    173         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
     173        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
    174174  endif
    175175  ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
     
    177177   # @todo Make this dynamic loading more generic.
    178178   VBoxClient_SOURCES += \
    179         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
    180         clipboard-fuse.cpp
     179        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
     180        clipboard-fuse.cpp
    181181   # @todo Ditto.
    182182   VBoxClient_INCS    += \
    183         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
     183        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
    184184  endif
    185185 endif
     
    189189 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    190190
    191 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
    192 # to automatically run the unit test at build time.
    193 #       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
     191  # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
     192  # to automatically run the unit test at build time.
     193  #       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
    194194
    195195  PROGRAMS += tstSeamlessX11-auto
    196196  tstSeamlessX11-auto_TEMPLATE = VBoxR3TstExe
    197197  tstSeamlessX11-auto_SOURCES = \
    198           testcase/tstSeamlessX11-auto.cpp \
    199           seamless-x11.cpp
     198        testcase/tstSeamlessX11-auto.cpp \
     199        seamless-x11.cpp
    200200  tstSeamlessX11-auto_DEFS = TESTCASE
    201201  tstSeamlessX11-auto_LIBS = \
    202           $(LIB_RUNTIME)
     202        $(LIB_RUNTIME)
    203203
    204204  TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
    205 $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
    206        $$(tstSeamlessX11-auto_1_STAGE_TARGET)
     205  $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
     206                $$(tstSeamlessX11-auto_1_STAGE_TARGET)
    207207        export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
    208208        $(QUIET)$(APPEND) -t "$@" "done"
     
    216216  tstSeamlessX11_TEMPLATE = VBoxR3TstExe
    217217  tstSeamlessX11_SOURCES = \
    218           testcase/tstSeamlessX11.cpp \
    219           seamless.cpp \
    220           seamless-x11.cpp
     218        testcase/tstSeamlessX11.cpp \
     219        seamless.cpp \
     220        seamless-x11.cpp
    221221  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    222222   tstSeamlessX11_DEFS  += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
     
    225225  endif
    226226  tstSeamlessX11_LIBPATH = \
    227           $(VBOX_LIBPATH_X11)
     227        $(VBOX_LIBPATH_X11)
    228228  tstSeamlessX11_LIBS = \
    229           $(LIB_RUNTIME) \
    230           Xext \
    231           Xmu \
    232           X11
     229        $(LIB_RUNTIME) \
     230        Xext \
     231        Xmu \
     232        X11
    233233 endif
    234234endif
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette