Changeset 6693 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jan 31, 2008 10:22:17 PM (17 years ago)

Author:

vboxsync

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

27767

Message:

Replaced VBOXLNX32GUESTR0 by VBOXGUESTR0, VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 by VBOX_WITH_ADDITION_DRIVERS, RuntimeLnx32GuestR0 by RuntimeW32GuestR0, and VBoxGuestLib[Base]Linux to VBoxGuestR0Lib[Base].

Location:

trunk/src/VBox/Additions/linux

Files:

• module/Makefile.kmk (modified) (2 diffs)
• sharedfolders/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/linux/module/Makefile.kmk

@@ -20 +20 @@
 
 INSTALLS = vboxmod-bin vboxmod-sh
-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
-SYSMODS = vboxadd
+ifdef VBOX_WITH_ADDITION_DRIVERS
+ SYSMODS = vboxadd
 endif
 
@@ -40 +40 @@
 # The module (for syntax checking).
 #
-vboxadd_TEMPLATE = VBOXLNX32GUESTR0
-vboxadd_DEFS     = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
-vboxadd_LIBS     = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
-vboxadd_SOURCES  = vboxmod.c cmc.c hgcmcall.c
+vboxadd_TEMPLATE = VBOXGUESTR0
+vboxadd_NOINST   = 1
+vboxadd_DEFS     = \
+        MODULE IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM \
+        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
+        KBUILD_BASENAME=KBUILD_STR\(vboxadd\)
 vboxadd_INCS     = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
-vboxadd_NOINST   = 1
+vboxadd_SOURCES  = \
+        vboxmod.c \
+        cmc.c \
+        hgcmcall.c
+vboxadd_LIBS     = \
+        $(VBOX_LIB_VBGL_R0BASE) \
+        $(VBOX_LIB_IPRT_GUEST_R0)
 
 include $(PATH_KBUILD)/footer.kmk

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

@@ -19 +19 @@
 include $(PATH_KBUILD)/header.kmk
 
-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
-SYSMODS  = vboxvfs
+ifdef VBOX_WITH_ADDITION_DRIVERS
+ SYSMODS  = vboxvfs
 endif
 PROGRAMS = mountvboxsf
@@ -44 +44 @@
 # The module (for syntax checking).
 #
-vboxvfs_TEMPLATE        = VBOXLNX32GUESTR0
-vboxvfs_DEFS           := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
-                          KBUILD_BASENAME=KBUILD_STR\(vboxadd\) \
-                          MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
-vboxvfs_LIBS            = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
+vboxvfs_TEMPLATE        = VBOXGUESTR0
+vboxvfs_NOINST          = 1
+vboxvfs_CFLAGS          = -fshort-wchar
+vboxvfs_DEFS            = \
+        MODULE IN_RT_R0 VBOXGUEST VBOX_HGCM \
+        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
+        KBUILD_BASENAME=KBUILD_STR\(vboxadd\)
+vboxvfs_INCS            = \
+        ../../common/VBoxGuestLib \
+        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
 vboxvfs_SOURCES         = \
         vfsmod.c \
@@ -54 +59 @@
         dirops.c \
         regops.c
-vboxvfs_NOINST          = 1
-vboxvfs_CFLAGS         += -fshort-wchar
-vboxvfs_INCS           += \
-        ../../common/VBoxGuestLib \
-        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
+vboxvfs_LIBS            = \
+        $(VBOX_LIB_VBGL_R0) \
+        $(VBOX_LIB_IPRT_GUEST_R0)
 
 # detect fc6 2.6.18
@@ -76 +79 @@
 #
 mountvboxsf_TEMPLATE    = VBOXLNX32GUESTR3EXENOCPP
+mountvboxsf_DEFS        = _GNU_SOURCE
 mountvboxsf_SOURCES     = \
         vbsfmount.h \
         mount.vboxsf.c
-mountvboxsf_DEFS        = _GNU_SOURCE