Changeset 77394 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Feb 20, 2019 4:27:55 PM (6 years ago)

Author:

vboxsync

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

128945

Message:

More linux kernel module Makefile cleansup.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -1 @@
-#
+# $Id$
+## @file
 # Makefile for the VirtualBox Linux Host Network Filter Driver.
 #
@@ -24 +25 @@
 #
 
-# Linux kbuild sets this to our source directory if we are called from
-# there
+# Find the directory of this makefile.
+VBOXNETFLT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+
+# Linux kbuild sets this to our source directory if we are called from there
 obj ?= $(CURDIR)
 include $(obj)/Makefile-header.gmk
@@ -36 +39 @@
         SUPR0IdcClientComponent.o \
         linux/SUPR0IdcClient-linux.o
-
 ifeq ($(BUILD_TARGET_ARCH),x86)
-MOD_OBJS += math/gcc/divdi3.o \
+MOD_OBJS += \
+        math/gcc/divdi3.o \
         math/gcc/moddi3.o \
         math/gcc/qdivrem.o \
         math/gcc/udivdi3.o \
         math/gcc/udivmoddi4.o \
-        math/gcc/divdi3.o \
+        math/gcc/divdi3.o \
         math/gcc/umoddi3.o
 endif
-
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
-MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-        -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
-        -Wno-declaration-after-statement
+MOD_INCL = \
+        -I$(VBOXNETFLT_DIR) \
+        -I$(VBOXNETFLT_DIR)include \
+        -I$(VBOXNETFLT_DIR)r0drv/linux
+MOD_DEFS = \
+        -DRT_OS_LINUX \
+        -DIN_RING0 \
+        -DIN_RT_R0 \
+        -DIN_SUP_R0 \
+        -DVBOX \
+        -DRT_WITH_VBOX \
+        -DVBOX_WITH_HARDENING \
+        -DVBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
 ifeq ($(BUILD_TARGET_ARCH),amd64)
- MOD_DEFS += -DRT_ARCH_AMD64
+MOD_DEFS += -DRT_ARCH_AMD64
 else
- MOD_DEFS += -DRT_ARCH_X86
+MOD_DEFS += -DRT_ARCH_X86
 endif
-# must be consistent with Config.kmk!
-MOD_DEFS += -DVBOX_WITH_64_BITS_GUESTS
-
-# By default we use remap_pfn_range() kernel API to make kernel pages
-# visible for userland. Unfortunately, it leads to situation that
-# during debug session all structures on that page (such as PVM pointer)
-# are not accessible to the debugger (see #3214).
-# This code enables experimental support
-# for vm_insert_page() kernel API, allowing to export kernel pages
-# to the userland in more debugger-friendly way. Due to stability
-# concerns, not enabled by default yet.
-ifdef VBOX_USE_INSERT_PAGE
- KFLAGS  += -DVBOX_USE_INSERT_PAGE
-endif
-
-# build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
 
 include $(obj)/Makefile-footer.gmk
+