Changeset 72152 in vbox for trunk/src/VBox

Timestamp:

May 8, 2018 6:17:30 AM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: clean up the Make file and remove unneeded defines.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -32 +32 @@
 VBoxClient_INCS = $(VBOX_GRAPHICS_INCS)
 VBoxClient_SOURCES = \
-        main.cpp
-VBoxClient_SOURCES += \
+        main.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp \
         clipboard.cpp \
         display-svga.cpp \
-        display-svga-x11.cpp
+        display-svga-x11.cpp \
+        seamless.cpp \
+        seamless-x11.cpp \
+        display.cpp \
+        hostversion.cpp \
+        check3d.cpp
 VBoxClient_SOURCES.linux = \
         chk_stubs.c
@@ -50 +54 @@
         dl
 VBoxClient_LIBS = \
-        X11 \
-        Xrandr \
-        Xt
+        X11 Xrandr Xt Xext Xmu
 
 # XXX: -L comes from the template, but not rpath
@@ -79 +81 @@
 endif
 
-ifdef VBOX_X11_SEAMLESS_GUEST
- VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
- VBoxClient_SOURCES += \
-        seamless.cpp \
-        seamless-x11.cpp \
-        display.cpp \
-        hostversion.cpp \
-        check3d.cpp
- VBoxClient_LIBS += \
-        Xext Xmu
-endif
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
@@ -103 +94 @@
 endif
 
-ifdef VBOX_X11_SEAMLESS_GUEST
- if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
 
 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
@@ -111 +101 @@
 #       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
 
-   PROGRAMS += tstSeamlessX11-auto
-   tstSeamlessX11-auto_TEMPLATE = VBOXR3TSTEXE
-   tstSeamlessX11-auto_SOURCES = \
-           testcase/tstSeamlessX11-auto.cpp \
-           seamless-x11.cpp
-   tstSeamlessX11-auto_DEFS = TESTCASE
-   tstSeamlessX11-auto_LIBS = \
-           $(LIB_RUNTIME)
+  PROGRAMS += tstSeamlessX11-auto
+  tstSeamlessX11-auto_TEMPLATE = VBOXR3TSTEXE
+  tstSeamlessX11-auto_SOURCES = \
+          testcase/tstSeamlessX11-auto.cpp \
+          seamless-x11.cpp
+  tstSeamlessX11-auto_DEFS = TESTCASE
+  tstSeamlessX11-auto_LIBS = \
+          $(LIB_RUNTIME)
 
-   TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
+  TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
 $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
-        $$(tstSeamlessX11-auto_1_STAGE_TARGET)
+       $$(tstSeamlessX11-auto_1_STAGE_TARGET)
         export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
         $(QUIET)$(APPEND) -t "$@" "done"
 
-   #
-   # Additional testcase designed to be run manually, which initiates and starts the Linux
-   # guest client part of the seamless additions in the host, faking seamless events from
-   # the host and writing information about guest events to standard output.
-   #
-   PROGRAMS += tstSeamlessX11
-   tstSeamlessX11_TEMPLATE = VBOXR3TSTEXE
-   tstSeamlessX11_SOURCES = \
-           testcase/tstSeamlessX11.cpp \
-           seamless.cpp \
-           seamless-x11.cpp
-   tstSeamlessX11_LIBPATH = \
-           $(VBOX_LIBPATH_X11)
-   tstSeamlessX11_LIBS = \
-           $(LIB_RUNTIME) \
-           Xext \
-           Xmu \
-           X11
-  endif
+  #
+  # Additional testcase designed to be run manually, which initiates and starts the Linux
+  # guest client part of the seamless additions in the host, faking seamless events from
+  # the host and writing information about guest events to standard output.
+  #
+  PROGRAMS += tstSeamlessX11
+  tstSeamlessX11_TEMPLATE = VBOXR3TSTEXE
+  tstSeamlessX11_SOURCES = \
+          testcase/tstSeamlessX11.cpp \
+          seamless.cpp \
+          seamless-x11.cpp
+  tstSeamlessX11_LIBPATH = \
+          $(VBOX_LIBPATH_X11)
+  tstSeamlessX11_LIBS = \
+          $(LIB_RUNTIME) \
+          Xext \
+          Xmu \
+          X11
  endif
 endif