Changeset 36496 in vbox for trunk/src

Timestamp:

Apr 1, 2011 1:17:23 PM (14 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/Makefile.kmk: Re r70893: TARGET_xxx -> xxx_1_TARGET. The former form is deprecated.

File:

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

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

@@ -43 +43 @@
         win/drv/VBoxNetFlt-win.rc
 # with WINDDKWLH the WIN9X_COMPAT_SPINLOCK is needed to avoid inline declaration of KeInitializeSpinLock
-# otherwise the linker would complain about dumplicate _KeInitializeSpinLock@4 definition 
+# otherwise the linker would complain about dumplicate _KeInitializeSpinLock@4 definition
 # in ntoskrnl.lib and our object files
 VBoxNetFlt_DEFS.win += WIN9X_COMPAT_SPINLOCK=1
@@ -118 +118 @@
         $(call MSG_GENERATE,VBoxNetFlt-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
-        
+
  ifdef VBOX_SIGNING_MODE
 VBoxNetFlt-inf_SOURCES += \
@@ -125 +125 @@
         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat
 
-$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(TARGET_VBoxNetFlt) | $$(dir $$@)
+$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(VBoxNetFlt_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
-  
-$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNobj.dll: $$(TARGET_VBoxNetFltNobj) | $$(dir $$@)
+
+$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNobj.dll: $$(VBoxNetFltNobj_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
@@ -159 +159 @@
 NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetFltInstall_SOURCES  = win/tools/VBoxNetFltInstall.cpp
-NetFltInstall_LIBS     = $(TARGET_WinNetConfig) \
-    $(TARGET_VBoxDrvCfg) \
+NetFltInstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(VBoxDrvCfg_1_TARGET) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
@@ -172 +173 @@
 NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetFltUninstall_SOURCES  = win/tools/VBoxNetFltUninstall.cpp
-NetFltUninstall_LIBS     = $(TARGET_WinNetConfig) \
-    $(TARGET_VBoxDrvCfg) \
+NetFltUninstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(VBoxDrvCfg_1_TARGET) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
@@ -184 +186 @@
 NetAdpInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetAdpInstall_SOURCES  = win/tools/VBoxNetAdpInstall.cpp
-NetAdpInstall_LIBS     = $(TARGET_WinNetConfig) \
-    $(TARGET_VBoxDrvCfg) \
+NetAdpInstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(VBoxDrvCfg_1_TARGET) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
@@ -197 +200 @@
 NetAdpUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetAdpUninstall_SOURCES  = win/tools/VBoxNetAdpUninstall.cpp
-NetAdpUninstall_LIBS     = $(TARGET_WinNetConfig) \
-    $(TARGET_VBoxDrvCfg) \
+NetAdpUninstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(VBoxDrvCfg_1_TARGET) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib
@@ -297 +301 @@
         $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.cat
 
-$(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys: $$(TARGET_VBoxNetAdp) | $$(dir $$@)
+$(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys: $$(VBoxNetAdp_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)