VirtualBox

Changeset 77399 in vbox


Ignore:
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
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r77398 r77399  
    3232include $(obj)/Makefile-header.gmk
    3333
    34 MOD_NAME = vboxguest
    35 
    36 MOD_OBJS = \
     34VBOXMOD_NAME = vboxguest
     35VBOXMOD_OBJS = \
    3736        VBoxGuest-linux.o \
    3837        VBoxGuest.o \
    … …  
    118117        VBox/logbackdoor.o
    119118ifeq ($(BUILD_TARGET_ARCH),x86)
    120 MOD_OBJS += \
     119VBOXMOD_OBJS += \
    121120        common/math/gcc/divdi3.o \
    122121        common/math/gcc/moddi3.o \
    … …  
    127126endif
    128127ifeq ($(BUILD_TARGET_ARCH),amd64)
    129 MOD_OBJS += common/alloc/heapsimple.o
     128VBOXMOD_OBJS += common/alloc/heapsimple.o
    130129endif
    131130
    132 MOD_DEFS = \
     131VBOXMOD_DEFS = \
    133132        VBOX \
    134133        RT_OS_LINUX \
    … …  
    142141        VBOX_WITH_HGCM
    143142ifeq ($(BUILD_TARGET_ARCH),amd64)
    144 MOD_DEFS += VBOX_WITH_64_BITS_GUESTS
     143VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
    145144endif
    146145ifeq ($(KERN_VERSION),24)
    147 MOD_DEFS += EXPORT_SYMTAB
     146VBOXMOD_DEFS += EXPORT_SYMTAB
    148147endif
    149148
    150 MOD_INCL  = -I$(VBOXGUEST_DIR) -I$(VBOXGUEST_DIR)include -I$(VBOXGUEST_DIR)r0drv/linux
     149VBOXMOD_INCL  = -I$(VBOXGUEST_DIR) -I$(VBOXGUEST_DIR)include -I$(VBOXGUEST_DIR)r0drv/linux
    151150
    152151ifeq ($(KERN_VERSION),24)
    153 MOD_CFLAGS =
     152VBOXMOD_CFLAGS =
    154153else
    155 MOD_CFLAGS = -Wno-declaration-after-statement -include $(VBOXGUEST_DIR)include/VBox/VBoxGuestMangling.h -fno-pie
     154VBOXMOD_CFLAGS = -Wno-declaration-after-statement -include $(VBOXGUEST_DIR)include/VBox/VBoxGuestMangling.h -fno-pie
    156155endif
    157156
    158 MOD_CLEAN = . linux r0drv generic r0drv/linux r0drv/generic VBox \
    159         common/alloc common/err common/log common/math/gcc common/misc \
    160         common/string common/table common/time
     157VBOXMOD_CLEAN = \
     158        . \
     159        linux \
     160        r0drv \
     161        generic \
     162        r0drv/linux \
     163        r0drv/generic \
     164        VBox \
     165        common/alloc \
     166        common/err \
     167        common/log \
     168        common/math/gcc \
     169        common/misc \
     170        common/string \
     171        common/table \
     172        common/time
    161173
    162174include $(obj)/Makefile-footer.gmk
    163175
    164 check: $(MOD_NAME)
     176check: $(VBOXMOD_NAME)
    165177        @if ! readelf -p __ksymtab_strings vboxguest.ko | grep -E "\[.*\]  *(RT|g_..*RT.*)"; then \
    166178            echo "All exported IPRT symbols are properly renamed!"; \

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

    r77398 r77399  
    2525include $(obj)/Makefile-header.gmk
    2626
    27 MOD_NAME = vboxsf
    28 MOD_OBJS = \
     27VBOXMOD_NAME = vboxsf
     28VBOXMOD_OBJS = \
    2929        vfsmod.o \
    3030        dirops.o \
    … …  
    4040        VBoxGuestR0LibSharedFolders.o
    4141ifeq ($(BUILD_TARGET_ARCH),x86)
    42 MOD_OBJS += \
     42VBOXMOD_OBJS += \
    4343        divdi3.o \
    4444        moddi3.o \
    … …  
    4848        qdivrem.o
    4949endif
    50 MOD_INCL = \
     50VBOXMOD_INCL = \
    5151        -I$(VBOXSF_DIR) \
    5252        -I$(VBOXSF_DIR)include \
    5353        -I$(VBOXSF_DIR)r0drv/linux
    54 MOD_DEFS = \
     54VBOXMOD_DEFS = \
    5555        RT_OS_LINUX \
    5656        IN_RING0 \
    … …  
    6464        RT_NO_EXPORT_SYMBOL
    6565ifeq ($(BUILD_TARGET_ARCH),amd64)
    66 MOD_DEFS += VBOX_WITH_64_BITS_GUESTS
     66VBOXMOD_DEFS += VBOX_WITH_64_BITS_GUESTS
    6767endif
    6868ifeq ($(KERN_VERSION),24)
    69 MOD_CFLAGS =
     69VBOXMOD_CFLAGS =
    7070else
    71 MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
     71VBOXMOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
    7272endif
    7373ifdef VBOX_NO_OMIT_FRAME_POINTER
    74 MOD_CFLAGS += -fno-omit-frame-pointer
     74VBOXMOD_CFLAGS += -fno-omit-frame-pointer
    7575endif
    7676
    … …  
    7979# ClarkConnect 4.3 (cc4) and ClarkConnect 5 (v5)
    8080 ifeq ($(KERNELRELEASE),)
    81 MOD_EXTRA += $(foreach inc,$(KERN_INCL),\
     81VBOXMOD_CFLAGS += $(foreach inc,$(KERN_INCL),\
    8282               $(if $(wildcard $(inc)/linux/utsrelease.h),\
    8383                 $(if $(shell grep '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h; \
    … …  
    8787                   -DKERNEL_FC6,),))
    8888 else
    89 MOD_EXTRA += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
     89VBOXMOD_CFLAGS += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
    9090                          echo "$(KERNELRELEASE)"|grep '2.6.18.*el5.*';\
    9191                          echo "$(KERNELRELEASE)"|grep '2.6.18.*v5.*';\
    … …  
    9595endif
    9696
    97 MOD_CLEAN = . linux r0drv r0drv/linux
     97VBOXMOD_CLEAN = . linux r0drv r0drv/linux
    9898
    9999include $(obj)/Makefile-footer.gmk

  • trunk/src/VBox/HostDrivers/Support/linux/Makefile

    r77397 r77399  
    3232include $(obj)/Makefile-header.gmk
    3333
    34 MOD_NAME = vboxdrv
    35 MOD_OBJS = \
     34VBOXMOD_NAME = vboxdrv
     35VBOXMOD_OBJS = \
    3636        linux/SUPDrv-linux.o \
    3737        SUPDrv.o \
    … …  
    121121        VBox/log-vbox.o
    122122ifeq ($(BUILD_TARGET_ARCH),x86)
    123 MOD_OBJS += \
     123VBOXMOD_OBJS += \
    124124        math/gcc/divdi3.o \
    125125        math/gcc/moddi3.o \
    … …  
    131131endif
    132132ifeq ($(BUILD_TARGET_ARCH),amd64)
    133 MOD_OBJS += common/alloc/heapsimple.o
     133VBOXMOD_OBJS += common/alloc/heapsimple.o
    134134endif
    135135ifdef VBOX_WITH_NATIVE_DTRACE
    136 MOD_OBJS += SUPDrvDTrace.o
     136VBOXMOD_OBJS += SUPDrvDTrace.o
    137137endif
    138 MOD_INCL  = \
     138VBOXMOD_INCL  = \
    139139        -I$(VBOXDRV_DIR) \
    140140        -I$(VBOXDRV_DIR)include \
    141141        -I$(VBOXDRV_DIR)r0drv/linux
    142142ifdef VBOX_WITH_NATIVE_DTRACE
    143 MOD_INCL += \
     143VBOXMOD_INCL += \
    144144        -I/usr/include/linux \
    145145        -I/usr/include
    146146endif
    147 MOD_DEFS = \
     147VBOXMOD_DEFS = \
    148148        RT_OS_LINUX \
    149149        IN_RING0 \
    … …  
    158158        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    159159ifndef CONFIG_VBOXDRV_FIXEDMAJOR
    160 MOD_DEFS += CONFIG_VBOXDRV_AS_MISC
     160VBOXMOD_DEFS += CONFIG_VBOXDRV_AS_MISC
    161161endif
    162162ifdef VBOX_WITH_NATIVE_DTRACE
    163 MOD_DEFS += VBOX_WITH_NATIVE_DTRACE
     163VBOXMOD_DEFS += VBOX_WITH_NATIVE_DTRACE
    164164endif
    165165ifdef VBOX_WITH_TEXT_MODMEM_HACK
    166 MOD_DEFS += RTMEMALLOC_EXEC_HEAP VBOX_WITH_TEXT_MODMEM_HACK
     166VBOXMOD_DEFS += RTMEMALLOC_EXEC_HEAP VBOX_WITH_TEXT_MODMEM_HACK
    167167endif
    168 MOD_CFLAGS = -include $(VBOXDRV_DIR)include/VBox/SUPDrvMangling.h \
     168VBOXMOD_CFLAGS = -include $(VBOXDRV_DIR)include/VBox/SUPDrvMangling.h \
    169169        -fno-omit-frame-pointer -fno-pie -Wno-declaration-after-statement
    170170

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile

    r77397 r77399  
    3232include $(obj)/Makefile-header.gmk
    3333
    34 MOD_NAME = vboxnetadp
    35 MOD_OBJS = \
     34VBOXMOD_NAME = vboxnetadp
     35VBOXMOD_OBJS = \
    3636        linux/VBoxNetAdp-linux.o \
    3737        VBoxNetAdp.o
    3838ifeq ($(BUILD_TARGET_ARCH),x86)
    39 MOD_OBJS += \
     39VBOXMOD_OBJS += \
    4040        math/gcc/divdi3.o \
    4141        math/gcc/moddi3.o \
    … …  
    4646        math/gcc/umoddi3.o
    4747endif
    48 MOD_INCL = \
     48VBOXMOD_INCL = \
    4949        -I$(VBOXNETADPT_DIR) \
    5050        -I$(VBOXNETADPT_DIR)include \
    5151        -I$(VBOXNETADPT_DIR)r0drv/linux
    52 MOD_DEFS = \
     52VBOXMOD_DEFS = \
    5353        RT_OS_LINUX \
    5454        IN_RING0 \
    … …  
    5959        VBOX_WITH_HARDENING \
    6060        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    61 MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
     61VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
    6262
    6363include $(obj)/Makefile-footer.gmk

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

    r77398 r77399  
    3232include $(obj)/Makefile-header.gmk
    3333
    34 MOD_NAME = vboxnetflt
    35 MOD_OBJS = \
     34VBOXMOD_NAME = vboxnetflt
     35VBOXMOD_OBJS = \
    3636        linux/VBoxNetFlt-linux.o \
    3737        VBoxNetFlt.o \
    … …  
    4040        linux/SUPR0IdcClient-linux.o
    4141ifeq ($(BUILD_TARGET_ARCH),x86)
    42 MOD_OBJS += \
     42VBOXMOD_OBJS += \
    4343        math/gcc/divdi3.o \
    4444        math/gcc/moddi3.o \
    … …  
    4949        math/gcc/umoddi3.o
    5050endif
    51 MOD_INCL = \
     51VBOXMOD_INCL = \
    5252        -I$(VBOXNETFLT_DIR) \
    5353        -I$(VBOXNETFLT_DIR)include \
    5454        -I$(VBOXNETFLT_DIR)r0drv/linux
    55 MOD_DEFS = \
     55VBOXMOD_DEFS = \
    5656        RT_OS_LINUX \
    5757        IN_RING0 \
    … …  
    6262        VBOX_WITH_HARDENING \
    6363        VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
    64 MOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
     64VBOXMOD_CFLAGS = -include $(VBOXNETFLT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
    6565
    6666include $(obj)/Makefile-footer.gmk

  • trunk/src/VBox/HostDrivers/VBoxPci/linux/Makefile

    r77397 r77399  
    3333
    3434# override is required by the Debian guys
    35 MOD_NAME = vboxpci
    36 MOD_OBJS = \
     35VBOXMOD_NAME = vboxpci
     36VBOXMOD_OBJS = \
    3737        linux/VBoxPci-linux.o \
    3838        VBoxPci.o \
    … …  
    4141        linux/SUPR0IdcClient-linux.o
    4242ifeq ($(BUILD_TARGET_ARCH),x86)
    43 MOD_OBJS += \
     43VBOXMOD_OBJS += \
    4444        math/gcc/divdi3.o \
    4545        math/gcc/moddi3.o \
    … …  
    5050        math/gcc/umoddi3.o
    5151endif
    52 MOD_INCL = \
     52VBOXMOD_INCL = \
    5353        -I$(VBOXPCI_DIR) \
    5454        -I$(VBOXPCI_DIR)include \
    5555        -I$(VBOXPCI_DIR)r0drv/linux
    56 MOD_DEFS = \
     56VBOXMOD_DEFS = \
    5757        RT_OS_LINUX \
    5858        IN_RING0 \
    … …  
    6262        RT_WITH_VBOX \
    6363        VBOX_WITH_HARDENING
    64 MOD_CFLAGS = -include $(VBOXPCI_DIR)include/VBox/SUPDrvMangling.h -fno-pie
     64VBOXMOD_CFLAGS = -include $(VBOXPCI_DIR)include/VBox/SUPDrvMangling.h -fno-pie
    6565
    6666include $(obj)/Makefile-footer.gmk

  • trunk/src/VBox/Installer/linux/Makefile-footer.gmk

    r77397 r77399  
    1818#
    1919
    20 #
    21 # Note! The MOD_XXX variables are ours and does not directly influence the
    22 #       kernel build system.  When adding more variables, please prefix them
    23 #       with VBOX_ so we can tell more easily who's variable it is.
    24 #
    25 
    2620# override is required by the Debian guys
    27 override MODULE = $(MOD_NAME)
    28 OBJS   = $(MOD_OBJS)
     21override MODULE = $(VBOXMOD_NAME)
     22OBJS = $(VBOXMOD_OBJS)
    2923
    3024KBUILD_VERBOSE ?= 1
    … …  
    3428# Compiler options
    3529#
    36 VBOX_INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL)) $(MOD_INCL)
     30VBOX_INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL)) $(VBOXMOD_INCL)
    3731
    38 KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(MOD_DEFS))
     32KFLAGS := -D__KERNEL__ -DMODULE -DRT_WITHOUT_PRAGMA_ONCE $(addprefix -D,$(VBOXMOD_DEFS))
    3933ifeq ($(BUILD_TARGET_ARCH),amd64)
    4034KFLAGS += -DRT_ARCH_AMD64
    … …  
    6660endif
    6761
    68 CFLAGS := -O2 -DVBOX_LINUX_2_4 $(MOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
     62CFLAGS := -O2 -DVBOX_LINUX_2_4 $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
    6963MODULE_EXT := o
    7064
    … …  
    8478clean:
    8579        for f in $(sort $(dir $(OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
    86         rm -rf .$(MOD_NAME)* .tmp_ver* $(MOD_NAME).* Modules.symvers modules.order
     80        rm -rf .$(VBOXMOD_NAME)* .tmp_ver* $(VBOXMOD_NAME).* Modules.symvers modules.order
    8781
    8882else  # ! $(KERN_VERSION), 24
    … …  
    9791
    9892# build defs
    99 EXTRA_CFLAGS += $(MOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(MOD_EXTRA) $(KDEBUG)
     93EXTRA_CFLAGS += $(VBOXMOD_CFLAGS) $(VBOX_INCL) $(KFLAGS) $(KDEBUG)
    10094
    10195.PHONY: $(MODULE)

  • trunk/src/VBox/Installer/linux/Makefile-header.gmk

    r77397 r77399  
    3030# obj ?= $(CURDIR)
    3131# include $(obj)/Makefile-header.gmk
    32 # MOD_NAME = <name of the module to be built, without extension>
    33 # MOD_OBJS = <list of object files which should be included>
    34 # MOD_DEFS = <any additional defines which this module needs>
    35 # MOD_INCL = <any additional include paths which this module needs>
    36 # MOD_CFLAGS = <any additional CFLAGS which this module needs>
     32# VBOXMOD_NAME = <name of the module to be built, without extension>
     33# VBOXMOD_OBJS = <list of object files which should be included>
     34# VBOXMOD_DEFS = <any additional defines which this module needs>
     35# VBOXMOD_INCL = <any additional include paths which this module needs>
     36# VBOXMOD_CFLAGS = <any additional CFLAGS which this module needs>
    3737# include $(obj)/Makefile-footer.gmk
    3838#
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette