Changeset 20484 in vbox for trunk/src

Timestamp:

Jun 12, 2009 1:11:54 AM (16 years ago)

Author:

vboxsync

Message:

NAT: Devices less depended from changes in slirp,

rules for slirp reusable in NAT service

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -669 +669 @@
 Drivers_INCS      := \
         $(PATH_SUB_CURRENT) \
-        Network/slirp
+        Device/Network
 Drivers_SOURCES    = \
         Audio/audio.c \
@@ -747 +747 @@
       $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
  ifdef VBOX_WITH_SLIRP_ALIAS
-  $(file)_INCS += Network/slirp/libalias
+  $(file)_INCS += $(1)/slirp
+  $(file)_INCS += $(1)/slirp/libalias
  endif
  ifeq ($(KBUILD_TARGET),win)
@@ -755 +756 @@
  endif
 endef
-$(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(def_vbox_slirp_cflags)))
+$(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
 
 ifdef VBOX_WITH_SLIRP_ALIAS
@@ -761 +762 @@
 define def_vbox_slirp_alias_cflags
   $(file)_DEFS += VBOX_SLIRP_ALIAS
-  $(file)_INCS += Network/slirp/libalias
-  $(file)_INCS += Network/slirp
-  $(file)_INCS += Network/slirp/dnsproxy
+  $(file)_INCS += $(1)/slirp/libalias
+  $(file)_INCS += $(1)/slirp
+  $(file)_INCS += $(1)/slirp/dnsproxy
 endef
-$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(def_vbox_slirp_cflags)))
-$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(def_vbox_slirp_alias_cflags)))
+$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_cflags, Network)))
+$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(call def_vbox_slirp_alias_cflags, Network)))
 endif