Changeset 6665 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jan 31, 2008 3:53:31 PM (17 years ago)

Author:

vboxsync

Message:

cosmetics.

File:

• trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk (modified) (11 diffs)

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

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the VBox Linux Additions X.org mouse driver.
+# Makefile for the VBox Additions XFree86 and X.org mouse drivers.
 #
 
@@ -19 +19 @@
 include $(PATH_KBUILD)/header.kmk
 
-if1of ($(BUILD_TARGET),linux l4)
-## @todo figure out vboxmouse_drv on solaris (seems to be a kernel module)
- SYSMODS  = vboxmouse_drv
-# for BUILD_TARGET=l4
+ifeq ($(BUILD_TARGET),l4)
+ # l4 cross build hack. Do we *really* need this now with the additions build box?
  SUFF_DLL = .so
 endif
-DLLS     = vboxmouse_drv_70 vboxmouse_drv_71 vboxmouse_drv_14
+
 
 #
@@ -31 +29 @@
 #
 if1of ($(BUILD_TARGET),linux l4)
+ SYSMODS += vboxmouse_drv
  vboxmouse_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
  vboxmouse_drv_DEFS  = linux
@@ -55 +54 @@
         $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/mi \
         $(PATH_SUB_CURRENT)
- vboxmouse_drv_SOURCES  = \
+ vboxmouse_drv_SOURCES = \
         mouse.c \
         pnp.c \
@@ -67 +66 @@
 # vboxmouse_drv_70
 #
+DLLS += vboxmouse_drv_70
 if1of ($(BUILD_TARGET),linux l4)
  vboxmouse_drv_70_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
+ ## @todo Remove PIC from DEFS.
 else
  vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3DLL
 endif
-## @todo PIC should be defined in the template on linux
+if1of ($(BUILD_TARGET),linux l4)
+ vboxmouse_drv_70_CFLAGS = -std=c99
+ vboxmouse_drv_70_LDFLAGS = -s
+endif
 vboxmouse_drv_70_DEFS = \
         XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT \
         XORG_7X PIC
-if1of ($(BUILD_TARGET),linux l4)
- vboxmouse_drv_70_CFLAGS   = -std=c99
- vboxmouse_drv_70_LDFLAGS  = -s
-endif
 vboxmouse_drv_70_INCS := \
         $(VBOX_PATH_X11_XORG_7_0) \
@@ -85 +85 @@
         $(VBOX_PATH_X11_XORG_7_0)/xorg \
         $(PATH_SUB_CURRENT)
-vboxmouse_drv_70_SOURCES  = \
+vboxmouse_drv_70_SOURCES = \
         xorg70/mouse.c \
         xorg70/pnp.c \
@@ -98 +98 @@
 # vboxmouse_drv_71
 #
+DLLS += vboxmouse_drv_71
 if1of ($(BUILD_TARGET),linux l4)
  vboxmouse_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxmouse_drv_71_CFLAGS   = -std=c99
- vboxmouse_drv_71_LDFLAGS  = -s
 else
  vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3DLL
+endif
+if1of ($(BUILD_TARGET),linux l4)
+ vboxmouse_drv_71_CFLAGS = -std=c99
+ vboxmouse_drv_71_LDFLAGS = -s
 endif
 vboxmouse_drv_71_DEFS = $(vboxmouse_drv_70_DEFS)
@@ -111 +114 @@
         $(VBOX_PATH_X11_XORG_7_1)/xorg \
         $(PATH_SUB_CURRENT)
-vboxmouse_drv_71_SOURCES  = \
+vboxmouse_drv_71_SOURCES = \
         xorg71/mouse.c \
         xorg71/pnp.c \
@@ -124 +127 @@
 # vboxmouse_drv_14
 #
+DLLS += vboxmouse_drv_14
 if1of ($(BUILD_TARGET),linux l4)
  vboxmouse_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxmouse_drv_14_CFLAGS   = -std=c99
- vboxmouse_drv_14_LDFLAGS  = -s
 else
  vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3DLL
+endif
+if1of ($(BUILD_TARGET),linux l4)
+ vboxmouse_drv_14_CFLAGS = -std=c99
+ vboxmouse_drv_14_LDFLAGS = -s
 endif
 vboxmouse_drv_14_DEFS = $(vboxmouse_drv_70_DEFS)
@@ -137 +143 @@
         $(VBOX_PATH_X11_XORG_1_4)/xorg \
         $(PATH_SUB_CURRENT)
-vboxmouse_drv_14_SOURCES  = \
+vboxmouse_drv_14_SOURCES = \
         xorg14/mouse.c \
         xorg14/pnp.c \
@@ -146 +152 @@
         $(VBOX_LIB_VBGL_R3_SHARED)
 
+
 include $(PATH_KBUILD)/footer.kmk