Changeset 42470 in vbox

Timestamp:

Jul 31, 2012 6:59:12 AM (12 years ago)

Author:

vboxsync

Message:

Additions/solaris/installer: do not build and pack the X.Org vboxmouse driver on Solaris.

Location:

trunk/src/VBox/Additions

Files:

• solaris/Makefile.kmk (modified) (1 diff)
• x11/Makefile.kmk (modified) (1 diff)
• x11/vboxmouse/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -186 +186 @@
 
 SOLARIS_ADD_XORG_DRIVERS = \
-        vboxmouse_drv_13.so \
-        vboxmouse_drv_14.so \
-        vboxmouse_drv_15.so \
-        vboxmouse_drv_16.so \
-        vboxmouse_drv_17.so \
-        vboxmouse_drv_18.so \
-        vboxmouse_drv_19.so \
-        vboxmouse_drv_110.so \
-        vboxmouse_drv_111.so \
-        vboxmouse_drv_112.so \
-        vboxmouse_drv_70.so \
-        vboxmouse_drv_71.so \
         vboxvideo_drv_13.so \
         vboxvideo_drv_14.so \

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

@@ -22 +22 @@
  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
  include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
- include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ ifneq ($(KBUILD_TARGET), solaris)
+  include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ endif
  include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
 endif

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

@@ -68 +68 @@
 vboxmouse_drv_70_DEFS = \
         XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxmouse_drv_70_DEFS += _XPG6 __EXTENSIONS__
-endif
 vboxmouse_drv_70_INCS := \
         $(VBOX_PATH_X11_XORG_7_0) \
@@ -274 +271 @@
 ifdef VBOX_WITH_TESTCASES
 # ifndef VBOX_ONLY_ADDITIONS
-  if1of ($(KBUILD_TARGET),linux solaris)
+  ifeq ($(KBUILD_TARGET),linux)
    ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
     ifndef VBOX_ONLY_SDK
@@ -391 +388 @@
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
-  endif # 1of ($(KBUILD_TARGET),linux solaris)
+  endif # eq ($(KBUILD_TARGET),linux)
 # endif # ! VBOX_ONLY_ADDITIONS
 endif # VBOX_WITH_TESTCASES