Changeset 43275 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Sep 10, 2012 7:30:58 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80686

Message:

Additions/x11: clean up header dependencies.

File:

• trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk (modified) (10 diffs)

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

@@ -99 +99 @@
 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_13_INCS := \
-        $(VBOX_PATH_X11_XORG_1_3) \
         $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0 \
@@ -114 +113 @@
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
-        $(VBOX_PATH_X11_XORG_1_4) \
-        $(VBOX_PATH_X11_XORG_1_4)/xorg \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.4.2 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_14_SOURCES = \
@@ -128 +128 @@
 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_15_INCS := \
-        $(VBOX_PATH_X11_XORG_1_5) \
         $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 \
         $(PATH_SUB_CURRENT)
@@ -143 +143 @@
 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_16_INCS := \
-        $(VBOX_PATH_X11_XORG_1_6) \
         $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_16_SOURCES = \
@@ -166 +165 @@
         $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
@@ -187 +185 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
@@ -207 +204 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
@@ -227 +223 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
@@ -243 +238 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
@@ -259 +253 @@
         $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
-        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)