Changeset 36293 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 16, 2011 5:13:15 PM (14 years ago)

Author:

vboxsync

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

70596

Message:

Linux additions / host drivers: fixed compilation with DKMS

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/linux/Makefile (modified) (2 diffs)
• linux/drm/Makefile.module (modified) (2 diffs)
• linux/sharedfolders/Makefile.module (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -232 +232 @@
  export INCL
 endif
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxguest),)
+ MANGLING := $(KBUILD_EXTMOD)/vboxguest/include/VBox/VBoxGuestMangling.h
+else
+ MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
+endif
 KFLAGS   := -D__KERNEL__ -DMODULE \
         -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST -DIN_GUEST_R0 \
@@ -274 +279 @@
 
 # build defs
-EXTRA_CFLAGS += -include $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h  $(INCL) $(KFLAGS) $(KDEBUG)
+EXTRA_CFLAGS += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
 
 all: $(MODULE)

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

@@ -153 +153 @@
  export INCL
 endif
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxvideo),)
+ MANGLING := $(KBUILD_EXTMOD)/vboxvideo/include/VBox/VBoxGuestMangling.h
+else
+ MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
+endif
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
             -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
@@ -215 +220 @@
 
 # build defs
-EXTRA_CFLAGS += -include $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h $(INCL) $(KFLAGS) $(KDEBUG)
+EXTRA_CFLAGS += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
 
 all: $(MODULE)

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

@@ -177 +177 @@
  export INCL
 endif
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxsf),)
+ MANGLING := $(KBUILD_EXTMOD)/vboxsf/include/VBox/VBoxGuestMangling.h
+else
+ MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
+endif
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
             -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0
@@ -238 +243 @@
 
 # build defs
-EXTRA_CFLAGS += -include $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h  $(INCL) $(KFLAGS) $(KDEBUG)
+EXTRA_CFLAGS += -include $(MANGLING) $(INCL) $(KFLAGS) $(KDEBUG)
 
 all: $(MODULE)