Changeset 63009 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 4, 2016 8:54:40 PM (8 years ago)

Author:

vboxsync

Message:

Reduced lwip-new/Config.kmk to just the two list (incs and sources), cannot see any reason for the current complexity.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/lwip-new/Config.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -407 +407 @@
 
  ifdef VBOX_WITH_INIP
-  VBoxDD_DEFS           += VBOX_WITH_INIP
-  VBoxDD_SOURCES        += \
-        Network/DevINIP.cpp
-  # XXX: do not depend on order
   ifndef LWIP_SOURCES
    include $(PATH_SUB_CURRENT)/Network/lwip-new/Config.kmk
   endif
-  VBoxDD_LWIP_INCS += Network # for lwipopts.h
-  $(eval $(call def_vbox_lwip_private, VBoxDD, Network/lwip-new))
-  $(eval $(call def_vbox_lwip_flags,   VBoxDD, Network/DevINIP.cpp, Network/lwip-new))
+  VBoxDD_DEFS           += VBOX_WITH_INIP
+  VBoxDD_SOURCES        += \
+        Network/DevINIP.cpp \
+        $(addprefix Network/lwip-new/,$(LWIP_SOURCES))
+  VBoxDD_INCS           += \
+        Network \
+        $(addprefix Network/lwip-new/,$(LWIP_INCS))
  endif # VBOX_WITH_INIP
 

trunk/src/VBox/Devices/Network/lwip-new/Config.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Adds sources list and defines required to LWIP pre-1.5.0 compilation
+# Define the include dirs and source files for LWIP pre-1.5.0.
+#
+# This file is included by Devices/Makefile.kmk and NetworkServices/NAT/Makefile.kmk.
 #
 
@@ -95 +97 @@
 
 
-
-define _def_vbox_lwip_use # VAR_BaseName, path/to/lwip/dir
-  $(strip $1)_SOURCES += $(foreach file, $(LWIP_SOURCES), $(strip $2)/$(file))
-endef
-
-
-define def_vbox_lwip_flags # PROTO_BaseName, VAR_BaseName, path/to/lwip/dir
-  # add anything configured for the component via PROTO_BaseName
-  $(foreach suffix, INCS DEFS,
-    $(if $(value $(strip $1)_LWIP_$(suffix)), $(eval $(strip $2)_$(suffix) += $(value $(strip $1)_LWIP_$(suffix)) ),))
-
-  # add lwip's own includes
-  $(strip $2)_INCS += $(foreach incdir, $(LWIP_INCS), $(strip $3)/$(incdir))
-endef
-
-
-###
-### Call this if you want to expose lwip to your component as a whole.
-### In this case individual lwip files (added to _SOURCES of your
-### component) will pick up lwip includes etc from your component
-### settings.
-###
-### This is, for example, how NetworkServices/NAT uses it.
-###
-define def_vbox_lwip_public # VAR_BaseName, path/to/lwip/dir
-  $(eval $(call _def_vbox_lwip_use, $1, $2))
-  $(eval $(call def_vbox_lwip_flags, $1, $1, $2))
-endef
-
-
-###
-### Call this if you want to expose lwip only to a few selected files.
-### In this case each lwip file is configured with lwip includes etc
-### separately and you are supposed to call def_vbox_lwip_flags
-### yourself for those of your files that use lwip.
-###
-### This is, for example, how Devices uses it.
-###
-define def_vbox_lwip_private # VAR_BaseName, path/to/lwip/dir
-  $(eval $(call _def_vbox_lwip_use, $1, $2))
-  $(foreach file, $(LWIP_SOURCES), $(eval $(call def_vbox_lwip_flags, $1, $(strip $2)/$(file), $2)))
-endef
-
-
 ifeq ($(USERNAME), vvl)
 $(foreach lwip_file, $(LWIP_SOURCES), $(eval $(lwip_file)_DEFS=RTMEM_WRAP_TO_EF_APIS))
@@ -150 +108 @@
     Network/lwip-new/test/unit/udp/test_udp.c
 endif
-