Changeset 6670 in vbox for trunk/src

Timestamp:

Jan 31, 2008 5:21:04 PM (17 years ago)

Author:

vboxsync

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

27741

Message:

Use the VBOXGUESTR3XF86MOD and VBOXGUESTR3XORGMOD templates.

File:

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

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

@@ -19 +19 @@
 include $(PATH_KBUILD)/header.kmk
 
-if1of ($(BUILD_TARGET),linux l4)
-## @todo figure out vboxvideo_drv on solaris (seems to be a kernel module)
-SYSMODS  = vboxvideo_drv
-# for BUILD_TARGET=l4
-SUFF_DLL = .so
+ifeq ($(BUILD_TARGET),l4) ## @todo Frank, check if we can remove this now.
+ SUFF_DLL = .so
 endif
-DLLS     = vboxvideo_drv_70 vboxvideo_drv_71 vboxvideo_drv_13 vboxvideo_drv_14
 
 #
@@ -31 +27 @@
 #
 if1of ($(BUILD_TARGET),linux l4)
-vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
-vboxvideo_drv_SYSSUFF = .o
-vboxvideo_drv_DEFS = \
-        linux __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
+ SYSMODS += vboxvideo_drv
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+ vboxvideo_drv_DEFS = \
+        __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
         _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
         XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
@@ -41 +38 @@
         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
         IN_MODULE XFree86Module
-vboxvideo_drv_CFLAGS.linux := \
-        -fno-merge-constants -Wno-conversion -Wno-unused-parameter \
-        $(VBOX_GCC_Wno-variadic-macros)
-vboxvideo_drv_LDFLAGS.release = -S
-ARGB_CURSORS=1
-ifdef ARGB_CURSORS
-vboxvideo_drv_INCS = \
+ vboxvideo_drv_CFLAGS.linux := \
+        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros)
+ ARGB_CURSORS=1
+ ifdef ARGB_CURSORS
+  vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \
         $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
@@ -74 +69 @@
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/render \
         $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
-else
-vboxvideo_drv_INCS = \
+ else
+  vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_2)/exports/include/X11 \
         $(VBOX_PATH_X11_XFREE_4_2)/include \
@@ -102 +97 @@
         $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/render \
         $(VBOX_PATH_X11_XFREE_4_2)/programs/Xserver/Xext
-endif
-vboxvideo_drv_SOURCES = \
+ endif
+ vboxvideo_drv_SOURCES = \
         vboxvideo_68.c \
         vboxutils-new.c
-vboxvideo_drv_LIBS = \
-        $(VBOX_LIB_VBGL_R3_XFREE86)
 endif   # target linux, l4
 
 
 #
-# vboxvideo_drv_70 
+# vboxvideo_drv_70
 #
-if1of ($(BUILD_TARGET),linux l4)
- vboxvideo_drv_70_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxvideo_drv_70_CFLAGS.linux := \
-        -Wno-conversion -Wno-unused-parameter \
-        $(VBOX_GCC_Wno-variadic-macros) -std=c99
- vboxvideo_drv_70_LDFLAGS = -s
-else
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3DLL
- vboxvideo_drv_70_CFLAGS   = -std=c99
+# Remark: The other X.org drivers below are derived from this one. So, to make
+#         that as simple as possible we do ifeq/if1of test here and extends the
+#         base keywords instead of using .solaris or .linux.
+#         Also it is *important* to use := and not = when deriving a properity.
+#
+DLLS += vboxvideo_drv_70
+vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_70_CFLAGS := -std=c99 # why? put in template?
+if1of ($(BUILD_TARGET), l4 linux)
+ vboxvideo_drv_70_CFLAGS += \
+        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
 endif
-## @todo PIC should be defined in the template on linux
 vboxvideo_drv_70_DEFS := \
-        XFree86Server IN_MODULE XFree86Module XFree86LOADER \
-        XORG_7X PIC RENDER=1
-vboxvideo_drv_70_DEFS.solaris = _XPG6
+        XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1
+ifeq ($(BUILD_TARGET),solaris) # don't use .solaris or anythinger here.
+ vboxvideo_drv_70_DEFS += _XPG6
+endif
 vboxvideo_drv_70_INCS = \
         $(VBOX_PATH_X11_XORG_7_0) \
@@ -136 +131 @@
         vboxvideo_70.c \
         vboxutils-new.c
-vboxvideo_drv_70_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)
 
 
@@ -145 +136 @@
 # vboxvideo_drv_71
 #
-if1of ($(BUILD_TARGET),linux l4)
- vboxvideo_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxvideo_drv_71_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
- vboxvideo_drv_71_LDFLAGS = -s
-else
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3DLL
- vboxvideo_drv_71_CFLAGS   = $(vboxvideo_drv_70_CFLAGS)
-endif
+DLLS += vboxvideo_drv_71
+vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
-vboxvideo_drv_71_DEFS.solaris = $(vboxvideo_drv_70_DEFS.solaris)
 vboxvideo_drv_71_INCS = \
         $(VBOX_PATH_X11_XORG_7_1) \
@@ -162 +147 @@
         vboxvideo_70.c \
         vboxutils-new.c
-vboxvideo_drv_71_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)
 
 
@@ -171 +152 @@
 # vboxvideo_drv_13
 #
-if1of ($(BUILD_TARGET),linux l4)
- vboxvideo_drv_13_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxvideo_drv_13_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
- vboxvideo_drv_13_LDFLAGS = -s
-else
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3DLL
- vboxvideo_drv_13_CFLAGS   = $(vboxvideo_drv_70_CFLAGS)
-endif
+DLLS += vboxvideo_drv_13
+vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS)
-vboxvideo_drv_13_DEFS.solaris = $(vboxvideo_drv_70_DEFS.solaris)
 vboxvideo_drv_13_INCS = \
         $(VBOX_PATH_X11_XORG_1_3) \
         $(VBOX_PATH_X11_XORG_1_3)/X11 \
         $(VBOX_PATH_X11_XORG_1_3)/xorg
-vboxvideo_drv_13_SOURCES  = \
+vboxvideo_drv_13_SOURCES = \
         vboxvideo_13.c \
         vboxutils-new.c
-vboxvideo_drv_13_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)
 
 
@@ -197 +168 @@
 # vboxvideo_drv_14
 #
-if1of ($(BUILD_TARGET),linux l4)
- vboxvideo_drv_14_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
- vboxvideo_drv_14_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
- vboxvideo_drv_14_LDFLAGS = -s
-else
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3DLL
- vboxvideo_drv_14_CFLAGS   = $(vboxvideo_drv_70_CFLAGS)
-endif
+# This uses the same code (vboxvideo_13.c) as 1.3, but is built
+# for 1.4 as well in case there should be any relevant header changes.
+#
+DLLS += vboxvideo_drv_14
+vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
-vboxvideo_drv_14_DEFS.solaris = $(vboxvideo_drv_70_DEFS.solaris)
 vboxvideo_drv_14_INCS = \
         $(VBOX_PATH_X11_XORG_1_4) \
         $(VBOX_PATH_X11_XORG_1_4)/X11 \
         $(VBOX_PATH_X11_XORG_1_4)/xorg
-# The actual source has not changed from the 1.3 driver, but the headers
-# have.  To be safe, build the driver for 1.4 separately.
 vboxvideo_drv_14_SOURCES  = \
         vboxvideo_13.c \
         vboxutils-new.c
-vboxvideo_drv_14_LIBS = \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
-        $(VBOX_LIB_IPRT_GUEST_R3_MINI) \
-        $(VBOX_LIB_VBGL_R3_SHARED)