Changeset 18513 in vbox

Timestamp:

Mar 29, 2009 3:16:13 AM (16 years ago)

Author:

vboxsync

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

45363

Message:

VBoxNetFlt: Restrict VBOX_SVN_REV to where it's used.

File:

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

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

@@ -34 +34 @@
  VBoxNetFlt_NOINST = true
 endif
-VBoxNetFlt_DEFS = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
+VBoxNetFlt_DEFS = IN_RT_R0 IN_SUP_STATIC
 VBoxNetFlt_SDKS.win = W2K3DDK WINPSDKINCS
-VBoxNetFlt_INCS := $(PATH_SUB_CURRENT)
+VBoxNetFlt_INCS = .
 VBoxNetFlt_SOURCES.darwin = \
         darwin/VBoxNetFlt-darwin.cpp
@@ -64 +64 @@
 VBoxNetFlt_LIBS = \
         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
+
+darwin/VBoxNetFlt-darwin.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
 
@@ -223 +225 @@
  VBoxNetAdp_NOINST = true
 endif
-VBoxNetAdp_DEFS = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
+VBoxNetAdp_DEFS = IN_RT_R0 IN_SUP_STATIC
 VBoxNetAdp_SDKS = W2K3DDK WINPSDKINCS
 VBoxNetAdp_INCS := $(PATH_SUB_CURRENT)
@@ -272 +274 @@
 
  endif #  ifdef VBOX_SIGNING_MODE
- 
+
 else if1of ($(KBUILD_TARGET), linux solaris) ## @todo merge this with the mixed case stuff.
 #
@@ -284 +286 @@
 vboxnetflt_DEFS.linux    = KBUILD_MODNAME=KBUILD_STR\(vboxnetflt\) KBUILD_BASENAME=KBUILD_STR\(vboxnetflt\) MODULE
 vboxnetflt_DEFS          = IN_RT_R0
-vboxnetflt_DEFS.solaris  += VBOX_SVN_REV=$(VBOX_SVN_REV)
-vboxnetflt_DEPS.solaris  += $(VBOX_SVN_REV_KMK)
+vboxnetflt_DEPS.solaris += $(VBOX_SVN_REV_KMK)
 vboxnetflt_NOINST.linux  = true
 vboxnetflt_INCS.linux   := \
@@ -292 +293 @@
         $(PATH_SUB_CURRENT)
 vboxnetflt_LDFLAGS.solaris += -N drv/vboxdrv
-ifdef VBOXNETFLT_SOLARIS_USE_NETINFO
- vboxnetflt_DEFS.solaris += VBOXNETFLT_SOLARIS_USE_NETINFO
- vboxnetflt_LDFLAGS.solaris += -N misc/neti
-endif
+  ifdef VBOXNETFLT_SOLARIS_USE_NETINFO
+vboxnetflt_DEFS.solaris += VBOXNETFLT_SOLARIS_USE_NETINFO
+vboxnetflt_LDFLAGS.solaris += -N misc/neti
+  endif
 vboxnetflt_LIBS = \
         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
@@ -306 +307 @@
  endif
 
+solaris/VBoxNetFlt-solaris.c_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 endif