Changeset 106645 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Oct 24, 2024 8:54:47 AM (3 months ago)

Author:

vboxsync

Message:

HostDrivers/VBoxNetFlt: Some makefile cleanups. jiraref:VBP-1253

File:

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

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

@@ -50 +50 @@
   SYSMODS.win.amd64 += VBoxNetFlt
  endif
+
+ # The driver.
  VBoxNetFlt_TEMPLATE = VBoxR0Drv
  VBoxNetFlt_INST = $(INST_VBOXNETFLT)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/)
@@ -122 +124 @@
 
  ifeq ($(KBUILD_TARGET),win)
-  #
-  # Windows extras.
-  #
+  # Windows: VBoxNetFlt INF & CAT files.
   ifdef VBOX_WITH_VBOXDRV
    INSTALLS.win.x86   += VBoxNetFlt-inf
@@ -165 +165 @@
 
   endif # signing
-
-
+ endif
+
+
+ ifeq ($(KBUILD_TARGET),win)
   #
   # VBoxNetLwf.sys - The light-weight filter driver for NDIS6 (i.e. Windows only).
   #
   ifdef VBOX_WITH_VBOXDRV
-   SYSMODS.win += VBoxNetLwf
+   SYSMODS.win  += VBoxNetLwf
+   INSTALLS.win += VBoxNetLwf-inf
   endif
+  # The driver.
   VBoxNetLwf_TEMPLATE = VBoxR0Drv
   VBoxNetLwf_INST = $(INST_VBOXNETFLT)
@@ -210 +214 @@
         $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
 
-  #
-  # VBoxNetLwf installation.
-  #
-  ifdef VBOX_WITH_VBOXDRV
-   INSTALLS.win += VBoxNetLwf-inf
-  endif
+  # VBoxNetLwf INF & CAT files.
   VBoxNetLwf-inf_TEMPLATE = VBoxR0DrvInfCat
   VBoxNetLwf-inf_SOURCES = \
@@ -231 +230 @@
         $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat \
         $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat=>VBoxNetLwf-PreW10.cat
-
-   #    $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwfNobj.dll \
+   #    $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwfNobj.dll
 
    $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.sys: $$(VBoxNetLwf_1_TARGET) | $$(dir $$@)
@@ -245 +243 @@
         $(call MSG_TOOL,Inf2Cat,VBoxNetLwf-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
-  endif # signing
-
+  endif # VBOX_SIGNING_MODE
 
 
@@ -397 +393 @@
    endif
   endif
+
+  # The driver.
   VBoxNetAdp_TEMPLATE = VBoxR0Drv
   #VBoxNetAdp_INST = $(INST_VBOXNETADP)
@@ -430 +428 @@
         $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/BufferOverflowFastFailK.lib
 
-  # The .INF and .CAT files associate with VBoxNetAdp.sys.
+  # VBoxNetAdp .INF & .CAT files.
   VBoxNetAdp-inf_TEMPLATE = VBoxR0DrvInfCat
   VBoxNetAdp-inf_SOURCES  = $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.inf