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

Timestamp:

Aug 31, 2009 2:18:44 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11: reverted r51655 for now

Location:

trunk/src/VBox/Additions/x11

Files:

• vboxmouse/Makefile.kmk (modified) (2 diffs)
• vboxvideo/Makefile.kmk (modified) (2 diffs)

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

@@ -144 +144 @@
         vboxmouse_15.c
 
-
-#
-# vboxmouse_drv_17
-#
-DLLS += vboxmouse_drv_17
-vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-vboxmouse_drv_17_INCS := \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-        $(PATH_SUB_CURRENT)
-vboxmouse_drv_17_SOURCES = \
-        vboxmouse_15.c
-
-
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
@@ -213 +197 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
-     TESTING  += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
-     OTHERS += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
-$$(PATH_vboxmouse_drv_17)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
-        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-            $(INSTARGET_vboxmouse_drv_17) $(OUR_PATH_VBOXMOUSE)/undefined_15
-        $(QUIET)$(APPEND) -t "$@" "done"
-
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))

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

@@ -238 +238 @@
         vboxvideo_dri.c
 
-#
-# vboxvideo_drv_17
-#
-DLLS += vboxvideo_drv_17
-vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
-vboxvideo_drv_17_INCS = \
-        $(VBOX_PATH_X11_ROOT)/glproto-1.4.9 \
-        $(VBOX_PATH_X11_ROOT)/libdrm-2.4.5 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-        $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-vboxvideo_drv_17_SOURCES  = \
-        vboxvideo_13.c \
-        vboxutils.c \
-        vboxvideo_dri.c
-
-
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
@@ -319 +298 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
-     TESTING  += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
-     OTHERS += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
-$$(PATH_vboxvideo_drv_17)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
-        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
-            $(INSTARGET_vboxvideo_drv_17) $(OUR_PATH_VBOXVIDEO)/undefined_13
-        $(QUIET)$(APPEND) -t "$@" "done"
-
     endif # ! VBOX_ONLY_SDK
    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))