VirtualBox

Changeset 85977 in vbox for trunk/src


Ignore:
Timestamp:
Sep 1, 2020 11:39:04 AM (4 years ago)
Author:
vboxsync
Message:

bugref:9637. Reverting unintended space to tab changes in a Makefile.

File:
1 edited

Legend:

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

    r85976 r85977  
    4545VBoxClient_INCS += ../x11include/randrproto-1.6.0
    4646VBoxClient_SOURCES = \
    47         main.cpp \
    48         display-svga-x11.cpp \
    49         seamless.cpp \
    50         seamless-x11.cpp \
    51         logging.cpp \
    52         hostversion.cpp
     47        main.cpp \
     48        display-svga-x11.cpp \
     49        seamless.cpp \
     50        seamless-x11.cpp \
     51        logging.cpp \
     52        hostversion.cpp
    5353
    5454VBoxDRMClient_TEMPLATE = NewVBoxGuestR3Exe
     
    6060
    6161VBoxClient_SOURCES.linux = \
    62         chk_stubs.c
     62        chk_stubs.c
    6363VBoxClient_LIBPATH = \
    64         $(VBOX_LIBPATH32_X11)
     64        $(VBOX_LIBPATH32_X11)
    6565VBoxClient_LIBS.freebsd = \
    66         iconv
     66        iconv
    6767VBoxClient_LIBS.linux = \
    68         dl
     68        dl
    6969VBoxClient_LIBS.netbsd = \
    70         crypt
     70        crypt
    7171VBoxClient_LIBS.solaris = \
    72         dl
     72        dl
    7373VBoxClient_LIBS = \
    74         X11 Xt Xext Xmu
     74        X11 Xt Xext Xmu
    7575ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
    7676 VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
     
    8080# XXX: -L comes from the template, but not rpath
    8181VBoxClient_LDFLAGS.netbsd = \
    82         -Wl,-rpath /usr/X11R7/lib
     82        -Wl,-rpath /usr/X11R7/lib
    8383
    8484ifdef VBOX_WITH_DRAG_AND_DROP
     
    8686 VBoxClient_DEFS += VBOX_DND_WITH_XTEST
    8787 VBoxClient_LIBS += \
    88         Xtst
     88        Xtst
    8989 endif
    9090endif
     
    9595ifeq ($(KBUILD_TARGET),linux)
    9696VBoxClient_LDFLAGS.amd64 += \
    97         -Wl,--wrap=memcpy
     97        -Wl,--wrap=memcpy
    9898endif
    9999
     
    104104ifdef VBOX_WITH_DRAG_AND_DROP
    105105VBoxClient_DEFS += \
    106         VBOX_WITH_DRAG_AND_DROP \
    107         $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
     106        VBOX_WITH_DRAG_AND_DROP \
     107        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
    108108VBoxClient_SOURCES += \
    109         draganddrop.cpp
     109        draganddrop.cpp
    110110VBoxClient_LIBS     += \
    111         $(VBOX_LIB_VBGL_R3) \
    112         $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
     111        $(VBOX_LIB_VBGL_R3) \
     112        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
    113113endif
    114114
    115115ifdef VBOX_WITH_SHARED_CLIPBOARD
    116116 VBoxClient_DEFS += \
    117         VBOX_WITH_SHARED_CLIPBOARD \
    118         $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
     117        VBOX_WITH_SHARED_CLIPBOARD \
     118        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
    119119 VBoxClient_SOURCES += \
    120         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
    121         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
    122         clipboard.cpp
     120        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
     121        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
     122        clipboard.cpp
    123123 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    124124  VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_GUEST
    125125  VBoxClient_SOURCES += \
    126         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
    127         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
     126        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
     127        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
    128128  ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
    129129   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_FUSE
    130130   # @todo Make this dynamic loading more generic.
    131131   VBoxClient_SOURCES += \
    132         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
    133         clipboard-fuse.cpp
     132        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
     133        clipboard-fuse.cpp
    134134   # @todo Ditto.
    135135   VBoxClient_INCS    += \
    136         $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
     136        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
    137137  endif
    138138 endif
     
    158158$$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
    159159       $$(tstSeamlessX11-auto_1_STAGE_TARGET)
    160         export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
    161         $(QUIET)$(APPEND) -t "$@" "done"
     160        export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
     161        $(QUIET)$(APPEND) -t "$@" "done"
    162162
    163163  #
Note: See TracChangeset for help on using the changeset viewer.

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