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

Timestamp:

Nov 10, 2008 1:57:45 PM (16 years ago)

Author:

vboxsync

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

39069

Message:

added vboxnetflt to the installer + some cleanup

File:

• trunk/src/VBox/HostDrivers/Support/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -52 +52 @@
   SYSMODS.solaris += vboxdrv
  endif
- OTHERS.linux    += \
-        $(PATH_BIN)/src/build_in_tmp \
-        $(PATH_BIN)/src/Makefile \
-        $(if $(VBOX_OSE),,$(PATH_BIN)/src/dkms.conf)
- INSTALLS.linux   += vboxmod-bin vboxmod-sh
+ INSTALLS.linux   += vboxdrv-mod vboxdrv-sh
 
  #
@@ -218 +214 @@
 
 #
-# vboxdrv.ko - The Linux Kernel Module (syntax only).
+# vboxdrv.ko - The Linux Kernel Module (syntax check only).
 #
 ifeq ($(KBUILD_TARGET),linux)
@@ -247 +243 @@
 # Targets for installing the linux sources.
 #
-vboxmod-bin_INST    = bin/src/
-vboxmod-bin_MODE    = a+r,u+w
-vboxmod-bin_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
-
-vboxmod-sh_INST     = bin/src/
-vboxmod-sh_MODE     = a+rx,u+w
-vboxmod-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
-vboxmod-sh_CLEAN    = $(PATH_TARGET)/vboxmod-sh-1.dep
+vboxdrv-mod_INST    = bin/src/vboxdrv/
+vboxdrv-mod_MODE    = a+r,u+w
+vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
+vboxdrv-mod_SOURCES += \
+        $(if $(VBOX_OSE),,$(PATH_vboxdrv-mod)/dkms.conf) \
+        $(PATH_vboxdrv-mod)/Makefile
+vboxdrv-mod_CLEAN   = \
+        $(PATH_vboxdrv-mod)/dkms.conf \
+        $(PATH_vboxdrv-mod)/Makefile
+
+vboxdrv-sh_INST     = bin/src/vboxdrv
+vboxdrv-sh_MODE     = a+rx,u+w
+vboxdrv-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
+vboxdrv-sh_SOURCES += $(PATH_vboxdrv-sh)/build_in_tmp
+vboxdrv-sh_CLEAN    = \
+        $(PATH_TARGET)/vboxdrv-sh-1.dep \
+        $(PATH_vboxdrv-sh)/build_in_tmp
+
 
 # Scripts needed for building the kernel modules
-## @todo generate these else where and move them from OTHERS to vboxmod-bin (which btw installs NOBIN files contrary to its name).
-
-$(PATH_BIN)/src/build_in_tmp: \
+
+$$(PATH_vboxdrv-sh)/build_in_tmp: \
                 $(PATH_SUB_CURRENT)/linux/build_in_tmp \
-                $(VBOX_VERSION_STAMP)
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" --output $@ $<
         $(QUIET)chmod 0755 $@
 
-$(PATH_BIN)/src/dkms.conf: \
+$$(PATH_vboxdrv-mod)/dkms.conf: \
                 $(PATH_SUB_CURRENT)/linux/dkms.conf \
-                $(VBOX_VERSION_STAMP)
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
 
-includedep $(PATH_TARGET)/vboxmod-sh-1.dep
-$(PATH_BIN)/src/Makefile: \
+includedep $(PATH_TARGET)/vboxdrv-sh-1.dep
+$$(PATH_vboxdrv-mod)/Makefile: \
                 $(PATH_SUB_CURRENT)/linux/Makefile \
                 $$(if $$(eq $$(Support/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
-                | $(PATH_TARGET)/
+                | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
  ifndef VBOX_WITH_HARDENING
@@ -283 +290 @@
         $(QUIET)$(CP) -f $< $@
  endif
-        %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/vboxmod-sh-1.dep
-        %$(QUIET2)$(APPEND) '$(PATH_TARGET)/vboxmod-sh-1.dep' 'Support/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
+        %$(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)'
 
 endif # real linux