Changeset 14737 in vbox for trunk/src/VBox

Timestamp:

Nov 27, 2008 7:08:15 PM (16 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/Makefile.kmk: some cleanups and fixes.

File:

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

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

@@ -81 +81 @@
 
 
+ifeq ($(KBUILD_TARGET),win)
+#
 # Windows extras.
+#
 INSTALLS.win += VBoxNetFlt-inf
 VBoxNetFlt-inf_INST = $(INST_BIN)
@@ -130 +133 @@
         win/WinNetConfig.cpp
 
-PROGRAMS.win  += NetFltInstall NetFltUninstall
+
 #
 # NetFltInstall
 #
+PROGRAMS.win  += NetFltInstall
 NetFltInstall_TEMPLATE = VBOXR3STATIC
 NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetFltInstall_SOURCES  = win/NetFltInstall.cpp
-NetFltInstall_LIBS   += $(PATH_LIB)/WinNetConfig.lib
+NetFltInstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+
+
 #
 # NetFltUninstall
 #
+PROGRAMS.win  += NetFltUninstall
 NetFltUninstall_TEMPLATE = VBOXR3STATIC
 NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
 NetFltUninstall_SOURCES  = win/NetFltUninstall.cpp
-NetFltUninstall_LIBS   += $(PATH_LIB)/WinNetConfig.lib
-
- ifeq ($(KBUILD_TARGET), win)
+NetFltUninstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+
+
 #
 # VBoxNetFltNotify
 #
 DLLS.win += VBoxNetFltNotify
-PATH_VBoxNetFltNotifyCOM    = $(PATH_TARGET)/VBoxNetFltNotifyCOM
-
-VBOXNETFLT_NOTIFY_GENERATES = $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_i.c \
-        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_p.c \
-        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.h \
-        $(PATH_VBoxNetFltNotifyCOM)/dlldata.c \
-        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.tlb
-
-VBOXNETFLT_NOTIFY_IDL      ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
-        $(PATH_SDK_WINPSDK_BIN)/Midl.Exe\
-        $(PATH_SDK_WINPSDK)/Bin/Midl.Exe\
-        $(PATH_DEVTOOLS)/win.x86/bin/midl.exe\
-        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
-
 VBoxNetFltNotify_TEMPLATE   = VBOXR3STATIC
 VBoxNetFltNotify_SDKS       = WINPSDK W2K3DDK VBOX_NTDLL
+VBoxNetFltNotify_DEFS       = _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
 VBoxNetFltNotify_INCS      += \
         $(PATH_VBoxNetFltNotifyCOM)
@@ -173 +167 @@
         win/notifyobj/VBoxNetFltNotify.def \
         win/notifyobj/VBoxNetFltNotify.rc
-VBoxNetFltNotify_DEPS      += $(VBOXNETFLT_NOTIFY_GENERATES)
-#VBoxNetFltNotify_INTERMEDIATES      += $(VBOXNETFLT_NOTIFY_GENERATES)
-VBoxNetFltNotify_DEFS      += _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
-VBoxNetFltNotify_LIBS      += \
+VBoxNetFltNotify_LIBS       = \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
-VBoxNetFltNotify_CLEAN     += $(VBOXNETFLT_NOTIFY_GENERATES)
-#VBoxNetFltNotify_DIRS     += $(PATH_VBoxNetFltNotifyCOM)
-
-$(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_i.c \
-+ $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_p.c \
-+ $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.h \
-+ $(PATH_VBoxNetFltNotifyCOM)/dlldata.c \
-+ $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.tlb: $(PATH_SUB_CURRENT)/win/notifyobj/VBoxNetFltNotifyn.idl
-        $(MKDIR) -p $(PATH_VBoxNetFltNotifyCOM)
+#VBoxNetFltNotify_INTERMEDIATES =
+VBoxNetFltNotify_DEPS       = \
+        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_i.c \
+        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_p.c \
+        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.h \
+        $(PATH_VBoxNetFltNotifyCOM)/dlldata.c \
+        $(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.tlb
+VBoxNetFltNotify_CLEAN      = $(VBoxNetFltNotify_DEPS)
+
+VBOXNETFLT_NOTIFY_IDL      ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
+        $(PATH_SDK_WINPSDK_BIN)/Midl.Exe\
+        $(PATH_SDK_WINPSDK)/Bin/Midl.Exe\
+        $(PATH_DEVTOOLS)/win.x86/bin/midl.exe\
+        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
+
+$$(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_i.c \
++ $$(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn_p.c \
++ $$(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.h \
++ $$(PATH_VBoxNetFltNotifyCOM)/dlldata.c \
++ $$(PATH_VBoxNetFltNotifyCOM)/VBoxNetFltNotifyn.tlb: \
+                $(PATH_SUB_CURRENT)/win/notifyobj/VBoxNetFltNotifyn.idl \
+                | $$(dir $$@)
         $(VBOXNETFLT_NOTIFY_IDL) /nologo \
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxNetFltNotifyCOM)) \
@@ -192 +196 @@
                 $(addprefix /I , $(call VBOX_FN_MAKE_WIN_PATH,$(SDK_W2K3DDK_INCS))) \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
- endif #ifeq ($(KBUILD_TARGET), win) 
-else if1of ($(KBUILD_TARGET), linux solaris)
+endif #ifeq ($(KBUILD_TARGET), win)
+
+else if1of ($(KBUILD_TARGET), linux solaris) ## @todo merge this with the mixed case stuff.
 #
 # vboxnetflt(.ko/.o/) - The lower case driver.