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

Timestamp:

Sep 11, 2012 7:33:38 AM (13 years ago)

Author:

vboxsync

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

80689

Message:

Additions/x11/vboxmouse: header file dependency fixes.

File:

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

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

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+vboxmouse_xorg_INCS = \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
+        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
 
 #
@@ -99 +105 @@
 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_13_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0 \
         $(PATH_SUB_CURRENT)
@@ -113 +119 @@
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.4.2 \
         $(PATH_SUB_CURRENT)
@@ -128 +133 @@
 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_15_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 \
         $(PATH_SUB_CURRENT)
@@ -143 +147 @@
 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_16_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.4.4 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
         $(PATH_SUB_CURRENT)
@@ -161 +164 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_17_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_17_SOURCES = \
@@ -180 +179 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_18_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_18_SOURCES = \
@@ -199 +194 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_19_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_19_SOURCES = \
@@ -218 +209 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_110_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_110_SOURCES = \
@@ -233 +220 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_111_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_111_SOURCES = \
@@ -248 +231 @@
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_112_INCS := \
-        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+    $(vboxmouse_xorg_INCS) \
         $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
-        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_112_SOURCES = \