Changeset 20452 in vbox for trunk/src/VBox

Timestamp:

Jun 10, 2009 1:38:40 AM (16 years ago)

Author:

vboxsync

Message:

NAT: Make Devices less dependend on changes in NAT

File:

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

trunk/src/VBox/Devices/Makefile.kmk

@@ -723 +723 @@
         Network/slirp/libalias/alias_util.c
 
-ifdef VBOX_WITH_SLIRP_ALIAS
-VBOX_SLIRP_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES)
-Drivers_INCS += Network/slirp/libalias
-define def_vbox_slirp_alias_cflags
-  $(file)_DEFS += VBOX_SLIRP_ALIAS
-endef
-$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(def_vbox_slirp_alias_cflags)))
-endif
 
 VBOX_WITH_SLIRP_DNS_PROXY=1
@@ -754 +746 @@
       $(if $(VBOX_WITH_SLIRP_DNS_PROXY),VBOX_WITH_SLIRP_DNS_PROXY,)     \
       $(if $(VBOX_WITH_SLIRP_MT),VBOX_WITH_SLIRP_MT,)
+ ifdef VBOX_WITH_SLIRP_ALIAS
+  $(file)_INCS += Network/slirp/libalias
+ endif
  ifeq ($(KBUILD_TARGET),win)
   $(file)_CFLAGS = -wd4018
@@ -761 +756 @@
 endef
 $(foreach file,$(VBOX_SLIRP_SOURCES),$(eval $(def_vbox_slirp_cflags)))
+
+ifdef VBOX_WITH_SLIRP_ALIAS
+Drivers_SOURCES += $(VBOX_SLIRP_ALIAS_SOURCES)
+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
+endef
+$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(def_vbox_slirp_cflags)))
+$(foreach file,$(VBOX_SLIRP_ALIAS_SOURCES),$(eval $(def_vbox_slirp_alias_cflags)))
+endif
 
 # -- OS specific --