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

Timestamp:

Feb 20, 2019 6:23:31 PM (6 years ago)

Author:

vboxsync

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

128953

Message:

More linux kernel module Makefile cleanups: $(subst MOD_%, VBOXMOD_%,*)

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/linux/Makefile (modified) (4 diffs)
• linux/sharedfolders/Makefile.module (modified) (7 diffs)

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

@@ -32 +32 @@
 include $(obj)/Makefile-header.gmk
 
-MOD_NAME = vboxguest
-
-MOD_OBJS = \
+VBOXMOD_NAME = vboxguest
+VBOXMOD_OBJS = \
         VBoxGuest-linux.o \
         VBoxGuest.o \
@@ -118 +117 @@
         VBox/logbackdoor.o
 ifeq ($(BUILD_TARGET_ARCH),x86)
-MOD_OBJS += \
+VBOXMOD_OBJS += \
         common/math/gcc/divdi3.o \
         common/math/gcc/moddi3.o \
@@ -127 +126 @@
 endif
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_OBJS += common/alloc/heapsimple.o
+VBOXMOD_OBJS += common/alloc/heapsimple.o
 endif
 
-MOD_DEFS = \
+VBOXMOD_DEFS = \
         VBOX \
         RT_OS_LINUX \
@@ -142 +141 @@
         VBOX_WITH_HGCM
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_DEFS += VBOX_WITH_64_BITS_GUESTS
+VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif
 ifeq ($(KERN_VERSION),24)
-MOD_DEFS += EXPORT_SYMTAB
+VBOXMOD_DEFS += EXPORT_SYMTAB
 endif
 
-MOD_INCL  = -I$(VBOXGUEST_DIR) -I$(VBOXGUEST_DIR)include -I$(VBOXGUEST_DIR)r0drv/linux
+VBOXMOD_INCL  = -I$(VBOXGUEST_DIR) -I$(VBOXGUEST_DIR)include -I$(VBOXGUEST_DIR)r0drv/linux
 
 ifeq ($(KERN_VERSION),24)
-MOD_CFLAGS =
+VBOXMOD_CFLAGS =
 else
-MOD_CFLAGS = -Wno-declaration-after-statement -include $(VBOXGUEST_DIR)include/VBox/VBoxGuestMangling.h -fno-pie
+VBOXMOD_CFLAGS = -Wno-declaration-after-statement -include $(VBOXGUEST_DIR)include/VBox/VBoxGuestMangling.h -fno-pie
 endif
 
-MOD_CLEAN = . linux r0drv generic r0drv/linux r0drv/generic VBox \
-        common/alloc common/err common/log common/math/gcc common/misc \
-        common/string common/table common/time
+VBOXMOD_CLEAN = \
+        . \
+        linux \
+        r0drv \
+        generic \
+        r0drv/linux \
+        r0drv/generic \
+        VBox \
+        common/alloc \
+        common/err \
+        common/log \
+        common/math/gcc \
+        common/misc \
+        common/string \
+        common/table \
+        common/time
 
 include $(obj)/Makefile-footer.gmk
 
-check: $(MOD_NAME)
+check: $(VBOXMOD_NAME)
         @if ! readelf -p __ksymtab_strings vboxguest.ko | grep -E "\[.*\]  *(RT|g_..*RT.*)"; then \
             echo "All exported IPRT symbols are properly renamed!"; \

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

@@ -25 +25 @@
 include $(obj)/Makefile-header.gmk
 
-MOD_NAME = vboxsf
-MOD_OBJS = \
+VBOXMOD_NAME = vboxsf
+VBOXMOD_OBJS = \
         vfsmod.o \
         dirops.o \
@@ -40 +40 @@
         VBoxGuestR0LibSharedFolders.o
 ifeq ($(BUILD_TARGET_ARCH),x86)
-MOD_OBJS += \
+VBOXMOD_OBJS += \
         divdi3.o \
         moddi3.o \
@@ -48 +48 @@
         qdivrem.o
 endif
-MOD_INCL = \
+VBOXMOD_INCL = \
         -I$(VBOXSF_DIR) \
         -I$(VBOXSF_DIR)include \
         -I$(VBOXSF_DIR)r0drv/linux
-MOD_DEFS = \
+VBOXMOD_DEFS = \
         RT_OS_LINUX \
         IN_RING0 \
@@ -64 +64 @@
         RT_NO_EXPORT_SYMBOL
 ifeq ($(BUILD_TARGET_ARCH),amd64)
-MOD_DEFS += VBOX_WITH_64_BITS_GUESTS
+VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
 endif
 ifeq ($(KERN_VERSION),24)
-MOD_CFLAGS =
+VBOXMOD_CFLAGS =
 else
-MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
+VBOXMOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
 endif
 ifdef VBOX_NO_OMIT_FRAME_POINTER
-MOD_CFLAGS += -fno-omit-frame-pointer
+VBOXMOD_CFLAGS += -fno-omit-frame-pointer
 endif
 
@@ -79 +79 @@
 # ClarkConnect 4.3 (cc4) and ClarkConnect 5 (v5)
  ifeq ($(KERNELRELEASE),)
-MOD_EXTRA += $(foreach inc,$(KERN_INCL),\
+VBOXMOD_CFLAGS += $(foreach inc,$(KERN_INCL),\
                $(if $(wildcard $(inc)/linux/utsrelease.h),\
                  $(if $(shell grep '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h; \
@@ -87 +87 @@
                    -DKERNEL_FC6,),))
  else
-MOD_EXTRA += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
+VBOXMOD_CFLAGS += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
                           echo "$(KERNELRELEASE)"|grep '2.6.18.*el5.*';\
                           echo "$(KERNELRELEASE)"|grep '2.6.18.*v5.*';\
@@ -95 +95 @@
 endif
 
-MOD_CLEAN = . linux r0drv r0drv/linux
+VBOXMOD_CLEAN = . linux r0drv r0drv/linux
 
 include $(obj)/Makefile-footer.gmk