Changeset 62765 in vbox

Timestamp:

Jul 31, 2016 2:49:45 PM (8 years ago)

Author:

vboxsync

Message:

More makefile nits

File:

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

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

@@ -27 +27 @@
  endif
 
- ifdef VBOX_WITH_HARDENING
-  PROGRAMS += VBoxNetLwipNATHardened
-  DLLS += VBoxNetLwipNAT
- else
-  PROGRAMS += VBoxNetLwipNAT
- endif
 
  ifdef VBOX_WITH_HARDENING
+  #
+  # Hardened stub exe for VBoxNetLwipNAT.
+  #
+  PROGRAMS += VBoxNetLwipNATHardened
   VBoxNetLwipNATHardened_TEMPLATE = VBOXR3HARDENEDEXE
   VBoxNetLwipNATHardened_NAME     = VBoxNetNAT
@@ -43 +41 @@
  endif
 
+
+ #
+ # VBoxNetLwipNAT.
+ #
+ ifdef VBOX_WITH_HARDENING
+  DLLS += VBoxNetLwipNAT
+ else
+  PROGRAMS += VBoxNetLwipNAT
+ endif
  VBoxNetLwipNAT_TEMPLATE := VBOXMAIN$(if-expr defined(VBOX_WITH_HARDENING),DLL,CLIENTEXE)
  VBoxNetLwipNAT_NAME = VBoxNetNAT
@@ -49 +56 @@
  VBoxNetLwipNAT_DEFS.win += VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
  VBoxNetLwipNAT_SOURCES += VBoxNetLwipNAT.cpp   \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetBaseService.cpp \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetPortForwardString.cpp \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetIntIf.cpp \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetUDP.cpp \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetARP.cpp \
-        $(VBOX_PATH_NAT_SRC)/../NetLib/ComHostUtils.cpp
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetBaseService.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetPortForwardString.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetIntIf.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetUDP.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/VBoxNetARP.cpp \
+        $(VBOX_PATH_NAT_SRC)/../NetLib/ComHostUtils.cpp
 
  VBoxNetLwipNAT_LIBS = \
-        $(LIB_RUNTIME)
+        $(LIB_RUNTIME)
  VBoxNetLwipNAT_LIBS.solaris += socket nsl
  VBoxNetLwipNAT_LDFLAGS.win = /SUBSYSTEM:windows
@@ -89 +96 @@
 
  VBoxNetLwipNAT_SOURCES += \
-     proxy_pollmgr.c \
-     proxy_rtadvd.c \
-     proxy.c \
-     pxremap.c \
-     pxtcp.c \
-     pxudp.c \
-     pxdns.c \
-     fwtcp.c \
-     fwudp.c \
-     portfwd.c \
-     proxy_dhcp6ds.c \
-     proxy_tftpd.c
+        proxy_pollmgr.c \
+        proxy_rtadvd.c \
+        proxy.c \
+        pxremap.c \
+        pxtcp.c \
+        pxudp.c \
+        pxdns.c \
+        fwtcp.c \
+        fwudp.c \
+        portfwd.c \
+        proxy_dhcp6ds.c \
+        proxy_tftpd.c
 
  ifeq ($(KBUILD_TARGET),win)
@@ -125 +132 @@
 
  VBoxNetLwipNAT_SOURCES.win += \
-     RTWinPoll.cpp \
-     RTWinSocketPair.cpp
+        RTWinPoll.cpp \
+        RTWinSocketPair.cpp
 
  VBoxNetLwipNAT_INCS += . # for lwipopts.h
- $(eval $(call def_vbox_lwip_public, \
-     VBoxNetLwipNAT, $(PATH_SUB_CURRENT)/../../Devices/Network/lwip-new))
+ $(eval $(call def_vbox_lwip_public, VBoxNetLwipNAT, $(PATH_SUB_CURRENT)/../../Devices/Network/lwip-new))
 
  ifeq ($(KBUILD_TARGET),win)