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

Timestamp:

Sep 9, 2008 1:58:29 AM (16 years ago)

Author:

vboxsync

Message:

HostDrivers/Makefiles: Eliminated (most) PATH_TARGET usage and pushed them up to root level (sub-makefile wise).

File:

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

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

@@ -11 +11 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -27 +22 @@
 VBoxNetFlt_TEMPLATE = VBOXR0DRV
 VBoxNetFlt_INST = $(INST_VBOXNETFLT)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/)
-ifdef VBOX_SIGNING_MODE
- ifeq ($(KBUILD_TARGET),win)
-  VBoxNetFlt_NOINST = true
- endif
+if defined(VBOX_SIGNING_MODE) && "$(KBUILD_TARGET)" == "win"
+ VBoxNetFlt_NOINST = true
 endif
 VBoxNetFlt_DEFS = IN_RT_R0 VBOX_SVN_REV=$(VBOX_SVN_REV) IN_SUP_STATIC
@@ -51 +44 @@
 
 # Darwin extras.
-INSTALLS.darwin += VBoxNetFlt.kext
+ifeq ($(KBUILD_TARGET),darwin)
+INSTALLS += VBoxNetFlt.kext
 VBoxNetFlt.kext_INST     = $(INST_VBOXNETFLT)Contents/
 VBoxNetFlt.kext_SOURCES  = \
-        $(PATH_TARGET)/VBoxNetFlt/Info.plist
+        $(PATH_VBoxNetFlt.kext)/Info.plist
 VBoxNetFlt.kext_CLEAN    = \
-        $(PATH_TARGET)/VBoxNetFlt/Info.plist
+        $(PATH_VBoxNetFlt.kext)/Info.plist
 
-$(PATH_TARGET)/VBoxNetFlt/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $(call DIRDEP,$(PATH_TARGET)/VBoxNetFlt)
+$$(PATH_VBoxNetFlt.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxNetFlt,$@,$<)
         $(xQUIET)$(RM) -f $@
@@ -66 +60 @@
                 -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
                 -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-                $< > $@
+                --output $@ \
+                $<
 
 INSTALLS.darwin += Scripts-darwin
@@ -72 +67 @@
 Scripts-darwin_SOURCES = \
         darwin/loadnetflt.sh
+endif # darwin
 
 
@@ -80 +76 @@
 VBoxNetFlt-inf_SOURCES = \
         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf \
-        $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt_m.inf 
+        $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt_m.inf
 VBoxNetFlt-inf_CLEAN = $(VBoxNetFlt-inf_SOURCES)
 VBoxNetFlt-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetFltCat.dir
 
-$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf: $(PATH_SUB_CURRENT)/win/VBoxNetFlt.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf: $(PATH_SUB_CURRENT)/win/VBoxNetFlt.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxNetFlt-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
 
-$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt_m.inf: $(PATH_SUB_CURRENT)/win/VBoxNetFlt_m.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt_m.inf: $(PATH_SUB_CURRENT)/win/VBoxNetFlt_m.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxNetFlt-inf,$@,$<)
         $(call VBOX_EDIT_INF_FN,$<,$@)
@@ -97 +93 @@
         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat
 
-$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(TARGET_VBoxNetFlt) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(TARGET_VBoxNetFlt) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
@@ -137 +133 @@
 include $(KBUILD_PATH)/subfooter.kmk
 
-