Changeset 48178 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Aug 30, 2013 3:54:49 AM (12 years ago)

Author:

vboxsync

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

88561

Message:

Do not hardcode lwip location in lwip makefile. Provide functions for
"calling" makefiles to add lwip to its sources and use these functions
in Devices and NAT.

XXX: It's still icky that Devices pulls in lwip makefile and then NAT
(which is included later) inherits it. But this commit allows
inclusion problem (and possible move of the lwip directory) to be
addressed separately.

File:

• trunk/src/VBox/NetworkServices/NAT/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -18 +18 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-define def_vbox_nat_network_service_sources
-    $(1)_SOURCES += $2/$3
-endef
-
-define def_vbox_nat_network_service_incs
-    $(1)_INCS += $2/$3
-endef
-
 ifdef VBOX_WITH_LWIP_NAT
+# XXX: This file depends on lwip makefile already included by Devices,
+#      which is included by ancestor makefile before us...
+#if !defined(LWIP_SOURCES) # ???
+#  include ../../Devices/Network/lwip-new/Makefile.kmk
+#endif
 
 ifdef VBOX_WITH_HARDENING
@@ -78 +75 @@
     RTWinSocketPair.cpp
 
-#
-# Note: not spaces please in "Devices,$("
-#
-$(foreach file,$(LWIP_SOURCES),$(eval $(call def_vbox_nat_network_service_sources, VBoxNetLwipNAT, ../../Devices,$(file))))
-
-$(foreach incs,$(LWIP_INCS),$(eval $(call def_vbox_nat_network_service_incs, VBoxNetLwipNAT, ../../Devices,$(incs))))
-
+$(eval $(call def_vbox_lwip_public, \
+    VBoxNetLwipNAT, ../../Devices/Network/lwip-new))
 endif