Changeset 22012 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 6, 2009 12:14:15 AM (16 years ago)

Author:

vboxsync

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

50749

Message:

VBoxNetAdp/Makefile.kmk: Killed the extremely annoying W2K3DDK and WINPSDK warnings on darwin.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (7 diffs)

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

@@ -24 +24 @@
 
 
-if1of ($(KBUILD_TARGET), darwin win)
+if1of ($(KBUILD_TARGET), darwin win) # this ifeq must go, see @todo around elif
 #
 # VBoxNetFlt.sys - The mixed case driver.
@@ -237 +237 @@
                 $(addprefix /I , $(call VBOX_FN_MAKE_WIN_PATH,$(SDK_W2K3DDK_INCS))) \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
-endif #ifeq ($(KBUILD_TARGET), win)
 
 #
@@ -245 +244 @@
 VBoxNetAdp_TEMPLATE = VBOXR0DRV
 #VBoxNetAdp_INST = $(INST_VBOXNETADP)
-if defined(VBOX_SIGNING_MODE)
- VBoxNetAdp_NOINST = true
-endif
+ if defined(VBOX_SIGNING_MODE)
+VBoxNetAdp_NOINST = true
+ endif
 VBoxNetAdp_DEFS = IN_RT_R0 IN_SUP_STATIC
 VBoxNetAdp_SDKS = W2K3DDK WINPSDKINCS
@@ -297 +296 @@
 
  endif #  ifdef VBOX_SIGNING_MODE
+
+endif #ifeq ($(KBUILD_TARGET), win)
 
 else if1of ($(KBUILD_TARGET), linux solaris) ## @todo merge this with the mixed case stuff.
@@ -331 +332 @@
 
 solaris/VBoxNetFlt-solaris.c_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
-endif
+endif # to be removed.
+
 
 ifeq ($(KBUILD_TARGET),linux)
@@ -356 +358 @@
  VBoxNetFlt-sh_SOURCES = \
         $(PATH_VBoxNetFlt-sh)/build_in_tmp \
-        $(if $(VBOX_OSE),,\
-          $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
+        $(if $(VBOX_OSE),,$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
  VBoxNetFlt-sh_CLEAN   = $(PATH_VBoxNetFlt-sh)/build_in_tmp
 
 
-includedep $(PATH_TARGET)/VBoxNetFlt-src-1.dep
-$$(PATH_VBoxNetFlt-src)/Makefile: \
+ includedep $(PATH_TARGET)/VBoxNetFlt-src-1.dep
+ $$(PATH_VBoxNetFlt-src)/Makefile: \
                 $(PATH_SUB_CURRENT)/linux/Makefile \
                 $$(if $$(eq $$(VBoxNetFlt/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
                 | $$(dir $$@)
-ifndef VBOX_WITH_HARDENING
+ ifndef VBOX_WITH_HARDENING
         $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
-else
+ else
         $(QUIET)$(CP) -f $< $@
-endif
+ endif
         %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/VBoxNetFlt-src-1.dep
         %$(QUIET2)$(APPEND) '$(PATH_TARGET)/VBoxNetFlt-src-1.dep' 'VBoxNetFlt/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 
-## Scripts needed for building the kernel modules
-
-$$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
+ # Script needed for building the kernel module
+ $$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
@@ -384 +384 @@
         $(QUIET)chmod 0755 $@
 
-$$(PATH_VBoxNetFlt-src)/dkms.conf: \
+ # Script needed for building the kernel module
+ $$(PATH_VBoxNetFlt-src)/dkms.conf: \
                 $(PATH_SUB_CURRENT)/linux/dkms.conf \
                 $(VBOX_VERSION_STAMP) \