Changeset 6619 in vbox for trunk/src/VBox/Additions/x11/xmouse

Timestamp:

Jan 30, 2008 5:50:24 PM (17 years ago)

Author:

vboxsync

Message:

Use the VBOX_PATH_X11_ variables for locating the X11 headers.

File:

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

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

@@ -41 +41 @@
 vboxmouse_drv_LDFLAGS.release = -S
 vboxmouse_drv_INCS := \
-        ../x11include/4.2/exports/include/X11 \
-        ../x11include/4.2/include \
-        ../x11include/4.2/include/extensions \
-        ../x11include/4.2/programs/Xserver/include \
-        ../x11include/4.2/programs/Xserver/hw/xfree86 \
-        ../x11include/4.2/programs/Xserver/hw/xfree86/common \
-        ../x11include/4.2/programs/Xserver/hw/xfree86/os-support \
-        ../x11include/4.2/programs/Xserver/hw/xfree86/os-support/bus \
-        ../x11include/4.2/programs/Xserver/mi \
+        $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11 \
+        $(VBOX_PATH_X11_XFREE_4_2)/include \
+        $(VBOX_PATH_X11_XFREE_4_2)/include/extensions \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/include \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86 \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/common \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/hw/xfree86/os-support/bus \
+        $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/mi \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_SOURCES  = \
@@ -66 +66 @@
 vboxmouse_drv_70_LDFLAGS = -s
 vboxmouse_drv_70_INCS := \
-        ../x11include/7.0 \
-        ../x11include/7.0/X11 \
-        ../x11include/7.0/xorg \
+        $(VBOX_PATH_X11_XORG_7_0) \
+        $(VBOX_PATH_X11_XORG_7_0)/X11 \
+        $(VBOX_PATH_X11_XORG_7_0)/xorg \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_70_SOURCES  = \
@@ -85 +85 @@
 vboxmouse_drv_71_LDFLAGS = -s
 vboxmouse_drv_71_INCS = \
-        ../x11include/7.1 \
-        ../x11include/7.1/X11 \
-        ../x11include/7.1/xorg \
+        $(VBOX_PATH_X11_XORG_7_1) \
+        $(VBOX_PATH_X11_XORG_7_1)/X11 \
+        $(VBOX_PATH_X11_XORG_7_1)/xorg \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_71_SOURCES  = \
@@ -104 +104 @@
 vboxmouse_drv_14_LDFLAGS = -s
 vboxmouse_drv_14_INCS = \
-        ../x11include/1.4 \
-        ../x11include/1.4/X11 \
-        ../x11include/1.4/xorg \
+        $(VBOX_PATH_X11_XORG_1_4) \
+        $(VBOX_PATH_X11_XORG_1_4)/X11 \
+        $(VBOX_PATH_X11_XORG_1_4)/xorg \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_14_SOURCES  = \
@@ -125 +125 @@
 vboxmouse_drv_DEFS.solaris = __EXTENSIONS__
 vboxmouse_drv_INCS = \
-        ../x11include/7.1 \
-        ../x11include/7.1/X11 \
-        ../x11include/7.1/xorg \
+        $(VBOX_PATH_X11_XORG_7_1) \
+        $(VBOX_PATH_X11_XORG_7_1)/X11 \
+        $(VBOX_PATH_X11_XORG_7_1)/xorg \
         $(PATH_SUB_CURRENT)
 vboxmouse_drv_SOURCES  = \