Changeset 38194 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Jul 27, 2011 9:55:19 AM (14 years ago)

Author:

vboxsync

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

73158

Message:

Additions/linux|x11/*kmk: some cleanups.

File:

• trunk/src/VBox/Additions/linux/drm/Makefile.kmk (modified) (2 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-INSTALLS += vboxvideo_drm-mod vboxvideo_drm-sh
-ifdef VBOX_WITH_ADDITION_DRIVERS
-# Only do a test build on kernels as of 2.6.27
- SYSMODS += $(if $(strip $(foreach inc,$(VBOX_LINUX_INCS),\
-                 $(wildcard $(inc)/drm/drmP.h))),vboxvideo_drm,)
-endif
-
 #
 # Populate FILES_VBOXVIDEO_DRM_NOBIN
 #
+INSTALLS += vboxvideo_drm-mod
 include $(PATH_SUB_CURRENT)/files_vboxvideo_drm
+vboxvideo_drm-mod_INST         = $(INST_ADDITIONS)src/vboxvideo/
+vboxvideo_drm-mod_SOURCES      = \
+        $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN))
+vboxvideo_drm-mod_EXEC_SOURCES = \
+        $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN)) \
+        $(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp \
+        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
+vboxvideo_drm-mod_CLEAN       += $(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp
 
-vboxvideo_drm-mod_INST        = $(INST_ADDITIONS)src/vboxvideo/
-vboxvideo_drm-mod_MODE        = a+r,u+w
-vboxvideo_drm-mod_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_NOBIN))
-
-vboxvideo_drm-sh_INST        = $(INST_ADDITIONS)src/vboxvideo/
-vboxvideo_drm-sh_MODE        = a+rx,u+w
-vboxvideo_drm-sh_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_BIN))
-vboxvideo_drm-sh_SOURCES    += \
-        $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp \
-        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
-vboxvideo_drm-sh_CLEAN      += $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp
-
-
-#
-# The module (for syntax checking).
-# The DEBUG_HASH* stuff is for  CONFIG_DYNAMIC_DEBUG-enabled kernels
-#
-vboxvideo_drm_TEMPLATE        = VBOXGUESTR0
-vboxvideo_drm_NOINST          = 1
-vboxvideo_drm_CFLAGS          = -fshort-wchar
-vboxvideo_drm_DEFS            = \
-        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
-        KBUILD_MODNAME=KBUILD_STR\(vboxvideo\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \
-        DEBUG_HASH=2 DEBUG_HASH2=3
-vboxvideo_drm_SOURCES         = vboxvideo_drm.c
-
-# detect fc6 2.6.18
-vboxvideo_drm_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
-                            $(if $(wildcard $(inc)/linux/utsrelease.h),\
-                              $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
-                                then echo yes; fi),KERNEL_FC6,),))
-# detect rhel5 2.6.18
-vboxvideo_drm_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
-                            $(if $(wildcard $(inc)/linux/utsrelease.h),\
-                              $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
-                                then echo yes; fi),KERNEL_FC6,),))
-
-
-## Scripts needed for building kernel modules
-
-$$(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp: \
+# Script needed for building the kernel module.
+$$(vboxvideo_drm-mod_0_OUTDIR)/build_in_tmp: \
                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvideo;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" < $< > $@
-        $(QUIET)chmod 0755 $@
+        $(QUIET)$(RM) -f -- $@
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvideo;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" \
+                --output=$@ $<
+        $(QUIET)$(CHMOD) 0755 $@
+
+
+#
+# The kernel module.
+#
+# Note! Syntax checking only.  Don't bother if drmP.h is missing (introduced
+#       in 2.6.27).
+# Note! The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels.
+#
+if defined(VBOX_WITH_ADDITION_DRIVERS) \
+  && "$(strip $(foreach inc,$(VBOX_LINUX_INCS),$(wildcard $(inc)/drm/drmP.h)))" != ""
+ SYSMODS += vboxvideo_drm
+ vboxvideo_drm_TEMPLATE        = VBOXGUESTR0
+ vboxvideo_drm_NOINST          = 1
+ vboxvideo_drm_CFLAGS          = -fshort-wchar
+ vboxvideo_drm_DEFS            = \
+        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
+        KBUILD_MODNAME=KBUILD_STR\(vboxvideo\) \
+        KBUILD_BASENAME=KBUILD_STR\(vboxvideo\) \
+        DEBUG_HASH=2 DEBUG_HASH2=3
+ # detect fc6 2.6.18
+ vboxvideo_drm_DEFS           += \
+        $(foreach inc,$(VBOX_LINUX_INCS),\
+                $(if $(wildcard $(inc)/linux/utsrelease.h),\
+                 $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
+                               then echo yes; fi),KERNEL_FC6,),))
+ # detect rhel5 2.6.18
+ vboxvideo_drm_DEFS           += \
+        $(foreach inc,$(VBOX_LINUX_INCS),\
+                $(if $(wildcard $(inc)/linux/utsrelease.h),\
+                 $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
+                               then echo yes; fi),KERNEL_FC6,),))
+ vboxvideo_drm_SOURCES         = vboxvideo_drm.c
+
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk