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

Timestamp:

Jul 7, 2009 3:19:17 PM (16 years ago)

Author:

vboxsync

Message:

linux/vboxvfs: made it build and load when using vboxguest.

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• Makefile.kmk (modified) (4 diffs)
• Makefile.module (modified) (4 diffs)

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

@@ -59 +59 @@
 vboxvfs_DEFS            = \
         MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
-        KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxadd\)
+        $(if-expr defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX),VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX,) \
+        KBUILD_MODNAME=KBUILD_STR\(vboxvfs\) \
+        KBUILD_BASENAME=KBUILD_STR\(vboxvfs\)
 vboxvfs_INCS            = \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
@@ -70 +71 @@
         regops.c
 vboxvfs_LIBS            = \
-        $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0)
+        $(VBOX_LIB_VBGL_R0)
 
 # detect fc6 2.6.18
@@ -101 +101 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvfs;g" < $< > $@
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvfs;g" --output $@ $<
         $(QUIET)chmod 0755 $@
 
@@ -109 +109 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
+                $(if-expr defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX), -e 's/vboxadd/vboxguest/',) \
+                --output $@ $<
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -75 +75 @@
         VMMDev.o \
         HGCM.o \
-        VBoxCalls.o \
+        VBoxCalls.o
+ifndef VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
+OBJS  += \
         r0drv/alloc-r0drv.o \
         r0drv/memobj-r0drv.o \
@@ -83 +85 @@
         r0drv/linux/process-r0drv-linux.o \
         r0drv/linux/semevent-r0drv-linux.o \
-        r0drv/linux/semfastmutex-r0drv-linux.o \
+        r0drv/linux/semfastmutex-r0drv-linux.o
+endif
+ifeq ($(BUILD_TARGET_ARCH),x86)
+OBJS  += \
         divdi3.o \
         moddi3.o \
@@ -89 +94 @@
         umoddi3.o \
         qdivrem.o
-## @todo Use IPRT in vboxguest, the *div*/*mod* bits are x86 only.
+endif
 
 EXTRA_CFLAGS = -fshort-wchar
@@ -193 +198 @@
 endif
 ifeq ($(BUILD_TYPE),debug)
-KFLAGS   += -DDEBUG
+ KFLAGS  += -DDEBUG
+endif
+ifdef VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
+ KFLAGS  += -DVBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
 endif