Changeset 38183 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jul 26, 2011 1:20:51 PM (13 years ago)

Author:

vboxsync

Message:

kBuild,HostDrivers: Consolidate install targets using EXEC_SOURCES. Some cleanup, esp VBoxPci ofc.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (11 diffs)

trunk/src/VBox/HostDrivers/Support/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
@@ -51 +51 @@
   SYSMODS.solaris += vboxdrv
  endif
- INSTALLS.linux   += vboxdrv-mod vboxdrv-sh vboxdrv-dkms
- INSTALLS.freebsd += vboxdrv-mod vboxdrv-sh
+ INSTALLS.linux   += vboxdrv-mod
+ INSTALLS.freebsd += vboxdrv-mod
 
  #
@@ -185 +185 @@
 endif
 ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-VBoxDrv_DEFS         += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
+ VBoxDrv_DEFS        += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
 endif
 VBoxDrv_SDKS          = W2K3DDK WINPSDKINCS
@@ -240 +240 @@
 vboxdrv_DEFS          = KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE IN_RT_R0 IN_SUP_R0 CONFIG_VBOXDRV_AS_MISC
 ifdef VBOX_LINUX_VERSION_2_4
-vboxdrv_DEFS         += EXPORT_SYMTAB
+ vboxdrv_DEFS        += EXPORT_SYMTAB
 endif
 vboxdrv_INCS         := \
@@ -252 +252 @@
         SUPDrvSem.c
 ifndef VBOX_LINUX_VERSION_2_4
-vboxdrv_SOURCES      += \
-        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).mod.c
+ vboxdrv_SOURCES     += \
+        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).mod.c
 endif
 
@@ -261 +261 @@
 #
 vboxdrv-mod_INST    = bin/src/vboxdrv/
-vboxdrv-mod_MODE    = a+r,u+w
-vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
-vboxdrv-mod_SOURCES += \
+vboxdrv-mod_SOURCES = \
+        $(subst $(DQUOTE),,$(FILES_VBOXDRV_NOBIN)) \
         $(vboxdrv-mod_0_OUTDIR)/Makefile
+vboxdrv-mod_EXEC_SOURCES  = \
+        $(subst $(DQUOTE),,$(FILES_VBOXDRV_BIN)) \
+        $(vboxdrv-mod_0_OUTDIR)/build_in_tmp \
+        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
 vboxdrv-mod_CLEAN   = \
-        $(vboxdrv-mod_0_OUTDIR)/Makefile
-
-vboxdrv-sh_INST     = bin/src/vboxdrv/
-vboxdrv-sh_MODE     = a+rx,u+w
-vboxdrv-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
-vboxdrv-sh_SOURCES += \
-        $(vboxdrv-sh_0_OUTDIR)/build_in_tmp \
-        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
-vboxdrv-sh_CLEAN    = \
-        $(PATH_TARGET)/vboxdrv-sh-1.dep \
-        $(vboxdrv-sh_0_OUTDIR)/build_in_tmp
+        $(vboxdrv-mod_0_OUTDIR)/Makefile \
+        $(PATH_TARGET)/vboxdrv-mod-1.dep \
+        $(vboxdrv-mod_0_OUTDIR)/build_in_tmp
 
 # Scripts needed for building the kernel modules
 
-$$(vboxdrv-sh_0_OUTDIR)/build_in_tmp: \
+$$(vboxdrv-mod_0_OUTDIR)/build_in_tmp: \
                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
@@ -291 +286 @@
         $(QUIET)chmod 0755 $@
 
-includedep $(PATH_TARGET)/vboxdrv-sh-1.dep
+includedep $(PATH_TARGET)/vboxdrv-mod-1.dep
 $$(vboxdrv-mod_0_OUTDIR)/Makefile: \
                 $(PATH_SUB_CURRENT)/linux/Makefile \
@@ -302 +297 @@
         $(QUIET)$(CP) -f $< $@
  endif
-        %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/vboxdrv-sh-1.dep
-        %$(QUIET2)$(APPEND) '$(PATH_TARGET)/vboxdrv-sh-1.dep' 'Support/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
+        %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-mod-1.dep' 'Support/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 
 endif # real linux
@@ -360 +354 @@
 # Common manual loader script.
 INSTALLS += Scripts
-Scripts_INST     = $(INST_DIST)
-Scripts_SOURCES  = \
+Scripts_INST = $(INST_DIST)
+Scripts_EXEC_SOURCES  = \
         darwin/load.sh
 
@@ -417 +411 @@
 #
 vboxdrv-mod_INST    = bin/src/vboxdrv/
-vboxdrv-mod_MODE    = a+r,u+w
-vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
-vboxdrv-mod_SOURCES += \
+vboxdrv-mod_SOURCES = \
+        $(subst $(DQUOTE),,$(FILES_VBOXDRV_NOBIN)) \
         $(vboxdrv-mod_0_OUTDIR)/Makefile
 vboxdrv-mod_CLEAN   = \
@@ -429 +422 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(RM) -f -- $@
  ifndef VBOX_WITH_HARDENING
         $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<