Changeset 77393 in vbox for trunk/src/VBox/Additions/linux/sharedfolders

Timestamp:

Feb 20, 2019 4:09:58 PM (6 years ago)

Author:

vboxsync

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

128944

Message:

More linux kernel module Makefile cleansup.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)

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

@@ -48 +48 @@
         qdivrem.o
 endif
-
-MOD_INCL = -I$(VBOXSF_DIR) -I$(VBOXSF_DIR)include -I$(VBOXSF_DIR)r0drv/linux -I`pwd` -I`pwd`
-
-MOD_DEFS   = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST -DIN_GUEST_R0
-# our module does not export any symbol
-MOD_DEFS  += -DRT_NO_EXPORT_SYMBOL
+MOD_INCL = \
+        -I$(VBOXSF_DIR) \
+        -I$(VBOXSF_DIR)include \
+        -I$(VBOXSF_DIR)r0drv/linux
+MOD_DEFS = \
+        -DRT_OS_LINUX \
+        -DIN_RING0 \
+        -DIN_RT_R0 \
+        -DIN_SUP_R0 \
+        -DVBOX \
+        -DVBOX_WITH_HGCM \
+        -DIN_MODULE \
+        -DIN_GUEST \
+        -DIN_GUEST_R0 \
+        -DRT_NO_EXPORT_SYMBOL
 ifeq ($(BUILD_TARGET_ARCH),amd64)
- MOD_DEFS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+MOD_DEFS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
 else
- MOD_DEFS += -DRT_ARCH_X86
+MOD_DEFS += -DRT_ARCH_X86
+endif
+ifeq ($(KERN_VERSION),24)
+MOD_CFLAGS =
+else
+MOD_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
 endif
 
-ifeq ($(KERN_VERSION), 24)
- MOD_CFLAGS =
-else
- MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(VBOXSF_DIR)/include/VBox/VBoxGuestMangling.h -fno-pie
-
+ifneq ($(KERN_VERSION),24)
 # special hack for Fedora Core 6 2.6.18 (fc6), rhel5 2.6.18 (el5),
 # ClarkConnect 4.3 (cc4) and ClarkConnect 5 (v5)
  ifeq ($(KERNELRELEASE),)
-  MOD_EXTRA += $(foreach inc,$(KERN_INCL),\
-              $(if $(wildcard $(inc)/linux/utsrelease.h),\
-                $(if $(shell grep '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h; \
-                            grep '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h; \
-                            grep '"2.6.18.*v5.*"'  $(inc)/linux/utsrelease.h; \
-                            grep '"2.6.18.*cc4.*"' $(inc)/linux/utsrelease.h),\
-                -DKERNEL_FC6,),))
+MOD_EXTRA += $(foreach inc,$(KERN_INCL),\
+               $(if $(wildcard $(inc)/linux/utsrelease.h),\
+                 $(if $(shell grep '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h; \
+                              grep '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h; \
+                              grep '"2.6.18.*v5.*"'  $(inc)/linux/utsrelease.h; \
+                              grep '"2.6.18.*cc4.*"' $(inc)/linux/utsrelease.h),\
+                   -DKERNEL_FC6,),))
  else
-  MOD_EXTRA += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
-                        echo "$(KERNELRELEASE)"|grep '2.6.18.*el5.*';\
-                        echo "$(KERNELRELEASE)"|grep '2.6.18.*v5.*';\
-                        echo "$(KERNELRELEASE)"|grep '2.6.18.*cc4.*'),\
+MOD_EXTRA += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
+                          echo "$(KERNELRELEASE)"|grep '2.6.18.*el5.*';\
+                          echo "$(KERNELRELEASE)"|grep '2.6.18.*v5.*';\
+                          echo "$(KERNELRELEASE)"|grep '2.6.18.*cc4.*'),\
                 -DKERNEL_FC6,)
  endif
-endif
-ifdef VBOX_NO_OMIT_FRAME_POINTER
- MOD_CFLAGS += -fno-omit-frame-pointer
 endif