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

Timestamp:

Jan 31, 2008 4:34:11 PM (17 years ago)

Author:

vboxsync

Message:

Use the VBOXGUESTR3XF86MOD and VBOXGUESTR3XORGMOD templates.

File:

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

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

@@ -31 +31 @@
 if1of ($(BUILD_TARGET),linux l4)
  SYSMODS += vboxmouse_drv
- vboxmouse_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
- vboxmouse_drv_DEFS  = linux
+ vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxmouse_drv_DEFS.linux = linux
  vboxmouse_drv_DEFS += \
         __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
@@ -41 +41 @@
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
         IN_MODULE XFree86Module PNP_MOUSE
- vboxmouse_drv_CFLAGS  = -fno-merge-constants -std=c99
- vboxmouse_drv_SYSSUFF = .o
- vboxmouse_drv_LDFLAGS.release = -S
  vboxmouse_drv_INCS := \
         $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11 \
@@ -59 +56 @@
         pnp.c \
         VBoxUtils.c
- vboxmouse_drv_LIBS = \
-        $(VBOX_LIB_VBGL_R3_XFREE86)
 endif
 
@@ -68 +63 @@
 #
 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
-if1of ($(BUILD_TARGET),linux l4)
- vboxmouse_drv_70_CFLAGS = -std=c99
- vboxmouse_drv_70_LDFLAGS = -s
-endif
+vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_70_DEFS = \
-        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT \
-        XORG_7X PIC
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
 vboxmouse_drv_70_INCS := \
         $(VBOX_PATH_X11_XORG_7_0) \
@@ -90 +75 @@
         xorg70/pnp.c \
         VBoxUtils.c
-vboxmouse_drv_70_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)
 
 
@@ -100 +81 @@
 #
 DLLS += vboxmouse_drv_71
-if1of ($(BUILD_TARGET),linux l4)
- vboxmouse_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
-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)
+vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
 vboxmouse_drv_71_INCS = \
         $(VBOX_PATH_X11_XORG_7_1) \
@@ -119 +92 @@
         xorg71/pnp.c \
         VBoxUtils.c
-vboxmouse_drv_71_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)
 
 
@@ -129 +98 @@
 #
 DLLS += vboxmouse_drv_14
-if1of ($(BUILD_TARGET),linux l4)
- vboxmouse_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
-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)
+vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS)
 vboxmouse_drv_14_INCS = \
         $(VBOX_PATH_X11_XORG_1_4) \
@@ -148 +109 @@
         xorg14/pnp.c \
         VBoxUtils.c
-vboxmouse_drv_14_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)